@red-hat-developer-hub/backstage-plugin-adoption-insights-backend 0.6.2 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @red-hat-developer-hub/backstage-plugin-adoption-insights-backend
 
+## 0.7.0
+
+### Minor Changes
+
+- 0f66c7c: Backstage version bump to v1.47.3
+
+### Patch Changes
+
+- 5c82367: normalize event timestamps to UTC and fix frontend date parsing
+- e2ae776: Add missing direct dependencies to package
+- Updated dependencies [0f66c7c]
+  - @red-hat-developer-hub/backstage-plugin-adoption-insights-common@0.7.0
+
 ## 0.6.2
 
 ### Patch Changes

package/dist/models/Event.cjs.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var uuid = require('uuid');
+var date = require('../utils/date.cjs.js');
 
 class Event {
   id;
@@ -19,7 +20,10 @@ class Event {
     this.action = event.action;
     this.subject = event.subject;
     this.value = event.value;
-    this.created_at = event.context?.timestamp || (/* @__PURE__ */ new Date()).toISOString();
+    const rawTimestamp = event.context?.timestamp || (/* @__PURE__ */ new Date()).toISOString();
+    this.created_at = date.normalizeToUTCISO(
+      typeof rawTimestamp === "string" ? rawTimestamp : /* @__PURE__ */ new Date()
+    );
     this.context = isJson ? event.context : JSON.stringify(event.context ?? {});
     this.attributes = isJson ? event.attributes ?? {} : JSON.stringify(event.attributes ?? {});
   }

package/dist/models/Event.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"Event.cjs.js","sources":["../../src/models/Event.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { v4 as uuidv4 } from 'uuid';\nimport {\n  AnalyticsContextValue,\n  AnalyticsEvent,\n  AnalyticsEventAttributes,\n} from '@backstage/core-plugin-api';\n\nexport type EventType = {\n  user_ref: string;\n  plugin_id: string;\n  action: string;\n  context: AnalyticsContextValue | string;\n  subject: string;\n  value: number | undefined;\n  attributes: AnalyticsEventAttributes | string;\n  created_at: string;\n};\n\nexport class Event {\n  public readonly id: string;\n  public readonly user_ref?: string;\n  public readonly plugin_id?: string;\n  public readonly action: string;\n  public readonly context: AnalyticsContextValue | string;\n  public readonly subject: string;\n  public readonly value: number | undefined;\n  public readonly attributes: AnalyticsEventAttributes | string;\n  public readonly created_at: string;\n\n  constructor(event: AnalyticsEvent, isJson: boolean = true) {\n    this.id = uuidv4();\n    this.user_ref = event.context?.userName as string;\n    this.plugin_id = event.context?.pluginId;\n    this.action = event.action;\n    this.subject = event.subject;\n    this.value = event.value;\n    this.created_at =\n      (event.context?.timestamp as string) || new Date().toISOString();\n\n    // Handle type-based conversion\n    this.context = isJson ? event.context : JSON.stringify(event.context ?? {});\n    this.attributes = isJson\n      ? event.attributes ?? {}\n      : JSON.stringify(event.attributes ?? {});\n  }\n\n  toJSON() {\n    return {\n      user_ref: this.user_ref,\n      plugin_id: this.plugin_id,\n      action: this.action,\n      context: this.context,\n      subject: this.subject,\n      attributes: this.attributes,\n      created_at: this.created_at,\n      value: this.value,\n    };\n  }\n}\n"],"names":["uuidv4"],"mappings":";;;;AAiCO,MAAM,KAAM,CAAA;AAAA,EACD,EAAA;AAAA,EACA,QAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,KAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EAEhB,WAAA,CAAY,KAAuB,EAAA,MAAA,GAAkB,IAAM,EAAA;AACzD,IAAA,IAAA,CAAK,KAAKA,OAAO,EAAA;AACjB,IAAK,IAAA,CAAA,QAAA,GAAW,MAAM,OAAS,EAAA,QAAA;AAC/B,IAAK,IAAA,CAAA,SAAA,GAAY,MAAM,OAAS,EAAA,QAAA;AAChC,IAAA,IAAA,CAAK,SAAS,KAAM,CAAA,MAAA;AACpB,IAAA,IAAA,CAAK,UAAU,KAAM,CAAA,OAAA;AACrB,IAAA,IAAA,CAAK,QAAQ,KAAM,CAAA,KAAA;AACnB,IAAA,IAAA,CAAK,aACF,KAAM,CAAA,OAAA,EAAS,8BAA4B,IAAA,IAAA,IAAO,WAAY,EAAA;AAGjE,IAAK,IAAA,CAAA,OAAA,GAAU,SAAS,KAAM,CAAA,OAAA,GAAU,KAAK,SAAU,CAAA,KAAA,CAAM,OAAW,IAAA,EAAE,CAAA;AAC1E,IAAK,IAAA,CAAA,UAAA,GAAa,MACd,GAAA,KAAA,CAAM,UAAc,IAAA,EACpB,GAAA,IAAA,CAAK,SAAU,CAAA,KAAA,CAAM,UAAc,IAAA,EAAE,CAAA;AAAA;AAC3C,EAEA,MAAS,GAAA;AACP,IAAO,OAAA;AAAA,MACL,UAAU,IAAK,CAAA,QAAA;AAAA,MACf,WAAW,IAAK,CAAA,SAAA;AAAA,MAChB,QAAQ,IAAK,CAAA,MAAA;AAAA,MACb,SAAS,IAAK,CAAA,OAAA;AAAA,MACd,SAAS,IAAK,CAAA,OAAA;AAAA,MACd,YAAY,IAAK,CAAA,UAAA;AAAA,MACjB,YAAY,IAAK,CAAA,UAAA;AAAA,MACjB,OAAO,IAAK,CAAA;AAAA,KACd;AAAA;AAEJ;;;;"}
+{"version":3,"file":"Event.cjs.js","sources":["../../src/models/Event.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { v4 as uuidv4 } from 'uuid';\nimport {\n  AnalyticsContextValue,\n  AnalyticsEvent,\n  AnalyticsEventAttributes,\n} from '@backstage/core-plugin-api';\nimport { normalizeToUTCISO } from '../utils/date';\n\nexport type EventType = {\n  user_ref: string;\n  plugin_id: string;\n  action: string;\n  context: AnalyticsContextValue | string;\n  subject: string;\n  value: number | undefined;\n  attributes: AnalyticsEventAttributes | string;\n  created_at: string;\n};\n\nexport class Event {\n  public readonly id: string;\n  public readonly user_ref?: string;\n  public readonly plugin_id?: string;\n  public readonly action: string;\n  public readonly context: AnalyticsContextValue | string;\n  public readonly subject: string;\n  public readonly value: number | undefined;\n  public readonly attributes: AnalyticsEventAttributes | string;\n  public readonly created_at: string;\n\n  constructor(event: AnalyticsEvent, isJson: boolean = true) {\n    this.id = uuidv4();\n    this.user_ref = event.context?.userName as string;\n    this.plugin_id = event.context?.pluginId;\n    this.action = event.action;\n    this.subject = event.subject;\n    this.value = event.value;\n    const rawTimestamp =\n      (event.context?.timestamp as string) || new Date().toISOString();\n    this.created_at = normalizeToUTCISO(\n      typeof rawTimestamp === 'string' ? rawTimestamp : new Date(),\n    );\n\n    // Handle type-based conversion\n    this.context = isJson ? event.context : JSON.stringify(event.context ?? {});\n    this.attributes = isJson\n      ? event.attributes ?? {}\n      : JSON.stringify(event.attributes ?? {});\n  }\n\n  toJSON() {\n    return {\n      user_ref: this.user_ref,\n      plugin_id: this.plugin_id,\n      action: this.action,\n      context: this.context,\n      subject: this.subject,\n      attributes: this.attributes,\n      created_at: this.created_at,\n      value: this.value,\n    };\n  }\n}\n"],"names":["uuidv4","normalizeToUTCISO"],"mappings":";;;;;AAkCO,MAAM,KAAM,CAAA;AAAA,EACD,EAAA;AAAA,EACA,QAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,KAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EAEhB,WAAA,CAAY,KAAuB,EAAA,MAAA,GAAkB,IAAM,EAAA;AACzD,IAAA,IAAA,CAAK,KAAKA,OAAO,EAAA;AACjB,IAAK,IAAA,CAAA,QAAA,GAAW,MAAM,OAAS,EAAA,QAAA;AAC/B,IAAK,IAAA,CAAA,SAAA,GAAY,MAAM,OAAS,EAAA,QAAA;AAChC,IAAA,IAAA,CAAK,SAAS,KAAM,CAAA,MAAA;AACpB,IAAA,IAAA,CAAK,UAAU,KAAM,CAAA,OAAA;AACrB,IAAA,IAAA,CAAK,QAAQ,KAAM,CAAA,KAAA;AACnB,IAAA,MAAM,eACH,KAAM,CAAA,OAAA,EAAS,8BAA4B,IAAA,IAAA,IAAO,WAAY,EAAA;AACjE,IAAA,IAAA,CAAK,UAAa,GAAAC,sBAAA;AAAA,MAChB,OAAO,YAAA,KAAiB,QAAW,GAAA,YAAA,uBAAmB,IAAK;AAAA,KAC7D;AAGA,IAAK,IAAA,CAAA,OAAA,GAAU,SAAS,KAAM,CAAA,OAAA,GAAU,KAAK,SAAU,CAAA,KAAA,CAAM,OAAW,IAAA,EAAE,CAAA;AAC1E,IAAK,IAAA,CAAA,UAAA,GAAa,MACd,GAAA,KAAA,CAAM,UAAc,IAAA,EACpB,GAAA,IAAA,CAAK,SAAU,CAAA,KAAA,CAAM,UAAc,IAAA,EAAE,CAAA;AAAA;AAC3C,EAEA,MAAS,GAAA;AACP,IAAO,OAAA;AAAA,MACL,UAAU,IAAK,CAAA,QAAA;AAAA,MACf,WAAW,IAAK,CAAA,SAAA;AAAA,MAChB,QAAQ,IAAK,CAAA,MAAA;AAAA,MACb,SAAS,IAAK,CAAA,OAAA;AAAA,MACd,SAAS,IAAK,CAAA,OAAA;AAAA,MACd,YAAY,IAAK,CAAA,UAAA;AAAA,MACjB,YAAY,IAAK,CAAA,UAAA;AAAA,MACjB,OAAO,IAAK,CAAA;AAAA,KACd;AAAA;AAEJ;;;;"}

package/dist/utils/date.cjs.js

@@ -15,6 +15,29 @@ const getDateGroupingType = (dateDiff) => {
   if (dateDiff <= 30) return "weekly";
   return "monthly";
 };
+const normalizeToUTCISO = (date) => {
+  if (date instanceof Date) {
+    return date.toISOString();
+  }
+  const s = String(date).trim();
+  let dt = luxon.DateTime.fromISO(s, { setZone: true });
+  if (dt.isValid) {
+    return dt.toUTC().toISO() ?? s;
+  }
+  dt = luxon.DateTime.fromFormat(s, "yyyy-MM-dd HH:mm:ss.SSS ZZZ", { setZone: true });
+  if (dt.isValid) {
+    return dt.toUTC().toISO() ?? s;
+  }
+  dt = luxon.DateTime.fromFormat(s, "yyyy-MM-dd HH:mm:ss ZZZ", { setZone: true });
+  if (dt.isValid) {
+    return dt.toUTC().toISO() ?? s;
+  }
+  dt = luxon.DateTime.fromFormat(s, "yyyy-MM-dd HH:mm:ss", { zone: "UTC" });
+  if (dt.isValid) {
+    return dt.toISO() ?? s;
+  }
+  return s;
+};
 const convertToTargetTimezone = (date, timeZone = new Intl.DateTimeFormat().resolvedOptions().timeZone) => {
   const dateString = date instanceof Date ? date.toISOString() : date;
   const isoParsed = luxon.DateTime.fromISO(dateString, { setZone: true });
@@ -39,6 +62,7 @@ exports.calculateDateRange = calculateDateRange;
 exports.convertToTargetTimezone = convertToTargetTimezone;
 exports.getDateGroupingType = getDateGroupingType;
 exports.getTimeZoneOffsetString = getTimeZoneOffsetString;
+exports.normalizeToUTCISO = normalizeToUTCISO;
 exports.toEndOfDayUTC = toEndOfDayUTC;
 exports.toStartOfDayUTC = toStartOfDayUTC;
 //# sourceMappingURL=date.cjs.js.map

package/dist/utils/date.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.cjs.js","sources":["../../src/utils/date.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { DateTime } from 'luxon';\nimport { Grouping } from '../types/event';\n\nexport const toStartOfDayUTC = (dateString: string, timezone = 'UTC') =>\n  DateTime.fromFormat(dateString, 'yyyy-MM-dd', { zone: timezone })\n    .startOf('day')\n    .toUTC()\n    .toISO();\n\nexport const toEndOfDayUTC = (dateString: string, timezone = 'UTC') =>\n  DateTime.fromFormat(dateString, 'yyyy-MM-dd', { zone: timezone })\n    .endOf('day')\n    .toUTC()\n    .toISO();\n\nexport const calculateDateRange = (\n  start_date: string,\n  end_date: string,\n): number => {\n  const start = DateTime.fromISO(start_date, { zone: 'UTC' });\n  const end = DateTime.fromISO(end_date, { zone: 'UTC' });\n\n  return Math.floor(end.diff(start, 'days').days);\n};\n\nexport const isSameMonth = (start_date: string, end_date: string): boolean => {\n  const start = DateTime.fromISO(start_date, { zone: 'UTC' });\n  const end = DateTime.fromISO(end_date, { zone: 'UTC' });\n\n  return start.hasSame(end, 'month');\n};\n\nexport const getDateGroupingType = (dateDiff: number): Grouping => {\n  if (dateDiff === 0) return 'hourly';\n  if (dateDiff <= 7) return 'daily';\n  if (dateDiff <= 30) return 'weekly';\n  return 'monthly';\n};\n\nexport const hasZFormat = (dateStr: string): boolean => {\n  return dateStr.includes('Z') || dateStr.includes('T');\n};\n\nexport const convertToTargetTimezone = (\n  date: string | Date,\n  timeZone: string = new Intl.DateTimeFormat().resolvedOptions().timeZone,\n) => {\n  const dateString = date instanceof Date ? date.toISOString() : date;\n\n  const isoParsed = DateTime.fromISO(dateString, { setZone: true });\n\n  if (isoParsed.isValid) {\n    return isoParsed.setZone(timeZone).toISO();\n  }\n\n  // If not valid ISO, try parsing as 'yyyy-MM-dd HH:mm:ss' in UTC\n  const fallback = DateTime.fromFormat(dateString, 'yyyy-MM-dd HH:mm:ss', {\n    zone: 'UTC',\n  });\n\n  if (fallback.isValid) {\n    return fallback.setZone(timeZone).toISO();\n  }\n\n  // Last resort: return the original date\n  console.warn('Unable to parse date:', date);\n  return date;\n};\n\nexport const getTimeZoneOffsetString = (\n  timeZone = new Intl.DateTimeFormat().resolvedOptions().timeZone,\n) => {\n  const now = DateTime.now().setZone(timeZone);\n  return now.toFormat('ZZ');\n};\n"],"names":["DateTime"],"mappings":";;;;AAkBO,MAAM,kBAAkB,CAAC,UAAA,EAAoB,WAAW,KAC7D,KAAAA,cAAA,CAAS,WAAW,UAAY,EAAA,YAAA,EAAc,EAAE,IAAM,EAAA,QAAA,EAAU,CAC7D,CAAA,OAAA,CAAQ,KAAK,CACb,CAAA,KAAA,GACA,KAAM;AAEJ,MAAM,gBAAgB,CAAC,UAAA,EAAoB,WAAW,KAC3D,KAAAA,cAAA,CAAS,WAAW,UAAY,EAAA,YAAA,EAAc,EAAE,IAAM,EAAA,QAAA,EAAU,CAC7D,CAAA,KAAA,CAAM,KAAK,CACX,CAAA,KAAA,GACA,KAAM;AAEE,MAAA,kBAAA,GAAqB,CAChC,UAAA,EACA,QACW,KAAA;AACX,EAAA,MAAM,QAAQA,cAAS,CAAA,OAAA,CAAQ,YAAY,EAAE,IAAA,EAAM,OAAO,CAAA;AAC1D,EAAA,MAAM,MAAMA,cAAS,CAAA,OAAA,CAAQ,UAAU,EAAE,IAAA,EAAM,OAAO,CAAA;AAEtD,EAAA,OAAO,KAAK,KAAM,CAAA,GAAA,CAAI,KAAK,KAAO,EAAA,MAAM,EAAE,IAAI,CAAA;AAChD;AASa,MAAA,mBAAA,GAAsB,CAAC,QAA+B,KAAA;AACjE,EAAI,IAAA,QAAA,KAAa,GAAU,OAAA,QAAA;AAC3B,EAAI,IAAA,QAAA,IAAY,GAAU,OAAA,OAAA;AAC1B,EAAI,IAAA,QAAA,IAAY,IAAW,OAAA,QAAA;AAC3B,EAAO,OAAA,SAAA;AACT;AAMa,MAAA,uBAAA,GAA0B,CACrC,IAAA,EACA,QAAmB,GAAA,IAAI,KAAK,cAAe,EAAA,CAAE,eAAgB,EAAA,CAAE,QAC5D,KAAA;AACH,EAAA,MAAM,UAAa,GAAA,IAAA,YAAgB,IAAO,GAAA,IAAA,CAAK,aAAgB,GAAA,IAAA;AAE/D,EAAA,MAAM,YAAYA,cAAS,CAAA,OAAA,CAAQ,YAAY,EAAE,OAAA,EAAS,MAAM,CAAA;AAEhE,EAAA,IAAI,UAAU,OAAS,EAAA;AACrB,IAAA,OAAO,SAAU,CAAA,OAAA,CAAQ,QAAQ,CAAA,CAAE,KAAM,EAAA;AAAA;AAI3C,EAAA,MAAM,QAAW,GAAAA,cAAA,CAAS,UAAW,CAAA,UAAA,EAAY,qBAAuB,EAAA;AAAA,IACtE,IAAM,EAAA;AAAA,GACP,CAAA;AAED,EAAA,IAAI,SAAS,OAAS,EAAA;AACpB,IAAA,OAAO,QAAS,CAAA,OAAA,CAAQ,QAAQ,CAAA,CAAE,KAAM,EAAA;AAAA;AAI1C,EAAQ,OAAA,CAAA,IAAA,CAAK,yBAAyB,IAAI,CAAA;AAC1C,EAAO,OAAA,IAAA;AACT;AAEa,MAAA,uBAAA,GAA0B,CACrC,QAAW,GAAA,IAAI,KAAK,cAAe,EAAA,CAAE,eAAgB,EAAA,CAAE,QACpD,KAAA;AACH,EAAA,MAAM,GAAM,GAAAA,cAAA,CAAS,GAAI,EAAA,CAAE,QAAQ,QAAQ,CAAA;AAC3C,EAAO,OAAA,GAAA,CAAI,SAAS,IAAI,CAAA;AAC1B;;;;;;;;;"}
+{"version":3,"file":"date.cjs.js","sources":["../../src/utils/date.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { DateTime } from 'luxon';\nimport { Grouping } from '../types/event';\n\nexport const toStartOfDayUTC = (dateString: string, timezone = 'UTC') =>\n  DateTime.fromFormat(dateString, 'yyyy-MM-dd', { zone: timezone })\n    .startOf('day')\n    .toUTC()\n    .toISO();\n\nexport const toEndOfDayUTC = (dateString: string, timezone = 'UTC') =>\n  DateTime.fromFormat(dateString, 'yyyy-MM-dd', { zone: timezone })\n    .endOf('day')\n    .toUTC()\n    .toISO();\n\nexport const calculateDateRange = (\n  start_date: string,\n  end_date: string,\n): number => {\n  const start = DateTime.fromISO(start_date, { zone: 'UTC' });\n  const end = DateTime.fromISO(end_date, { zone: 'UTC' });\n\n  return Math.floor(end.diff(start, 'days').days);\n};\n\nexport const isSameMonth = (start_date: string, end_date: string): boolean => {\n  const start = DateTime.fromISO(start_date, { zone: 'UTC' });\n  const end = DateTime.fromISO(end_date, { zone: 'UTC' });\n\n  return start.hasSame(end, 'month');\n};\n\nexport const getDateGroupingType = (dateDiff: number): Grouping => {\n  if (dateDiff === 0) return 'hourly';\n  if (dateDiff <= 7) return 'daily';\n  if (dateDiff <= 30) return 'weekly';\n  return 'monthly';\n};\n\nexport const hasZFormat = (dateStr: string): boolean => {\n  return dateStr.includes('Z') || dateStr.includes('T');\n};\n\n/**\n * Normalize any date string or Date to UTC ISO string (e.g. 2026-03-11T16:17:46.540Z).\n * Use this before storing timestamps in the database so they are consistent.\n */\nexport const normalizeToUTCISO = (date: string | Date): string => {\n  if (date instanceof Date) {\n    return date.toISOString();\n  }\n  const s = String(date).trim();\n  // Luxon fromISO handles ISO with Z or offset (e.g. -05:00)\n  let dt = DateTime.fromISO(s, { setZone: true });\n  if (dt.isValid) {\n    return dt.toUTC().toISO() ?? s;\n  }\n  // Try \"yyyy-MM-dd HH:mm:ss.SSS -0500\" or \"yyyy-MM-dd HH:mm:ss -0500\" style\n  dt = DateTime.fromFormat(s, 'yyyy-MM-dd HH:mm:ss.SSS ZZZ', { setZone: true });\n  if (dt.isValid) {\n    return dt.toUTC().toISO() ?? s;\n  }\n  dt = DateTime.fromFormat(s, 'yyyy-MM-dd HH:mm:ss ZZZ', { setZone: true });\n  if (dt.isValid) {\n    return dt.toUTC().toISO() ?? s;\n  }\n  dt = DateTime.fromFormat(s, 'yyyy-MM-dd HH:mm:ss', { zone: 'UTC' });\n  if (dt.isValid) {\n    return dt.toISO() ?? s;\n  }\n  // Return original when unparseable: do not substitute current time, which would\n  // silently corrupt created_at and misplace events in partitions/date-range queries.\n  return s;\n};\n\nexport const convertToTargetTimezone = (\n  date: string | Date,\n  timeZone: string = new Intl.DateTimeFormat().resolvedOptions().timeZone,\n) => {\n  const dateString = date instanceof Date ? date.toISOString() : date;\n\n  const isoParsed = DateTime.fromISO(dateString, { setZone: true });\n\n  if (isoParsed.isValid) {\n    return isoParsed.setZone(timeZone).toISO();\n  }\n\n  // If not valid ISO, try parsing as 'yyyy-MM-dd HH:mm:ss' in UTC\n  const fallback = DateTime.fromFormat(dateString, 'yyyy-MM-dd HH:mm:ss', {\n    zone: 'UTC',\n  });\n\n  if (fallback.isValid) {\n    return fallback.setZone(timeZone).toISO();\n  }\n\n  // Last resort: return the original date\n  console.warn('Unable to parse date:', date);\n  return date;\n};\n\nexport const getTimeZoneOffsetString = (\n  timeZone = new Intl.DateTimeFormat().resolvedOptions().timeZone,\n) => {\n  const now = DateTime.now().setZone(timeZone);\n  return now.toFormat('ZZ');\n};\n"],"names":["DateTime"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-adoption-insights-backend",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "license": "Apache-2.0",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -36,13 +36,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-defaults": "^0.13.1",
-    "@backstage/backend-plugin-api": "^1.5.0",
-    "@backstage/core-plugin-api": "^1.12.0",
+    "@backstage/backend-defaults": "^0.15.1",
+    "@backstage/backend-plugin-api": "^1.6.2",
+    "@backstage/core-plugin-api": "^1.12.2",
     "@backstage/errors": "^1.2.7",
-    "@backstage/plugin-catalog-node": "^1.20.0",
-    "@backstage/plugin-permission-common": "^0.9.3",
-    "@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "^0.6.2",
+    "@backstage/plugin-catalog-node": "^1.20.1",
+    "@backstage/plugin-permission-common": "^0.9.5",
+    "@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "^0.7.0",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "json-2-csv": "^5.5.8",
@@ -52,8 +52,8 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.10.0",
-    "@backstage/cli": "^0.34.5",
+    "@backstage/backend-test-utils": "^1.10.4",
+    "@backstage/cli": "^0.35.3",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.5.0",
     "@types/supertest": "^2.0.12",