npm - @ynput/ayon-frontend-shared - Versions diffs - 0.2.45 → 0.3.1 - Mend

@ynput/ayon-frontend-shared 0.2.45 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (411) hide show

package/dist/shared/src/hooks/useLoadModules.cjs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useLoadModules.cjs.js","sources":["../../../../src/hooks/useLoadModules.ts"],"sourcesContent":["import { loadRemote } from '@module-federation/enhanced/runtime'\nimport { useEffect, useRef, useState } from 'react'\nimport semver from 'semver'\nimport { FrontendModuleListItem } from '@shared/api'\n\nexport interface ModuleSpec<T> {\n addon: string\n remote: string\n module: string\n fallback?: T\n debug?: boolean\n minVersion?: string\n}\n\ntype ModuleResult<T> = [\n T,\n {\n isLoaded: boolean\n addon: string\n remote: string\n module: string\n minVersion?: string\n outdated?: {\n current: string\n required: string\n }\n },\n]\n\nexport const useLoadModules = <T extends any[]>(\n moduleSpecs: ModuleSpec<T[number]>[],\n modules: FrontendModuleListItem[],\n skip: boolean,\n): { modules: ModuleResult<T[number]>[]; isLoading: boolean } => {\n // Use a ref to track which modules have been processed\n const processedModules = useRef<Set<string>>(new Set())\n\n // Initialize results state\n const [results, setResults] = useState<ModuleResult<T[number]>[]>(() =>\n initializeResults(moduleSpecs),\n )\n const [isLoading, setIsLoading] = useState(modules.length > 0 && !skip)\n\n // Reset and reinitialize when moduleSpecs change\n useEffect(() => {\n if (skip) return\n // Reset the processed modules tracker\n processedModules.current = new Set()\n\n // Initialize results with proper structure\n setResults(initializeResults(moduleSpecs))\n }, [JSON.stringify(moduleSpecs), skip])\n\n const loadModule = async (\n remote: string,\n module: string,\n addon: string,\n fallback: T[number] \| undefined,\n minVersion?: string,\n ) => {\n try {\n const result = await loadRemote<{ default: T[number] }>(`${remote}/${module}`, {\n from: 'runtime',\n })\n updateResultWithLoaded(addon, remote, module, result?.default \|\| fallback, minVersion)\n } catch (error) {\n console.error('Error loading remote module', remote, module, error)\n throw error\n }\n }\n\n // Load modules when remotes are initialized\n useEffect(() => {\n if (skip) {\n setIsLoading(false)\n return\n }\n\n console.log('loading modules')\n\n const promises: Promise<void>[] = []\n moduleSpecs.forEach((spec, index) => {\n const { addon, remote, module, fallback, minVersion } = spec\n\n if (!addon \|\| !remote \|\| !module) return\n\n // Create a unique key for this module\n const moduleKey = `${addon}/${remote}/${module}`\n\n // Skip if already processed\n if (processedModules.current.has(moduleKey)) return\n\n // Check if this module is already loaded in our results\n if (results[index]?.[1]?.isLoaded) {\n processedModules.current.add(moduleKey)\n return\n }\n\n // Mark as processed\n processedModules.current.add(moduleKey)\n\n const addonInfo = modules.find((m) => m.addonName === addon)\n\n // Handle missing addon\n if (!addonInfo) {\n console.log('Addon not found', { addon, remote, module })\n return\n }\n\n // Check version requirements\n if (minVersion && !semver.gte(addonInfo.addonVersion, minVersion)) {\n updateResultWithOutdated(\n index,\n addon,\n remote,\n module,\n fallback,\n minVersion,\n addonInfo.addonVersion,\n )\n return\n }\n\n // Check if module exists\n if (!addonInfo.modules[remote]) {\n console.log('Module not found', { addon, remote, module })\n return\n }\n\n promises.push(loadModule(remote, module, addon, fallback, minVersion))\n })\n\n if (!promises.length) {\n setIsLoading(false)\n return\n }\n\n // Wait for all promises to resolve\n setIsLoading(true)\n Promise.all(promises)\n .then(() => {\n // all modules loaded\n setIsLoading(false)\n })\n .catch((error) => {\n console.error('Error loading modules', error)\n setIsLoading(false)\n })\n }, [skip, modules, JSON.stringify(moduleSpecs)])\n\n // Helper function to initialize results\n function initializeResults(specs: ModuleSpec<T[number]>[]): ModuleResult<T[number]>[] {\n return specs.map(\n ({ addon = '', remote = '', module = '', fallback, minVersion }): ModuleResult<T[number]> => [\n fallback as T[number],\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ],\n )\n }\n\n // Helper to update a result with outdated status\n function updateResultWithOutdated(\n index: number,\n addon: string,\n remote: string,\n module: string,\n fallback: T[number] \| undefined,\n requiredVersion: string,\n currentVersion: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n fallback,\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion: requiredVersion,\n outdated: {\n current: currentVersion,\n required: requiredVersion,\n },\n },\n ]\n }\n return updated\n })\n }\n\n // Helper to update a result when module is loaded\n function updateResultWithLoaded(\n addon: string,\n remote: string,\n module: string,\n loadedModule: T[number] \| undefined,\n minVersion?: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n // Find the corresponding module spec\n const index = moduleSpecs.findIndex(\n (spec) => spec.addon === addon && spec.remote === remote && spec.module === module,\n )\n\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n loadedModule,\n {\n isLoaded: true,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ]\n }\n return updated\n })\n }\n\n return { modules: results, isLoading }\n}\n"],"names":["useLoadModules","moduleSpecs","modules","skip","processedModules","useRef","results","setResults","useState","initializeResults","isLoading","setIsLoading","useEffect","loadModule","remote","module","addon","fallback","minVersion","result","loadRemote","updateResultWithLoaded","error","promises","spec","index","moduleKey","addonInfo","m","semver","updateResultWithOutdated","specs","requiredVersion","currentVersion","prev","updated","loadedModule"],"mappings":"oMA6BaA,EAAiB,CAC5BC,EACAC,EACAC,IAC+D,CAE/D,MAAMC,EAAmBC,EAAAA,OAAoB,IAAI,GAAK,EAGhD,CAACC,EAASC,CAAU,EAAIC,EAAAA,SAAoC,IAChEC,EAAkBR,CAAW,CAAA,EAEzB,CAACS,EAAWC,CAAY,EAAIH,EAAAA,SAASN,EAAQ,OAAS,GAAK,CAACC,CAAI,EAGtES,EAAAA,UAAU,IAAM,CACVT,IAEJC,EAAiB,YAAc,IAG/BG,EAAWE,EAAkBR,CAAW,CAAC,EAC3C,EAAG,CAAC,KAAK,UAAUA,CAAW,EAAGE,CAAI,CAAC,EAEtC,MAAMU,EAAa,MACjBC,EACAC,EACAC,EACAC,EACAC,IACG,CACH,GAAI,CACF,MAAMC,EAAS,MAAMC,4BAAmC,GAAGN,CAAM,IAAIC,CAAM,GAAI,CAC7E,KAAM,SAAA,CACP,EACDM,EAAuBL,EAAOF,EAAQC,EAAQI,GAAQ,SAAWF,EAAUC,CAAU,CACvF,OAASI,EAAO,CACd,cAAQ,MAAM,8BAA+BR,EAAQC,EAAQO,CAAK,EAC5DA,CACR,CACF,EAGAV,EAAAA,UAAU,IAAM,CACd,GAAIT,EAAM,CACRQ,EAAa,EAAK,EAClB,MACF,CAEA,QAAQ,IAAI,iBAAiB,EAE7B,MAAMY,EAA4B,CAAA,EAoDlC,GAnDAtB,EAAY,QAAQ,CAACuB,EAAMC,IAAU,CACnC,KAAM,CAAE,MAAAT,EAAO,OAAAF,EAAQ,OAAAC,EAAQ,SAAAE,EAAU,WAAAC,GAAeM,EAExD,GAAI,CAACR,GAAS,CAACF,GAAU,CAACC,EAAQ,OAGlC,MAAMW,EAAY,GAAGV,CAAK,IAAIF,CAAM,IAAIC,CAAM,GAG9C,GAAIX,EAAiB,QAAQ,IAAIsB,CAAS,EAAG,OAG7C,GAAIpB,EAAQmB,CAAK,IAAI,CAAC,GAAG,SAAU,CACjCrB,EAAiB,QAAQ,IAAIsB,CAAS,EACtC,MACF,CAGAtB,EAAiB,QAAQ,IAAIsB,CAAS,EAEtC,MAAMC,EAAYzB,EAAQ,KAAM0B,GAAMA,EAAE,YAAcZ,CAAK,EAG3D,GAAI,CAACW,EAAW,CACd,QAAQ,IAAI,kBAAmB,CAAE,MAAAX,EAAO,OAAAF,EAAQ,OAAAC,EAAQ,EACxD,MACF,CAGA,GAAIG,GAAc,CAACW,EAAO,IAAIF,EAAU,aAAcT,CAAU,EAAG,CACjEY,EACEL,EACAT,EACAF,EACAC,EACAE,EACAC,EACAS,EAAU,YAAA,EAEZ,MACF,CAGA,GAAI,CAACA,EAAU,QAAQb,CAAM,EAAG,CAC9B,QAAQ,IAAI,mBAAoB,CAAE,MAAAE,EAAO,OAAAF,EAAQ,OAAAC,EAAQ,EACzD,MACF,CAEAQ,EAAS,KAAKV,EAAWC,EAAQC,EAAQC,EAAOC,EAAUC,CAAU,CAAC,CACvE,CAAC,EAEG,CAACK,EAAS,OAAQ,CACpBZ,EAAa,EAAK,EAClB,MACF,CAGAA,EAAa,EAAI,EACjB,QAAQ,IAAIY,CAAQ,EACjB,KAAK,IAAM,CAEVZ,EAAa,EAAK,CACpB,CAAC,EACA,MAAOW,GAAU,CAChB,QAAQ,MAAM,wBAAyBA,CAAK,EAC5CX,EAAa,EAAK,CACpB,CAAC,CACL,EAAG,CAACR,EAAMD,EAAS,KAAK,UAAUD,CAAW,~~CAAC~~,CAAC,~~EAG/C~~,~~SAASQ~~,EAAkBsB,EAA2D,CACpF,OAAOA,EAAM,IACX,CAAC,CAAE,MAAAf,EAAQ,GAAI,OAAAF,EAAS,GAAI,OAAAC,EAAS,GAAI,SAAAE,EAAU,WAAAC,KAA0C,CAC3FD,EACA,CACE,SAAU,GACV,MAAAD,EACA,OAAAF,EACA,OAAAC,EACA,WAAAG,EACA,SAAU,MAAA,CACZ,CACF,CAEJ,CAGA,SAASY,EACPL,EACAT,EACAF,EACAC,EACAE,EACAe,EACAC,EACA,CACA1B,EAAY2B,GAAS,CACnB,MAAMC,EAAU,CAAC,GAAGD,CAAI,EACxB,OAAIT,GAAS,GAAKA,EAAQU,EAAQ,SAChCA,EAAQV,CAAK,EAAI,CACfR,EACA,CACE,SAAU,GACV,MAAAD,EACA,OAAAF,EACA,OAAAC,EACA,WAAYiB,EACZ,SAAU,CACR,QAASC,EACT,SAAUD,CAAA,CACZ,CACF,GAGGG,CACT,CAAC,CACH,CAGA,SAASd,EACPL,EACAF,EACAC,EACAqB,EACAlB,EACA,CACAX,EAAY2B,GAAS,CACnB,MAAMC,EAAU,CAAC,GAAGD,CAAI,EAElBT,EAAQxB,EAAY,UACvBuB,GAASA,EAAK,QAAUR,GAASQ,EAAK,SAAWV,GAAUU,EAAK,SAAWT,CAAA,EAG9E,OAAIU,GAAS,GAAKA,EAAQU,EAAQ,SAChCA,EAAQV,CAAK,EAAI,CACfW,EACA,CACE,SAAU,GACV,MAAApB,EACA,OAAAF,EACA,OAAAC,EACA,WAAAG,EACA,SAAU,MAAA,CACZ,GAGGiB,CACT,CAAC,CACH,CAEA,MAAO,CAAE,QAAS7B,EAAS,UAAAI,CAAA,CAC7B"}
1	+ {"version":3,"file":"useLoadModules.cjs.js","sources":["../../../../src/hooks/useLoadModules.ts"],"sourcesContent":["import { loadRemote } from '@module-federation/enhanced/runtime'\nimport { useEffect, useRef, useState } from 'react'\nimport semver from 'semver'\nimport { FrontendModuleListItem } from '@shared/api'\n\nexport interface ModuleSpec<T> {\n addon: string\n remote: string\n module: string\n fallback?: T\n debug?: boolean\n minVersion?: string\n}\n\ntype ModuleResult<T> = [\n T,\n {\n isLoaded: boolean\n addon: string\n remote: string\n module: string\n minVersion?: string\n outdated?: {\n current: string\n required: string\n }\n },\n]\n\nexport const useLoadModules = <T extends any[]>(\n moduleSpecs: ModuleSpec<T[number]>[],\n modules: FrontendModuleListItem[],\n skip: boolean,\n): { modules: ModuleResult<T[number]>[]; isLoading: boolean } => {\n // Use a ref to track which modules have been processed\n const processedModules = useRef<Set<string>>(new Set())\n\n // Initialize results state\n const [results, setResults] = useState<ModuleResult<T[number]>[]>(() =>\n initializeResults(moduleSpecs),\n )\n const [isLoading, setIsLoading] = useState(modules.length > 0 && !skip)\n\n // Reset and reinitialize when moduleSpecs change\n useEffect(() => {\n if (skip) return\n // Reset the processed modules tracker\n processedModules.current = new Set()\n\n // Initialize results with proper structure\n setResults(initializeResults(moduleSpecs))\n }, [JSON.stringify(moduleSpecs), skip])\n\n const loadModule = async (\n remote: string,\n module: string,\n addon: string,\n fallback: T[number] \| undefined,\n minVersion?: string,\n ) => {\n try {\n const result = await loadRemote<{ default: T[number] }>(`${remote}/${module}`, {\n from: 'runtime',\n })\n updateResultWithLoaded(addon, remote, module, result?.default \|\| fallback, minVersion)\n } catch (error) {\n console.error('Error loading remote module', remote, module, error)\n throw error\n }\n }\n\n // Load modules when remotes are initialized\n useEffect(() => {\n if (skip) {\n setIsLoading(false)\n return\n }\n\n console.log('loading modules')\n\n const promises: Promise<void>[] = []\n moduleSpecs.forEach((spec, index) => {\n const { addon, remote, module, fallback, minVersion } = spec\n\n if (!addon \|\| !remote \|\| !module) return\n\n // Create a unique key for this module\n const moduleKey = `${addon}/${remote}/${module}`\n\n // Skip if already processed\n if (processedModules.current.has(moduleKey)) return\n\n // Check if this module is already loaded in our results\n if (results[index]?.[1]?.isLoaded) {\n processedModules.current.add(moduleKey)\n return\n }\n\n // Mark as processed\n processedModules.current.add(moduleKey)\n\n const addonInfo = modules.find((m) => m.addonName === addon)\n\n // Handle missing addon\n if (!addonInfo) {\n console.log('Addon not found', { addon, remote, module })\n return\n }\n\n // Check version requirements\n if (minVersion && !semver.gte(addonInfo.addonVersion, minVersion)) {\n updateResultWithOutdated(\n index,\n addon,\n remote,\n module,\n fallback,\n minVersion,\n addonInfo.addonVersion,\n )\n return\n }\n\n // Check if module exists\n if (!addonInfo.modules[remote]) {\n console.log('Module not found', { addon, remote, module })\n return\n }\n\n promises.push(loadModule(remote, module, addon, fallback, minVersion))\n })\n\n if (!promises.length) {\n setIsLoading(false)\n return\n }\n\n // Wait for all promises to resolve\n setIsLoading(true)\n Promise.all(promises)\n .then(() => {\n // all modules loaded\n setIsLoading(false)\n })\n .catch((error) => {\n console.error('Error loading modules', error)\n setIsLoading(false)\n })\n }, [skip, modules, JSON.stringify(moduleSpecs), results])\n\n // Helper function to initialize results\n function initializeResults(specs: ModuleSpec<T[number]>[]): ModuleResult<T[number]>[] {\n return specs.map(\n ({ addon = '', remote = '', module = '', fallback, minVersion }): ModuleResult<T[number]> => [\n fallback as T[number],\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ],\n )\n }\n\n // Helper to update a result with outdated status\n function updateResultWithOutdated(\n index: number,\n addon: string,\n remote: string,\n module: string,\n fallback: T[number] \| undefined,\n requiredVersion: string,\n currentVersion: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n fallback,\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion: requiredVersion,\n outdated: {\n current: currentVersion,\n required: requiredVersion,\n },\n },\n ]\n }\n return updated\n })\n }\n\n // Helper to update a result when module is loaded\n function updateResultWithLoaded(\n addon: string,\n remote: string,\n module: string,\n loadedModule: T[number] \| undefined,\n minVersion?: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n // Find the corresponding module spec\n const index = moduleSpecs.findIndex(\n (spec) => spec.addon === addon && spec.remote === remote && spec.module === module,\n )\n\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n loadedModule,\n {\n isLoaded: true,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ]\n }\n return updated\n })\n }\n\n return { modules: results, isLoading }\n}\n"],"names":["useLoadModules","moduleSpecs","modules","skip","processedModules","useRef","results","setResults","useState","initializeResults","isLoading","setIsLoading","useEffect","loadModule","remote","module","addon","fallback","minVersion","result","loadRemote","updateResultWithLoaded","error","promises","spec","index","moduleKey","addonInfo","m","semver","updateResultWithOutdated","specs","requiredVersion","currentVersion","prev","updated","loadedModule"],"mappings":"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"}

package/dist/shared/src/hooks/useLoadModules.es.js CHANGED Viewed

@@ -2,11 +2,11 @@ import { r as N } from "../../../_virtual/runtime.es.js";
 import { useRef as O, useState as y, useEffect as E } from "react";
 import V from "../../../_virtual/semver.es.js";
 const b = (i, m, f) => {
-  const c = O(/* @__PURE__ */ new Set()), [L, h] = y(
+  const c = O(/* @__PURE__ */ new Set()), [h, L] = y(
     () => R(i)
   ), [$, l] = y(m.length > 0 && !f);
   E(() => {
-    f || (c.current = /* @__PURE__ */ new Set(), h(R(i)));
+    f || (c.current = /* @__PURE__ */ new Set(), L(R(i)));
   }, [JSON.stringify(i), f]);
   const w = async (e, n, d, o, r) => {
     try {
@@ -30,7 +30,7 @@ const b = (i, m, f) => {
       if (!o || !r || !t) return;
       const s = `${o}/${r}/${t}`;
       if (c.current.has(s)) return;
-      if (L[d]?.[1]?.isLoaded) {
+      if (h[d]?.[1]?.isLoaded) {
         c.current.add(s);
         return;
       }
@@ -66,7 +66,7 @@ const b = (i, m, f) => {
     }).catch((n) => {
       console.error("Error loading modules", n), l(!1);
     });
-  }, [f, m, JSON.stringify(i)]);
+  }, [f, m, JSON.stringify(i), h]);
   function R(e) {
     return e.map(
       ({ addon: n = "", remote: d = "", module: o = "", fallback: r, minVersion: t }) => [
@@ -83,7 +83,7 @@ const b = (i, m, f) => {
     );
   }
   function M(e, n, d, o, r, t, u) {
-    h((a) => {
+    L((a) => {
       const s = [...a];
       return e >= 0 && e < s.length && (s[e] = [
         r,
@@ -102,7 +102,7 @@ const b = (i, m, f) => {
     });
   }
   function v(e, n, d, o, r) {
-    h((t) => {
+    L((t) => {
       const u = [...t], a = i.findIndex(
         (s) => s.addon === e && s.remote === n && s.module === d
       );
@@ -119,7 +119,7 @@ const b = (i, m, f) => {
       ]), u;
     });
   }
-  return { modules: L, isLoading: $ };
+  return { modules: h, isLoading: $ };
 };
 export {
   b as useLoadModules

package/dist/shared/src/hooks/useLoadModules.es.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useLoadModules.es.js","sources":["../../../../src/hooks/useLoadModules.ts"],"sourcesContent":["import { loadRemote } from '@module-federation/enhanced/runtime'\nimport { useEffect, useRef, useState } from 'react'\nimport semver from 'semver'\nimport { FrontendModuleListItem } from '@shared/api'\n\nexport interface ModuleSpec<T> {\n addon: string\n remote: string\n module: string\n fallback?: T\n debug?: boolean\n minVersion?: string\n}\n\ntype ModuleResult<T> = [\n T,\n {\n isLoaded: boolean\n addon: string\n remote: string\n module: string\n minVersion?: string\n outdated?: {\n current: string\n required: string\n }\n },\n]\n\nexport const useLoadModules = <T extends any[]>(\n moduleSpecs: ModuleSpec<T[number]>[],\n modules: FrontendModuleListItem[],\n skip: boolean,\n): { modules: ModuleResult<T[number]>[]; isLoading: boolean } => {\n // Use a ref to track which modules have been processed\n const processedModules = useRef<Set<string>>(new Set())\n\n // Initialize results state\n const [results, setResults] = useState<ModuleResult<T[number]>[]>(() =>\n initializeResults(moduleSpecs),\n )\n const [isLoading, setIsLoading] = useState(modules.length > 0 && !skip)\n\n // Reset and reinitialize when moduleSpecs change\n useEffect(() => {\n if (skip) return\n // Reset the processed modules tracker\n processedModules.current = new Set()\n\n // Initialize results with proper structure\n setResults(initializeResults(moduleSpecs))\n }, [JSON.stringify(moduleSpecs), skip])\n\n const loadModule = async (\n remote: string,\n module: string,\n addon: string,\n fallback: T[number] \| undefined,\n minVersion?: string,\n ) => {\n try {\n const result = await loadRemote<{ default: T[number] }>(`${remote}/${module}`, {\n from: 'runtime',\n })\n updateResultWithLoaded(addon, remote, module, result?.default \|\| fallback, minVersion)\n } catch (error) {\n console.error('Error loading remote module', remote, module, error)\n throw error\n }\n }\n\n // Load modules when remotes are initialized\n useEffect(() => {\n if (skip) {\n setIsLoading(false)\n return\n }\n\n console.log('loading modules')\n\n const promises: Promise<void>[] = []\n moduleSpecs.forEach((spec, index) => {\n const { addon, remote, module, fallback, minVersion } = spec\n\n if (!addon \|\| !remote \|\| !module) return\n\n // Create a unique key for this module\n const moduleKey = `${addon}/${remote}/${module}`\n\n // Skip if already processed\n if (processedModules.current.has(moduleKey)) return\n\n // Check if this module is already loaded in our results\n if (results[index]?.[1]?.isLoaded) {\n processedModules.current.add(moduleKey)\n return\n }\n\n // Mark as processed\n processedModules.current.add(moduleKey)\n\n const addonInfo = modules.find((m) => m.addonName === addon)\n\n // Handle missing addon\n if (!addonInfo) {\n console.log('Addon not found', { addon, remote, module })\n return\n }\n\n // Check version requirements\n if (minVersion && !semver.gte(addonInfo.addonVersion, minVersion)) {\n updateResultWithOutdated(\n index,\n addon,\n remote,\n module,\n fallback,\n minVersion,\n addonInfo.addonVersion,\n )\n return\n }\n\n // Check if module exists\n if (!addonInfo.modules[remote]) {\n console.log('Module not found', { addon, remote, module })\n return\n }\n\n promises.push(loadModule(remote, module, addon, fallback, minVersion))\n })\n\n if (!promises.length) {\n setIsLoading(false)\n return\n }\n\n // Wait for all promises to resolve\n setIsLoading(true)\n Promise.all(promises)\n .then(() => {\n // all modules loaded\n setIsLoading(false)\n })\n .catch((error) => {\n console.error('Error loading modules', error)\n setIsLoading(false)\n })\n }, [skip, modules, JSON.stringify(moduleSpecs)])\n\n // Helper function to initialize results\n function initializeResults(specs: ModuleSpec<T[number]>[]): ModuleResult<T[number]>[] {\n return specs.map(\n ({ addon = '', remote = '', module = '', fallback, minVersion }): ModuleResult<T[number]> => [\n fallback as T[number],\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ],\n )\n }\n\n // Helper to update a result with outdated status\n function updateResultWithOutdated(\n index: number,\n addon: string,\n remote: string,\n module: string,\n fallback: T[number] \| undefined,\n requiredVersion: string,\n currentVersion: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n fallback,\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion: requiredVersion,\n outdated: {\n current: currentVersion,\n required: requiredVersion,\n },\n },\n ]\n }\n return updated\n })\n }\n\n // Helper to update a result when module is loaded\n function updateResultWithLoaded(\n addon: string,\n remote: string,\n module: string,\n loadedModule: T[number] \| undefined,\n minVersion?: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n // Find the corresponding module spec\n const index = moduleSpecs.findIndex(\n (spec) => spec.addon === addon && spec.remote === remote && spec.module === module,\n )\n\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n loadedModule,\n {\n isLoaded: true,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ]\n }\n return updated\n })\n }\n\n return { modules: results, isLoading }\n}\n"],"names":["useLoadModules","moduleSpecs","modules","skip","processedModules","useRef","results","setResults","useState","initializeResults","isLoading","setIsLoading","useEffect","loadModule","remote","module","addon","fallback","minVersion","result","loadRemote","updateResultWithLoaded","error","promises","spec","index","moduleKey","addonInfo","m","semver","updateResultWithOutdated","specs","requiredVersion","currentVersion","prev","updated","loadedModule"],"mappings":";;;AA6BO,MAAMA,IAAiB,CAC5BC,GACAC,GACAC,MAC+D;AAE/D,QAAMC,IAAmBC,EAAoB,oBAAI,KAAK,GAGhD,CAACC,GAASC,CAAU,IAAIC;AAAA,IAAoC,MAChEC,EAAkBR,CAAW;AAAA,EAAA,GAEzB,CAACS,GAAWC,CAAY,IAAIH,EAASN,EAAQ,SAAS,KAAK,CAACC,CAAI;AAGtE,EAAAS,EAAU,MAAM;AACd,IAAIT,MAEJC,EAAiB,8BAAc,IAAA,GAG/BG,EAAWE,EAAkBR,CAAW,CAAC;AAAA,EAC3C,GAAG,CAAC,KAAK,UAAUA,CAAW,GAAGE,CAAI,CAAC;AAEtC,QAAMU,IAAa,OACjBC,GACAC,GACAC,GACAC,GACAC,MACG;AACH,QAAI;AACF,YAAMC,IAAS,MAAMC,aAAmC,GAAGN,CAAM,IAAIC,CAAM,IAAI;AAAA,QAC7E,MAAM;AAAA,MAAA,CACP;AACD,MAAAM,EAAuBL,GAAOF,GAAQC,GAAQI,GAAQ,WAAWF,GAAUC,CAAU;AAAA,IACvF,SAASI,GAAO;AACd,oBAAQ,MAAM,+BAA+BR,GAAQC,GAAQO,CAAK,GAC5DA;AAAA,IACR;AAAA,EACF;AAGA,EAAAV,EAAU,MAAM;AACd,QAAIT,GAAM;AACR,MAAAQ,EAAa,EAAK;AAClB;AAAA,IACF;AAEA,YAAQ,IAAI,iBAAiB;AAE7B,UAAMY,IAA4B,CAAA;AAoDlC,QAnDAtB,EAAY,QAAQ,CAACuB,GAAMC,MAAU;AACnC,YAAM,EAAE,OAAAT,GAAO,QAAAF,GAAQ,QAAAC,GAAQ,UAAAE,GAAU,YAAAC,MAAeM;AAExD,UAAI,CAACR,KAAS,CAACF,KAAU,CAACC,EAAQ;AAGlC,YAAMW,IAAY,GAAGV,CAAK,IAAIF,CAAM,IAAIC,CAAM;AAG9C,UAAIX,EAAiB,QAAQ,IAAIsB,CAAS,EAAG;AAG7C,UAAIpB,EAAQmB,CAAK,IAAI,CAAC,GAAG,UAAU;AACjC,QAAArB,EAAiB,QAAQ,IAAIsB,CAAS;AACtC;AAAA,MACF;AAGA,MAAAtB,EAAiB,QAAQ,IAAIsB,CAAS;AAEtC,YAAMC,IAAYzB,EAAQ,KAAK,CAAC0B,MAAMA,EAAE,cAAcZ,CAAK;AAG3D,UAAI,CAACW,GAAW;AACd,gBAAQ,IAAI,mBAAmB,EAAE,OAAAX,GAAO,QAAAF,GAAQ,QAAAC,GAAQ;AACxD;AAAA,MACF;AAGA,UAAIG,KAAc,CAACW,EAAO,IAAIF,EAAU,cAAcT,CAAU,GAAG;AACjE,QAAAY;AAAA,UACEL;AAAA,UACAT;AAAA,UACAF;AAAA,UACAC;AAAA,UACAE;AAAA,UACAC;AAAA,UACAS,EAAU;AAAA,QAAA;AAEZ;AAAA,MACF;AAGA,UAAI,CAACA,EAAU,QAAQb,CAAM,GAAG;AAC9B,gBAAQ,IAAI,oBAAoB,EAAE,OAAAE,GAAO,QAAAF,GAAQ,QAAAC,GAAQ;AACzD;AAAA,MACF;AAEA,MAAAQ,EAAS,KAAKV,EAAWC,GAAQC,GAAQC,GAAOC,GAAUC,CAAU,CAAC;AAAA,IACvE,CAAC,GAEG,CAACK,EAAS,QAAQ;AACpB,MAAAZ,EAAa,EAAK;AAClB;AAAA,IACF;AAGA,IAAAA,EAAa,EAAI,GACjB,QAAQ,IAAIY,CAAQ,EACjB,KAAK,MAAM;AAEV,MAAAZ,EAAa,EAAK;AAAA,IACpB,CAAC,EACA,MAAM,CAACW,MAAU;AAChB,cAAQ,MAAM,yBAAyBA,CAAK,GAC5CX,EAAa,EAAK;AAAA,IACpB,CAAC;AAAA,EACL,GAAG,CAACR,GAAMD,GAAS,KAAK,UAAUD,CAAW,~~CAAC~~,CAAC;~~AAG/C~~,~~WAASQ~~,EAAkBsB,GAA2D;AACpF,WAAOA,EAAM;AAAA,MACX,CAAC,EAAE,OAAAf,IAAQ,IAAI,QAAAF,IAAS,IAAI,QAAAC,IAAS,IAAI,UAAAE,GAAU,YAAAC,QAA0C;AAAA,QAC3FD;AAAA,QACA;AAAA,UACE,UAAU;AAAA,UACV,OAAAD;AAAA,UACA,QAAAF;AAAA,UACA,QAAAC;AAAA,UACA,YAAAG;AAAA,UACA,UAAU;AAAA,QAAA;AAAA,MACZ;AAAA,IACF;AAAA,EAEJ;AAGA,WAASY,EACPL,GACAT,GACAF,GACAC,GACAE,GACAe,GACAC,GACA;AACA,IAAA1B,EAAW,CAAC2B,MAAS;AACnB,YAAMC,IAAU,CAAC,GAAGD,CAAI;AACxB,aAAIT,KAAS,KAAKA,IAAQU,EAAQ,WAChCA,EAAQV,CAAK,IAAI;AAAA,QACfR;AAAA,QACA;AAAA,UACE,UAAU;AAAA,UACV,OAAAD;AAAA,UACA,QAAAF;AAAA,UACA,QAAAC;AAAA,UACA,YAAYiB;AAAA,UACZ,UAAU;AAAA,YACR,SAASC;AAAA,YACT,UAAUD;AAAA,UAAA;AAAA,QACZ;AAAA,MACF,IAGGG;AAAA,IACT,CAAC;AAAA,EACH;AAGA,WAASd,EACPL,GACAF,GACAC,GACAqB,GACAlB,GACA;AACA,IAAAX,EAAW,CAAC2B,MAAS;AACnB,YAAMC,IAAU,CAAC,GAAGD,CAAI,GAElBT,IAAQxB,EAAY;AAAA,QACxB,CAACuB,MAASA,EAAK,UAAUR,KAASQ,EAAK,WAAWV,KAAUU,EAAK,WAAWT;AAAA,MAAA;AAG9E,aAAIU,KAAS,KAAKA,IAAQU,EAAQ,WAChCA,EAAQV,CAAK,IAAI;AAAA,QACfW;AAAA,QACA;AAAA,UACE,UAAU;AAAA,UACV,OAAApB;AAAA,UACA,QAAAF;AAAA,UACA,QAAAC;AAAA,UACA,YAAAG;AAAA,UACA,UAAU;AAAA,QAAA;AAAA,MACZ,IAGGiB;AAAA,IACT,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,SAAS7B,GAAS,WAAAI,EAAA;AAC7B;"}
1	+ {"version":3,"file":"useLoadModules.es.js","sources":["../../../../src/hooks/useLoadModules.ts"],"sourcesContent":["import { loadRemote } from '@module-federation/enhanced/runtime'\nimport { useEffect, useRef, useState } from 'react'\nimport semver from 'semver'\nimport { FrontendModuleListItem } from '@shared/api'\n\nexport interface ModuleSpec<T> {\n addon: string\n remote: string\n module: string\n fallback?: T\n debug?: boolean\n minVersion?: string\n}\n\ntype ModuleResult<T> = [\n T,\n {\n isLoaded: boolean\n addon: string\n remote: string\n module: string\n minVersion?: string\n outdated?: {\n current: string\n required: string\n }\n },\n]\n\nexport const useLoadModules = <T extends any[]>(\n moduleSpecs: ModuleSpec<T[number]>[],\n modules: FrontendModuleListItem[],\n skip: boolean,\n): { modules: ModuleResult<T[number]>[]; isLoading: boolean } => {\n // Use a ref to track which modules have been processed\n const processedModules = useRef<Set<string>>(new Set())\n\n // Initialize results state\n const [results, setResults] = useState<ModuleResult<T[number]>[]>(() =>\n initializeResults(moduleSpecs),\n )\n const [isLoading, setIsLoading] = useState(modules.length > 0 && !skip)\n\n // Reset and reinitialize when moduleSpecs change\n useEffect(() => {\n if (skip) return\n // Reset the processed modules tracker\n processedModules.current = new Set()\n\n // Initialize results with proper structure\n setResults(initializeResults(moduleSpecs))\n }, [JSON.stringify(moduleSpecs), skip])\n\n const loadModule = async (\n remote: string,\n module: string,\n addon: string,\n fallback: T[number] \| undefined,\n minVersion?: string,\n ) => {\n try {\n const result = await loadRemote<{ default: T[number] }>(`${remote}/${module}`, {\n from: 'runtime',\n })\n updateResultWithLoaded(addon, remote, module, result?.default \|\| fallback, minVersion)\n } catch (error) {\n console.error('Error loading remote module', remote, module, error)\n throw error\n }\n }\n\n // Load modules when remotes are initialized\n useEffect(() => {\n if (skip) {\n setIsLoading(false)\n return\n }\n\n console.log('loading modules')\n\n const promises: Promise<void>[] = []\n moduleSpecs.forEach((spec, index) => {\n const { addon, remote, module, fallback, minVersion } = spec\n\n if (!addon \|\| !remote \|\| !module) return\n\n // Create a unique key for this module\n const moduleKey = `${addon}/${remote}/${module}`\n\n // Skip if already processed\n if (processedModules.current.has(moduleKey)) return\n\n // Check if this module is already loaded in our results\n if (results[index]?.[1]?.isLoaded) {\n processedModules.current.add(moduleKey)\n return\n }\n\n // Mark as processed\n processedModules.current.add(moduleKey)\n\n const addonInfo = modules.find((m) => m.addonName === addon)\n\n // Handle missing addon\n if (!addonInfo) {\n console.log('Addon not found', { addon, remote, module })\n return\n }\n\n // Check version requirements\n if (minVersion && !semver.gte(addonInfo.addonVersion, minVersion)) {\n updateResultWithOutdated(\n index,\n addon,\n remote,\n module,\n fallback,\n minVersion,\n addonInfo.addonVersion,\n )\n return\n }\n\n // Check if module exists\n if (!addonInfo.modules[remote]) {\n console.log('Module not found', { addon, remote, module })\n return\n }\n\n promises.push(loadModule(remote, module, addon, fallback, minVersion))\n })\n\n if (!promises.length) {\n setIsLoading(false)\n return\n }\n\n // Wait for all promises to resolve\n setIsLoading(true)\n Promise.all(promises)\n .then(() => {\n // all modules loaded\n setIsLoading(false)\n })\n .catch((error) => {\n console.error('Error loading modules', error)\n setIsLoading(false)\n })\n }, [skip, modules, JSON.stringify(moduleSpecs), results])\n\n // Helper function to initialize results\n function initializeResults(specs: ModuleSpec<T[number]>[]): ModuleResult<T[number]>[] {\n return specs.map(\n ({ addon = '', remote = '', module = '', fallback, minVersion }): ModuleResult<T[number]> => [\n fallback as T[number],\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ],\n )\n }\n\n // Helper to update a result with outdated status\n function updateResultWithOutdated(\n index: number,\n addon: string,\n remote: string,\n module: string,\n fallback: T[number] \| undefined,\n requiredVersion: string,\n currentVersion: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n fallback,\n {\n isLoaded: false,\n addon,\n remote,\n module,\n minVersion: requiredVersion,\n outdated: {\n current: currentVersion,\n required: requiredVersion,\n },\n },\n ]\n }\n return updated\n })\n }\n\n // Helper to update a result when module is loaded\n function updateResultWithLoaded(\n addon: string,\n remote: string,\n module: string,\n loadedModule: T[number] \| undefined,\n minVersion?: string,\n ) {\n setResults((prev) => {\n const updated = [...prev]\n // Find the corresponding module spec\n const index = moduleSpecs.findIndex(\n (spec) => spec.addon === addon && spec.remote === remote && spec.module === module,\n )\n\n if (index >= 0 && index < updated.length) {\n updated[index] = [\n loadedModule,\n {\n isLoaded: true,\n addon,\n remote,\n module,\n minVersion,\n outdated: undefined,\n },\n ]\n }\n return updated\n })\n }\n\n return { modules: results, isLoading }\n}\n"],"names":["useLoadModules","moduleSpecs","modules","skip","processedModules","useRef","results","setResults","useState","initializeResults","isLoading","setIsLoading","useEffect","loadModule","remote","module","addon","fallback","minVersion","result","loadRemote","updateResultWithLoaded","error","promises","spec","index","moduleKey","addonInfo","m","semver","updateResultWithOutdated","specs","requiredVersion","currentVersion","prev","updated","loadedModule"],"mappings":"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"}

package/dist/shared/src/util/columnConfigConverter.cjs.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function v(n){const{columns:i=[],groupBy:s,showEmptyGroups:e,sortBy:o,sortDesc:t,rowHeight:c}=n||{},d={},f={left:[],right:[]},l=[],a={};return i.forEach(u=>{const{name:g,visible:m,pinned:C,width:h}=u;d[g]=m!==!1,l.push(g),C&&f.left?.push(g),h!==void 0&&(a[g]=h)}),{columnVisibility:d,columnPinning:f,columnOrder:l,columnSizing:a,sorting:o?[{id:o,desc:t||!1}]:[],groupBy:s?{id:s,desc:!1}:void 0,groupByConfig:{showEmpty:e||!1},rowHeight:c??34}}function w(n,i,s){const e=[...n],o=i.filter(t=>!n.includes(t)&&s.has(t));return[...e,...o]}function B(n,i,s,e){const o=new Set;return Object.keys(n).forEach(t=>o.add(t)),Object.keys(i).forEach(t=>o.add(t)),s.left?.forEach(t=>o.add(t)),s.right?.forEach(t=>o.add(t)),e?.forEach(t=>o.add(t)),o}function S(n,i,s,e){const o={name:n};i.hasOwnProperty(n)&&(o.visible=i[n]);const t=s.left?.includes(n),c=s.right?.includes(n);return(t||c)&&(o.pinned=!0),e[n]!==void 0&&(o.width=e[n]),o}function E(n,i){const{columnVisibility:s,columnPinning:e,columnOrder:o,columnSizing:t,sorting:c,groupBy:d,groupByConfig:f,rowHeight:l}=n,a=B(s,t,e,i||[]),r={columns:w(o,i||[],a).map(u=>S(u,s,e,t))};if(d?r.groupBy=d.id:r.groupBy=void 0,f?.showEmpty!==void 0&&(r.showEmptyGroups=f.showEmpty),c)if(c.length>0){const u=c[0];r.sortBy=u.id,r.sortDesc=u.desc}else r.sortBy=void 0,r.sortDesc=void 0;return l!==void 0&&(r.rowHeight=l),r}exports.convertColumnConfigToTanstackStates=v;exports.convertTanstackStatesToColumnConfig=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function v(n){const{columns:e=[],groupBy:i,showEmptyGroups:s,sortBy:o,sortDesc:t,rowHeight:d}=n||{},f={},a={left:[],right:[]},g=[],h={};e.forEach(r=>{const{name:l,visible:m,pinned:C,width:p}=r;f[l]=m!==!1,g.push(l),C&&a.left?.push(l),p!==void 0&&(h[l]=p)});const y=o?[{id:o,desc:t||!1}]:[];let u;if(typeof i=="string"&&i.length>0)u={id:i,desc:!1};else if(Array.isArray(i)){const r=i.find(l=>typeof l=="string"&&l.length>0);r?u={id:r,desc:!1}:u=void 0}else u=void 0;return{columnVisibility:f,columnPinning:a,columnOrder:g,columnSizing:h,sorting:y,groupBy:u,groupByConfig:{showEmpty:s||!1,entityType:""},rowHeight:d??34}}function w(n,e,i){const s=[...n],o=e.filter(t=>!n.includes(t)&&i.has(t));return[...s,...o]}function B(n,e,i,s){const o=new Set;return Object.keys(n).forEach(t=>o.add(t)),Object.keys(e).forEach(t=>o.add(t)),i.left?.forEach(t=>o.add(t)),i.right?.forEach(t=>o.add(t)),s?.forEach(t=>o.add(t)),o}function S(n,e,i,s){const o={name:n};e.hasOwnProperty(n)&&(o.visible=e[n]);const t=i.left?.includes(n),d=i.right?.includes(n);return(t||d)&&(o.pinned=!0),s[n]!==void 0&&(o.width=s[n]),o}function E(n,e){const{columnVisibility:i,columnPinning:s,columnOrder:o,columnSizing:t,sorting:d,groupBy:f,groupByConfig:a,rowHeight:g}=n,h=B(i,t,s,e||[]),c={columns:w(o,e||[],h).map(r=>S(r,i,s,t))};if(f){const r=Array.isArray(f.id)?f.id[0]:f.id;c.groupBy=r||void 0}else c.groupBy=void 0;if(a?.showEmpty!==void 0&&(c.showEmptyGroups=a.showEmpty),d)if(d.length>0){const r=d[0];c.sortBy=r.id,c.sortDesc=r.desc}else c.sortBy=void 0,c.sortDesc=void 0;return g!==void 0&&(c.rowHeight=g),c}exports.convertColumnConfigToTanstackStates=v;exports.convertTanstackStatesToColumnConfig=E;
 //# sourceMappingURL=columnConfigConverter.cjs.js.map

package/dist/shared/src/util/columnConfigConverter.cjs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"columnConfigConverter.cjs.js","sources":["../../../../src/util/columnConfigConverter.ts"],"sourcesContent":["import {\n VisibilityState,\n ColumnPinningState,\n ColumnOrderState,\n ColumnSizingState,\n SortingState,\n} from '@tanstack/react-table'\nimport { ColumnItemModel, OverviewSettings } from '@shared/api/generated/views'\nimport { ColumnsConfig, TableGroupBy } from '@shared/containers'\nimport { GroupByConfig } from '@shared/containers/ProjectTreeTable/components/GroupSettingsFallback'\n\n/*\n Converts ColumnItemModel array from OverviewSettings to TanStack table states\n /\nexport function convertColumnConfigToTanstackStates(settings: OverviewSettings): ColumnsConfig {\n const { columns = [], groupBy: groupByField, showEmptyGroups, sortBy, sortDesc, rowHeight } = settings \|\| {}\n\n // Initialize state objects\n const columnVisibility: VisibilityState = {}\n const columnPinning: ColumnPinningState = { left: [], right: [] }\n const columnOrder: ColumnOrderState = []\n const columnSizing: ColumnSizingState = {}\n\n // Process each column from the settings\n columns.forEach((column) => {\n const { name, visible, pinned, width } = column\n\n // Column visibility: if visible is undefined, default to true\n columnVisibility[name] = visible !== false\n\n // Column order: maintain the order from the settings\n columnOrder.push(name)\n\n // Column pinning: assuming pinned: true means left pinning\n if (pinned) {\n columnPinning.left?.push(name)\n }\n\n // Column sizing: set width if provided\n if (width !== undefined) {\n columnSizing[name] = width\n }\n })\n\n // Handle sorting\n const sorting: SortingState = sortBy ? [{ id: sortBy, desc: sortDesc \|\| false }] : []\n\n // Handle grouping\n const groupBy: TableGroupBy \| undefined = groupByField\n ? { id: groupByField, desc: false }\n : undefined\n\n const groupByConfig: GroupByConfig = {\n showEmpty: showEmptyGroups \|\| false,\n }\n\n return {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight: rowHeight ?? 34,\n }\n}\n\n/\n Determines the final column order based on columnOrder and allColumnIds\n * - Columns in columnOrder come first (in their specified order)\n * - Remaining columns follow the order from allColumnIds\n /\nfunction determineColumnOrder(\n columnOrder: ColumnOrderState,\n allColumnIds: string[],\n columnsWithState: Set<string>,\n): string[] {\n // Start with columns from columnOrder (these have explicit positioning)\n const orderedColumns = [...columnOrder]\n\n // Add remaining columns from allColumnIds that aren't already in columnOrder\n const remainingColumns = allColumnIds.filter(\n (columnId) => !columnOrder.includes(columnId) && columnsWithState.has(columnId),\n )\n\n return [...orderedColumns, ...remainingColumns]\n}\n\n/\n Collects all columns that have any state (visibility, sizing, pinning, etc.)\n /\nfunction collectColumnsWithState(\n columnVisibility: VisibilityState,\n columnSizing: ColumnSizingState,\n columnPinning: ColumnPinningState,\n allColumnIds: string[],\n): Set<string> {\n const columnsWithState = new Set<string>()\n\n // Add columns with visibility state\n Object.keys(columnVisibility).forEach((col) => columnsWithState.add(col))\n\n // Add columns with sizing state\n Object.keys(columnSizing).forEach((col) => columnsWithState.add(col))\n\n // Add pinned columns\n columnPinning.left?.forEach((col) => columnsWithState.add(col))\n columnPinning.right?.forEach((col) => columnsWithState.add(col))\n\n // Add any additional columns from allColumnIds\n allColumnIds?.forEach((col) => columnsWithState.add(col))\n\n return columnsWithState\n}\n\n/\n Creates a ColumnItemModel for a given column name with all applicable state\n /\nfunction createColumnItem(\n columnName: string,\n columnVisibility: VisibilityState,\n columnPinning: ColumnPinningState,\n columnSizing: ColumnSizingState,\n): ColumnItemModel {\n const column: ColumnItemModel = {\n name: columnName,\n }\n\n // Set visibility if defined in state\n if (columnVisibility.hasOwnProperty(columnName)) {\n column.visible = columnVisibility[columnName]\n }\n\n // Set pinning if column is pinned\n const isPinnedLeft = columnPinning.left?.includes(columnName)\n const isPinnedRight = columnPinning.right?.includes(columnName)\n\n if (isPinnedLeft \|\| isPinnedRight) {\n column.pinned = true\n }\n\n // Set width if defined in state\n if (columnSizing[columnName] !== undefined) {\n column.width = columnSizing[columnName]\n }\n\n return column\n}\n\n/\n Converts TanStack table states back to OverviewSettings format\n \n Column ordering logic:\n * 1. Columns in columnOrder appear first (in their specified order)\n * 2. Remaining columns follow the order from allColumnIds\n * 3. Only columns with state (visibility, sizing, pinning) or in allColumnIds are included\n */\nexport function convertTanstackStatesToColumnConfig(\n states: ColumnsConfig,\n allColumnIds?: string[],\n): OverviewSettings {\n const {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight,\n } = states\n\n // Collect all columns that have any state\n const columnsWithState = collectColumnsWithState(\n columnVisibility,\n columnSizing,\n columnPinning,\n allColumnIds \|\| [],\n )\n\n // Determine the final column order\n const finalColumnOrder = determineColumnOrder(columnOrder, allColumnIds \|\| [], columnsWithState)\n\n // Create ColumnItemModel for each column in the determined order\n const columns: ColumnItemModel[] = finalColumnOrder.map((columnName) =>\n createColumnItem(columnName, columnVisibility, columnPinning, columnSizing),\n )\n\n // Build the result object\n const result: OverviewSettings = {\n columns,\n }\n\n // Add grouping information if present\n if (groupBy) {\n result.groupBy = groupBy.id\n } else {\n result.groupBy = undefined\n }\n\n if (groupByConfig?.showEmpty !== undefined) {\n result.showEmptyGroups = groupByConfig.showEmpty\n }\n\n // Add sorting information if present\n if (sorting) {\n if (sorting.length > 0) {\n // find the column that is being sorted\n const firstSort = sorting[0]\n result.sortBy = firstSort.id\n result.sortDesc = firstSort.desc\n } else {\n // remove sorting\n result.sortBy = undefined\n result.sortDesc = undefined\n }\n }\n\n // Add row height if present\n if (rowHeight !== undefined) {\n result.rowHeight = rowHeight\n }\n\n return result\n}\n"],"names":["convertColumnConfigToTanstackStates","settings","columns","groupByField","showEmptyGroups","sortBy","sortDesc","rowHeight","columnVisibility","columnPinning","columnOrder","columnSizing","column","name","visible","pinned","width","determineColumnOrder","allColumnIds","columnsWithState","orderedColumns","remainingColumns","columnId","collectColumnsWithState","col","createColumnItem","columnName","isPinnedLeft","isPinnedRight","convertTanstackStatesToColumnConfig","states","sorting","groupBy","groupByConfig","result","firstSort"],"mappings":"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"}
1	+ {"version":3,"file":"columnConfigConverter.cjs.js","sources":["../../../../src/util/columnConfigConverter.ts"],"sourcesContent":["import {\n VisibilityState,\n ColumnPinningState,\n ColumnOrderState,\n ColumnSizingState,\n SortingState,\n} from '@tanstack/react-table'\nimport { ColumnItemModel, OverviewSettings } from '@shared/api/generated/views'\nimport { ColumnsConfig, TableGroupBy } from '@shared/containers'\nimport { GroupByConfig } from '@shared/containers/ProjectTreeTable/components/GroupSettingsFallback'\n\n/*\n Converts ColumnItemModel array from OverviewSettings to TanStack table states\n /\nexport function convertColumnConfigToTanstackStates(settings: OverviewSettings): ColumnsConfig {\n const {\n columns = [],\n groupBy: groupByField,\n showEmptyGroups,\n sortBy,\n sortDesc,\n rowHeight,\n } = settings \|\| {}\n\n // Initialize state objects\n const columnVisibility: VisibilityState = {}\n const columnPinning: ColumnPinningState = { left: [], right: [] }\n const columnOrder: ColumnOrderState = []\n const columnSizing: ColumnSizingState = {}\n\n // Process each column from the settings\n columns.forEach((column) => {\n const { name, visible, pinned, width } = column\n\n // Column visibility: if visible is undefined, default to true\n columnVisibility[name] = visible !== false\n\n // Column order: maintain the order from the settings\n columnOrder.push(name)\n\n // Column pinning: assuming pinned: true means left pinning\n if (pinned) {\n columnPinning.left?.push(name)\n }\n\n // Column sizing: set width if provided\n if (width !== undefined) {\n columnSizing[name] = width\n }\n })\n\n // Handle sorting\n const sorting: SortingState = sortBy ? [{ id: sortBy, desc: sortDesc \|\| false }] : []\n\n // Handle grouping\n let groupBy: TableGroupBy \| undefined\n if (typeof groupByField === 'string' && groupByField.length > 0) {\n groupBy = { id: groupByField, desc: false }\n } else if (Array.isArray(groupByField)) {\n const first = groupByField.find((v) => typeof v === 'string' && v.length > 0)\n if (first) {\n groupBy = { id: first, desc: false }\n } else {\n groupBy = undefined\n }\n } else {\n groupBy = undefined\n }\n\n const groupByConfig: GroupByConfig = {\n showEmpty: showEmptyGroups \|\| false,\n entityType: '',\n }\n\n return {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight: rowHeight ?? 34,\n }\n}\n\n/\n Determines the final column order based on columnOrder and allColumnIds\n * - Columns in columnOrder come first (in their specified order)\n * - Remaining columns follow the order from allColumnIds\n /\nfunction determineColumnOrder(\n columnOrder: ColumnOrderState,\n allColumnIds: string[],\n columnsWithState: Set<string>,\n): string[] {\n // Start with columns from columnOrder (these have explicit positioning)\n const orderedColumns = [...columnOrder]\n\n // Add remaining columns from allColumnIds that aren't already in columnOrder\n const remainingColumns = allColumnIds.filter(\n (columnId) => !columnOrder.includes(columnId) && columnsWithState.has(columnId),\n )\n\n return [...orderedColumns, ...remainingColumns]\n}\n\n/\n Collects all columns that have any state (visibility, sizing, pinning, etc.)\n /\nfunction collectColumnsWithState(\n columnVisibility: VisibilityState,\n columnSizing: ColumnSizingState,\n columnPinning: ColumnPinningState,\n allColumnIds: string[],\n): Set<string> {\n const columnsWithState = new Set<string>()\n\n // Add columns with visibility state\n Object.keys(columnVisibility).forEach((col) => columnsWithState.add(col))\n\n // Add columns with sizing state\n Object.keys(columnSizing).forEach((col) => columnsWithState.add(col))\n\n // Add pinned columns\n columnPinning.left?.forEach((col) => columnsWithState.add(col))\n columnPinning.right?.forEach((col) => columnsWithState.add(col))\n\n // Add any additional columns from allColumnIds\n allColumnIds?.forEach((col) => columnsWithState.add(col))\n\n return columnsWithState\n}\n\n/\n Creates a ColumnItemModel for a given column name with all applicable state\n /\nfunction createColumnItem(\n columnName: string,\n columnVisibility: VisibilityState,\n columnPinning: ColumnPinningState,\n columnSizing: ColumnSizingState,\n): ColumnItemModel {\n const column: ColumnItemModel = {\n name: columnName,\n }\n\n // Set visibility if defined in state\n if (columnVisibility.hasOwnProperty(columnName)) {\n column.visible = columnVisibility[columnName]\n }\n\n // Set pinning if column is pinned\n const isPinnedLeft = columnPinning.left?.includes(columnName)\n const isPinnedRight = columnPinning.right?.includes(columnName)\n\n if (isPinnedLeft \|\| isPinnedRight) {\n column.pinned = true\n }\n\n // Set width if defined in state\n if (columnSizing[columnName] !== undefined) {\n column.width = columnSizing[columnName]\n }\n\n return column\n}\n\n/\n Converts TanStack table states back to OverviewSettings format\n \n Column ordering logic:\n * 1. Columns in columnOrder appear first (in their specified order)\n * 2. Remaining columns follow the order from allColumnIds\n * 3. Only columns with state (visibility, sizing, pinning) or in allColumnIds are included\n */\nexport function convertTanstackStatesToColumnConfig(\n states: ColumnsConfig,\n allColumnIds?: string[],\n): OverviewSettings {\n const {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight,\n } = states\n\n // Collect all columns that have any state\n const columnsWithState = collectColumnsWithState(\n columnVisibility,\n columnSizing,\n columnPinning,\n allColumnIds \|\| [],\n )\n\n // Determine the final column order\n const finalColumnOrder = determineColumnOrder(columnOrder, allColumnIds \|\| [], columnsWithState)\n\n // Create ColumnItemModel for each column in the determined order\n const columns: ColumnItemModel[] = finalColumnOrder.map((columnName) =>\n createColumnItem(columnName, columnVisibility, columnPinning, columnSizing),\n )\n\n // Build the result object\n const result: OverviewSettings = {\n columns,\n }\n\n // Add grouping information if present\n if (groupBy) {\n const id = Array.isArray(groupBy.id) ? groupBy.id[0] : groupBy.id\n result.groupBy = id \|\| undefined\n } else {\n result.groupBy = undefined\n }\n\n if (groupByConfig?.showEmpty !== undefined) {\n result.showEmptyGroups = groupByConfig.showEmpty\n }\n\n // Add sorting information if present\n if (sorting) {\n if (sorting.length > 0) {\n // find the column that is being sorted\n const firstSort = sorting[0]\n result.sortBy = firstSort.id\n result.sortDesc = firstSort.desc\n } else {\n // remove sorting\n result.sortBy = undefined\n result.sortDesc = undefined\n }\n }\n\n // Add row height if present\n if (rowHeight !== undefined) {\n result.rowHeight = rowHeight\n }\n\n return result\n}\n"],"names":["convertColumnConfigToTanstackStates","settings","columns","groupByField","showEmptyGroups","sortBy","sortDesc","rowHeight","columnVisibility","columnPinning","columnOrder","columnSizing","column","name","visible","pinned","width","sorting","groupBy","first","v","determineColumnOrder","allColumnIds","columnsWithState","orderedColumns","remainingColumns","columnId","collectColumnsWithState","col","createColumnItem","columnName","isPinnedLeft","isPinnedRight","convertTanstackStatesToColumnConfig","states","groupByConfig","result","id","firstSort"],"mappings":"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"}

package/dist/shared/src/util/columnConfigConverter.es.js CHANGED Viewed

@@ -1,66 +1,89 @@
-function E(n) {
-  const { columns: i = [], groupBy: s, showEmptyGroups: e, sortBy: t, sortDesc: o, rowHeight: c } = n || {}, f = {}, u = { left: [], right: [] }, l = [], g = {};
-  return i.forEach((d) => {
-    const { name: h, visible: m, pinned: w, width: a } = d;
-    f[h] = m !== !1, l.push(h), w && u.left?.push(h), a !== void 0 && (g[h] = a);
-  }), {
+function E(i) {
+  const {
+    columns: s = [],
+    groupBy: n,
+    showEmptyGroups: e,
+    sortBy: o,
+    sortDesc: t,
+    rowHeight: d
+  } = i || {}, f = {}, a = { left: [], right: [] }, g = [], h = {};
+  s.forEach((r) => {
+    const { name: l, visible: m, pinned: v, width: p } = r;
+    f[l] = m !== !1, g.push(l), v && a.left?.push(l), p !== void 0 && (h[l] = p);
+  });
+  const y = o ? [{ id: o, desc: t || !1 }] : [];
+  let u;
+  if (typeof n == "string" && n.length > 0)
+    u = { id: n, desc: !1 };
+  else if (Array.isArray(n)) {
+    const r = n.find((l) => typeof l == "string" && l.length > 0);
+    r ? u = { id: r, desc: !1 } : u = void 0;
+  } else
+    u = void 0;
+  return {
     columnVisibility: f,
-    columnPinning: u,
-    columnOrder: l,
-    columnSizing: g,
-    sorting: t ? [{ id: t, desc: o || !1 }] : [],
-    groupBy: s ? { id: s, desc: !1 } : void 0,
+    columnPinning: a,
+    columnOrder: g,
+    columnSizing: h,
+    sorting: y,
+    groupBy: u,
     groupByConfig: {
-      showEmpty: e || !1
+      showEmpty: e || !1,
+      entityType: ""
     },
-    rowHeight: c ?? 34
+    rowHeight: d ?? 34
   };
 }
-function B(n, i, s) {
-  const e = [...n], t = i.filter(
-    (o) => !n.includes(o) && s.has(o)
+function w(i, s, n) {
+  const e = [...i], o = s.filter(
+    (t) => !i.includes(t) && n.has(t)
   );
-  return [...e, ...t];
+  return [...e, ...o];
 }
-function C(n, i, s, e) {
-  const t = /* @__PURE__ */ new Set();
-  return Object.keys(n).forEach((o) => t.add(o)), Object.keys(i).forEach((o) => t.add(o)), s.left?.forEach((o) => t.add(o)), s.right?.forEach((o) => t.add(o)), e?.forEach((o) => t.add(o)), t;
+function C(i, s, n, e) {
+  const o = /* @__PURE__ */ new Set();
+  return Object.keys(i).forEach((t) => o.add(t)), Object.keys(s).forEach((t) => o.add(t)), n.left?.forEach((t) => o.add(t)), n.right?.forEach((t) => o.add(t)), e?.forEach((t) => o.add(t)), o;
 }
-function v(n, i, s, e) {
-  const t = {
-    name: n
+function B(i, s, n, e) {
+  const o = {
+    name: i
   };
-  i.hasOwnProperty(n) && (t.visible = i[n]);
-  const o = s.left?.includes(n), c = s.right?.includes(n);
-  return (o || c) && (t.pinned = !0), e[n] !== void 0 && (t.width = e[n]), t;
+  s.hasOwnProperty(i) && (o.visible = s[i]);
+  const t = n.left?.includes(i), d = n.right?.includes(i);
+  return (t || d) && (o.pinned = !0), e[i] !== void 0 && (o.width = e[i]), o;
 }
-function S(n, i) {
+function S(i, s) {
   const {
-    columnVisibility: s,
+    columnVisibility: n,
     columnPinning: e,
-    columnOrder: t,
-    columnSizing: o,
-    sorting: c,
+    columnOrder: o,
+    columnSizing: t,
+    sorting: d,
     groupBy: f,
-    groupByConfig: u,
-    rowHeight: l
-  } = n, g = C(
-    s,
-    o,
+    groupByConfig: a,
+    rowHeight: g
+  } = i, h = C(
+    n,
+    t,
     e,
-    i || []
-  ), r = {
-    columns: B(t, i || [], g).map(
-      (d) => v(d, s, e, o)
+    s || []
+  ), c = {
+    columns: w(o, s || [], h).map(
+      (r) => B(r, n, e, t)
     )
   };
-  if (f ? r.groupBy = f.id : r.groupBy = void 0, u?.showEmpty !== void 0 && (r.showEmptyGroups = u.showEmpty), c)
-    if (c.length > 0) {
-      const d = c[0];
-      r.sortBy = d.id, r.sortDesc = d.desc;
+  if (f) {
+    const r = Array.isArray(f.id) ? f.id[0] : f.id;
+    c.groupBy = r || void 0;
+  } else
+    c.groupBy = void 0;
+  if (a?.showEmpty !== void 0 && (c.showEmptyGroups = a.showEmpty), d)
+    if (d.length > 0) {
+      const r = d[0];
+      c.sortBy = r.id, c.sortDesc = r.desc;
     } else
-      r.sortBy = void 0, r.sortDesc = void 0;
-  return l !== void 0 && (r.rowHeight = l), r;
+      c.sortBy = void 0, c.sortDesc = void 0;
+  return g !== void 0 && (c.rowHeight = g), c;
 }
 export {
   E as convertColumnConfigToTanstackStates,

package/dist/shared/src/util/columnConfigConverter.es.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"columnConfigConverter.es.js","sources":["../../../../src/util/columnConfigConverter.ts"],"sourcesContent":["import {\n VisibilityState,\n ColumnPinningState,\n ColumnOrderState,\n ColumnSizingState,\n SortingState,\n} from '@tanstack/react-table'\nimport { ColumnItemModel, OverviewSettings } from '@shared/api/generated/views'\nimport { ColumnsConfig, TableGroupBy } from '@shared/containers'\nimport { GroupByConfig } from '@shared/containers/ProjectTreeTable/components/GroupSettingsFallback'\n\n/*\n Converts ColumnItemModel array from OverviewSettings to TanStack table states\n /\nexport function convertColumnConfigToTanstackStates(settings: OverviewSettings): ColumnsConfig {\n const { columns = [], groupBy: groupByField, showEmptyGroups, sortBy, sortDesc, rowHeight } = settings \|\| {}\n\n // Initialize state objects\n const columnVisibility: VisibilityState = {}\n const columnPinning: ColumnPinningState = { left: [], right: [] }\n const columnOrder: ColumnOrderState = []\n const columnSizing: ColumnSizingState = {}\n\n // Process each column from the settings\n columns.forEach((column) => {\n const { name, visible, pinned, width } = column\n\n // Column visibility: if visible is undefined, default to true\n columnVisibility[name] = visible !== false\n\n // Column order: maintain the order from the settings\n columnOrder.push(name)\n\n // Column pinning: assuming pinned: true means left pinning\n if (pinned) {\n columnPinning.left?.push(name)\n }\n\n // Column sizing: set width if provided\n if (width !== undefined) {\n columnSizing[name] = width\n }\n })\n\n // Handle sorting\n const sorting: SortingState = sortBy ? [{ id: sortBy, desc: sortDesc \|\| false }] : []\n\n // Handle grouping\n const groupBy: TableGroupBy \| undefined = groupByField\n ? { id: groupByField, desc: false }\n : undefined\n\n const groupByConfig: GroupByConfig = {\n showEmpty: showEmptyGroups \|\| false,\n }\n\n return {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight: rowHeight ?? 34,\n }\n}\n\n/\n Determines the final column order based on columnOrder and allColumnIds\n * - Columns in columnOrder come first (in their specified order)\n * - Remaining columns follow the order from allColumnIds\n /\nfunction determineColumnOrder(\n columnOrder: ColumnOrderState,\n allColumnIds: string[],\n columnsWithState: Set<string>,\n): string[] {\n // Start with columns from columnOrder (these have explicit positioning)\n const orderedColumns = [...columnOrder]\n\n // Add remaining columns from allColumnIds that aren't already in columnOrder\n const remainingColumns = allColumnIds.filter(\n (columnId) => !columnOrder.includes(columnId) && columnsWithState.has(columnId),\n )\n\n return [...orderedColumns, ...remainingColumns]\n}\n\n/\n Collects all columns that have any state (visibility, sizing, pinning, etc.)\n /\nfunction collectColumnsWithState(\n columnVisibility: VisibilityState,\n columnSizing: ColumnSizingState,\n columnPinning: ColumnPinningState,\n allColumnIds: string[],\n): Set<string> {\n const columnsWithState = new Set<string>()\n\n // Add columns with visibility state\n Object.keys(columnVisibility).forEach((col) => columnsWithState.add(col))\n\n // Add columns with sizing state\n Object.keys(columnSizing).forEach((col) => columnsWithState.add(col))\n\n // Add pinned columns\n columnPinning.left?.forEach((col) => columnsWithState.add(col))\n columnPinning.right?.forEach((col) => columnsWithState.add(col))\n\n // Add any additional columns from allColumnIds\n allColumnIds?.forEach((col) => columnsWithState.add(col))\n\n return columnsWithState\n}\n\n/\n Creates a ColumnItemModel for a given column name with all applicable state\n /\nfunction createColumnItem(\n columnName: string,\n columnVisibility: VisibilityState,\n columnPinning: ColumnPinningState,\n columnSizing: ColumnSizingState,\n): ColumnItemModel {\n const column: ColumnItemModel = {\n name: columnName,\n }\n\n // Set visibility if defined in state\n if (columnVisibility.hasOwnProperty(columnName)) {\n column.visible = columnVisibility[columnName]\n }\n\n // Set pinning if column is pinned\n const isPinnedLeft = columnPinning.left?.includes(columnName)\n const isPinnedRight = columnPinning.right?.includes(columnName)\n\n if (isPinnedLeft \|\| isPinnedRight) {\n column.pinned = true\n }\n\n // Set width if defined in state\n if (columnSizing[columnName] !== undefined) {\n column.width = columnSizing[columnName]\n }\n\n return column\n}\n\n/\n Converts TanStack table states back to OverviewSettings format\n \n Column ordering logic:\n * 1. Columns in columnOrder appear first (in their specified order)\n * 2. Remaining columns follow the order from allColumnIds\n * 3. Only columns with state (visibility, sizing, pinning) or in allColumnIds are included\n */\nexport function convertTanstackStatesToColumnConfig(\n states: ColumnsConfig,\n allColumnIds?: string[],\n): OverviewSettings {\n const {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight,\n } = states\n\n // Collect all columns that have any state\n const columnsWithState = collectColumnsWithState(\n columnVisibility,\n columnSizing,\n columnPinning,\n allColumnIds \|\| [],\n )\n\n // Determine the final column order\n const finalColumnOrder = determineColumnOrder(columnOrder, allColumnIds \|\| [], columnsWithState)\n\n // Create ColumnItemModel for each column in the determined order\n const columns: ColumnItemModel[] = finalColumnOrder.map((columnName) =>\n createColumnItem(columnName, columnVisibility, columnPinning, columnSizing),\n )\n\n // Build the result object\n const result: OverviewSettings = {\n columns,\n }\n\n // Add grouping information if present\n if (groupBy) {\n result.groupBy = groupBy.id\n } else {\n result.groupBy = undefined\n }\n\n if (groupByConfig?.showEmpty !== undefined) {\n result.showEmptyGroups = groupByConfig.showEmpty\n }\n\n // Add sorting information if present\n if (sorting) {\n if (sorting.length > 0) {\n // find the column that is being sorted\n const firstSort = sorting[0]\n result.sortBy = firstSort.id\n result.sortDesc = firstSort.desc\n } else {\n // remove sorting\n result.sortBy = undefined\n result.sortDesc = undefined\n }\n }\n\n // Add row height if present\n if (rowHeight !== undefined) {\n result.rowHeight = rowHeight\n }\n\n return result\n}\n"],"names":["convertColumnConfigToTanstackStates","settings","columns","groupByField","showEmptyGroups","sortBy","sortDesc","rowHeight","columnVisibility","columnPinning","columnOrder","columnSizing","column","name","visible","pinned","width","determineColumnOrder","allColumnIds","columnsWithState","orderedColumns","remainingColumns","columnId","collectColumnsWithState","col","createColumnItem","columnName","isPinnedLeft","isPinnedRight","convertTanstackStatesToColumnConfig","states","sorting","groupBy","groupByConfig","result","firstSort"],"mappings":"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"}
1	+ {"version":3,"file":"columnConfigConverter.es.js","sources":["../../../../src/util/columnConfigConverter.ts"],"sourcesContent":["import {\n VisibilityState,\n ColumnPinningState,\n ColumnOrderState,\n ColumnSizingState,\n SortingState,\n} from '@tanstack/react-table'\nimport { ColumnItemModel, OverviewSettings } from '@shared/api/generated/views'\nimport { ColumnsConfig, TableGroupBy } from '@shared/containers'\nimport { GroupByConfig } from '@shared/containers/ProjectTreeTable/components/GroupSettingsFallback'\n\n/*\n Converts ColumnItemModel array from OverviewSettings to TanStack table states\n /\nexport function convertColumnConfigToTanstackStates(settings: OverviewSettings): ColumnsConfig {\n const {\n columns = [],\n groupBy: groupByField,\n showEmptyGroups,\n sortBy,\n sortDesc,\n rowHeight,\n } = settings \|\| {}\n\n // Initialize state objects\n const columnVisibility: VisibilityState = {}\n const columnPinning: ColumnPinningState = { left: [], right: [] }\n const columnOrder: ColumnOrderState = []\n const columnSizing: ColumnSizingState = {}\n\n // Process each column from the settings\n columns.forEach((column) => {\n const { name, visible, pinned, width } = column\n\n // Column visibility: if visible is undefined, default to true\n columnVisibility[name] = visible !== false\n\n // Column order: maintain the order from the settings\n columnOrder.push(name)\n\n // Column pinning: assuming pinned: true means left pinning\n if (pinned) {\n columnPinning.left?.push(name)\n }\n\n // Column sizing: set width if provided\n if (width !== undefined) {\n columnSizing[name] = width\n }\n })\n\n // Handle sorting\n const sorting: SortingState = sortBy ? [{ id: sortBy, desc: sortDesc \|\| false }] : []\n\n // Handle grouping\n let groupBy: TableGroupBy \| undefined\n if (typeof groupByField === 'string' && groupByField.length > 0) {\n groupBy = { id: groupByField, desc: false }\n } else if (Array.isArray(groupByField)) {\n const first = groupByField.find((v) => typeof v === 'string' && v.length > 0)\n if (first) {\n groupBy = { id: first, desc: false }\n } else {\n groupBy = undefined\n }\n } else {\n groupBy = undefined\n }\n\n const groupByConfig: GroupByConfig = {\n showEmpty: showEmptyGroups \|\| false,\n entityType: '',\n }\n\n return {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight: rowHeight ?? 34,\n }\n}\n\n/\n Determines the final column order based on columnOrder and allColumnIds\n * - Columns in columnOrder come first (in their specified order)\n * - Remaining columns follow the order from allColumnIds\n /\nfunction determineColumnOrder(\n columnOrder: ColumnOrderState,\n allColumnIds: string[],\n columnsWithState: Set<string>,\n): string[] {\n // Start with columns from columnOrder (these have explicit positioning)\n const orderedColumns = [...columnOrder]\n\n // Add remaining columns from allColumnIds that aren't already in columnOrder\n const remainingColumns = allColumnIds.filter(\n (columnId) => !columnOrder.includes(columnId) && columnsWithState.has(columnId),\n )\n\n return [...orderedColumns, ...remainingColumns]\n}\n\n/\n Collects all columns that have any state (visibility, sizing, pinning, etc.)\n /\nfunction collectColumnsWithState(\n columnVisibility: VisibilityState,\n columnSizing: ColumnSizingState,\n columnPinning: ColumnPinningState,\n allColumnIds: string[],\n): Set<string> {\n const columnsWithState = new Set<string>()\n\n // Add columns with visibility state\n Object.keys(columnVisibility).forEach((col) => columnsWithState.add(col))\n\n // Add columns with sizing state\n Object.keys(columnSizing).forEach((col) => columnsWithState.add(col))\n\n // Add pinned columns\n columnPinning.left?.forEach((col) => columnsWithState.add(col))\n columnPinning.right?.forEach((col) => columnsWithState.add(col))\n\n // Add any additional columns from allColumnIds\n allColumnIds?.forEach((col) => columnsWithState.add(col))\n\n return columnsWithState\n}\n\n/\n Creates a ColumnItemModel for a given column name with all applicable state\n /\nfunction createColumnItem(\n columnName: string,\n columnVisibility: VisibilityState,\n columnPinning: ColumnPinningState,\n columnSizing: ColumnSizingState,\n): ColumnItemModel {\n const column: ColumnItemModel = {\n name: columnName,\n }\n\n // Set visibility if defined in state\n if (columnVisibility.hasOwnProperty(columnName)) {\n column.visible = columnVisibility[columnName]\n }\n\n // Set pinning if column is pinned\n const isPinnedLeft = columnPinning.left?.includes(columnName)\n const isPinnedRight = columnPinning.right?.includes(columnName)\n\n if (isPinnedLeft \|\| isPinnedRight) {\n column.pinned = true\n }\n\n // Set width if defined in state\n if (columnSizing[columnName] !== undefined) {\n column.width = columnSizing[columnName]\n }\n\n return column\n}\n\n/\n Converts TanStack table states back to OverviewSettings format\n \n Column ordering logic:\n * 1. Columns in columnOrder appear first (in their specified order)\n * 2. Remaining columns follow the order from allColumnIds\n * 3. Only columns with state (visibility, sizing, pinning) or in allColumnIds are included\n */\nexport function convertTanstackStatesToColumnConfig(\n states: ColumnsConfig,\n allColumnIds?: string[],\n): OverviewSettings {\n const {\n columnVisibility,\n columnPinning,\n columnOrder,\n columnSizing,\n sorting,\n groupBy,\n groupByConfig,\n rowHeight,\n } = states\n\n // Collect all columns that have any state\n const columnsWithState = collectColumnsWithState(\n columnVisibility,\n columnSizing,\n columnPinning,\n allColumnIds \|\| [],\n )\n\n // Determine the final column order\n const finalColumnOrder = determineColumnOrder(columnOrder, allColumnIds \|\| [], columnsWithState)\n\n // Create ColumnItemModel for each column in the determined order\n const columns: ColumnItemModel[] = finalColumnOrder.map((columnName) =>\n createColumnItem(columnName, columnVisibility, columnPinning, columnSizing),\n )\n\n // Build the result object\n const result: OverviewSettings = {\n columns,\n }\n\n // Add grouping information if present\n if (groupBy) {\n const id = Array.isArray(groupBy.id) ? groupBy.id[0] : groupBy.id\n result.groupBy = id \|\| undefined\n } else {\n result.groupBy = undefined\n }\n\n if (groupByConfig?.showEmpty !== undefined) {\n result.showEmptyGroups = groupByConfig.showEmpty\n }\n\n // Add sorting information if present\n if (sorting) {\n if (sorting.length > 0) {\n // find the column that is being sorted\n const firstSort = sorting[0]\n result.sortBy = firstSort.id\n result.sortDesc = firstSort.desc\n } else {\n // remove sorting\n result.sortBy = undefined\n result.sortDesc = undefined\n }\n }\n\n // Add row height if present\n if (rowHeight !== undefined) {\n result.rowHeight = rowHeight\n }\n\n return result\n}\n"],"names":["convertColumnConfigToTanstackStates","settings","columns","groupByField","showEmptyGroups","sortBy","sortDesc","rowHeight","columnVisibility","columnPinning","columnOrder","columnSizing","column","name","visible","pinned","width","sorting","groupBy","first","v","determineColumnOrder","allColumnIds","columnsWithState","orderedColumns","remainingColumns","columnId","collectColumnsWithState","col","createColumnItem","columnName","isPinnedLeft","isPinnedRight","convertTanstackStatesToColumnConfig","states","groupByConfig","result","id","firstSort"],"mappings":"AAcO,SAASA,EAAoCC,GAA2C;AAC7F,QAAM;AAAA,IACJ,SAAAC,IAAU,CAAA;AAAA,IACV,SAASC;AAAA,IACT,iBAAAC;AAAA,IACA,QAAAC;AAAA,IACA,UAAAC;AAAA,IACA,WAAAC;AAAA,EAAA,IACEN,KAAY,CAAA,GAGVO,IAAoC,CAAA,GACpCC,IAAoC,EAAE,MAAM,CAAA,GAAI,OAAO,CAAA,EAAC,GACxDC,IAAgC,CAAA,GAChCC,IAAkC,CAAA;AAGxC,EAAAT,EAAQ,QAAQ,CAACU,MAAW;AAC1B,UAAM,EAAE,MAAAC,GAAM,SAAAC,GAAS,QAAAC,GAAQ,OAAAC,MAAUJ;AAGzC,IAAAJ,EAAiBK,CAAI,IAAIC,MAAY,IAGrCJ,EAAY,KAAKG,CAAI,GAGjBE,KACFN,EAAc,MAAM,KAAKI,CAAI,GAI3BG,MAAU,WACZL,EAAaE,CAAI,IAAIG;AAAA,EAEzB,CAAC;AAGD,QAAMC,IAAwBZ,IAAS,CAAC,EAAE,IAAIA,GAAQ,MAAMC,KAAY,GAAA,CAAO,IAAI,CAAA;AAGnF,MAAIY;AACJ,MAAI,OAAOf,KAAiB,YAAYA,EAAa,SAAS;AAC5D,IAAAe,IAAU,EAAE,IAAIf,GAAc,MAAM,GAAA;AAAA,WAC3B,MAAM,QAAQA,CAAY,GAAG;AACtC,UAAMgB,IAAQhB,EAAa,KAAK,CAACiB,MAAM,OAAOA,KAAM,YAAYA,EAAE,SAAS,CAAC;AAC5E,IAAID,IACFD,IAAU,EAAE,IAAIC,GAAO,MAAM,GAAA,IAE7BD,IAAU;AAAA,EAEd;AACE,IAAAA,IAAU;AAQZ,SAAO;AAAA,IACL,kBAAAV;AAAA,IACA,eAAAC;AAAA,IACA,aAAAC;AAAA,IACA,cAAAC;AAAA,IACA,SAAAM;AAAA,IACA,SAAAC;AAAA,IACA,eAZmC;AAAA,MACnC,WAAWd,KAAmB;AAAA,MAC9B,YAAY;AAAA,IAAA;AAAA,IAWZ,WAAWG,KAAa;AAAA,EAAA;AAE5B;AAOA,SAASc,EACPX,GACAY,GACAC,GACU;AAEV,QAAMC,IAAiB,CAAC,GAAGd,CAAW,GAGhCe,IAAmBH,EAAa;AAAA,IACpC,CAACI,MAAa,CAAChB,EAAY,SAASgB,CAAQ,KAAKH,EAAiB,IAAIG,CAAQ;AAAA,EAAA;AAGhF,SAAO,CAAC,GAAGF,GAAgB,GAAGC,CAAgB;AAChD;AAKA,SAASE,EACPnB,GACAG,GACAF,GACAa,GACa;AACb,QAAMC,wBAAuB,IAAA;AAG7B,gBAAO,KAAKf,CAAgB,EAAE,QAAQ,CAACoB,MAAQL,EAAiB,IAAIK,CAAG,CAAC,GAGxE,OAAO,KAAKjB,CAAY,EAAE,QAAQ,CAACiB,MAAQL,EAAiB,IAAIK,CAAG,CAAC,GAGpEnB,EAAc,MAAM,QAAQ,CAACmB,MAAQL,EAAiB,IAAIK,CAAG,CAAC,GAC9DnB,EAAc,OAAO,QAAQ,CAACmB,MAAQL,EAAiB,IAAIK,CAAG,CAAC,GAG/DN,GAAc,QAAQ,CAACM,MAAQL,EAAiB,IAAIK,CAAG,CAAC,GAEjDL;AACT;AAKA,SAASM,EACPC,GACAtB,GACAC,GACAE,GACiB;AACjB,QAAMC,IAA0B;AAAA,IAC9B,MAAMkB;AAAA,EAAA;AAIR,EAAItB,EAAiB,eAAesB,CAAU,MAC5ClB,EAAO,UAAUJ,EAAiBsB,CAAU;AAI9C,QAAMC,IAAetB,EAAc,MAAM,SAASqB,CAAU,GACtDE,IAAgBvB,EAAc,OAAO,SAASqB,CAAU;AAE9D,UAAIC,KAAgBC,OAClBpB,EAAO,SAAS,KAIdD,EAAamB,CAAU,MAAM,WAC/BlB,EAAO,QAAQD,EAAamB,CAAU,IAGjClB;AACT;AAUO,SAASqB,EACdC,GACAZ,GACkB;AAClB,QAAM;AAAA,IACJ,kBAAAd;AAAA,IACA,eAAAC;AAAA,IACA,aAAAC;AAAA,IACA,cAAAC;AAAA,IACA,SAAAM;AAAA,IACA,SAAAC;AAAA,IACA,eAAAiB;AAAA,IACA,WAAA5B;AAAA,EAAA,IACE2B,GAGEX,IAAmBI;AAAA,IACvBnB;AAAA,IACAG;AAAA,IACAF;AAAA,IACAa,KAAgB,CAAA;AAAA,EAAC,GAYbc,IAA2B;AAAA,IAC/B,SATuBf,EAAqBX,GAAaY,KAAgB,CAAA,GAAIC,CAAgB,EAG3C;AAAA,MAAI,CAACO,MACvDD,EAAiBC,GAAYtB,GAAkBC,GAAeE,CAAY;AAAA,IAAA;AAAA,EAK1E;AAIF,MAAIO,GAAS;AACX,UAAMmB,IAAK,MAAM,QAAQnB,EAAQ,EAAE,IAAIA,EAAQ,GAAG,CAAC,IAAIA,EAAQ;AAC/D,IAAAkB,EAAO,UAAUC,KAAM;AAAA,EACzB;AACE,IAAAD,EAAO,UAAU;AAQnB,MALID,GAAe,cAAc,WAC/BC,EAAO,kBAAkBD,EAAc,YAIrClB;AACF,QAAIA,EAAQ,SAAS,GAAG;AAEtB,YAAMqB,IAAYrB,EAAQ,CAAC;AAC3B,MAAAmB,EAAO,SAASE,EAAU,IAC1BF,EAAO,WAAWE,EAAU;AAAA,IAC9B;AAEE,MAAAF,EAAO,SAAS,QAChBA,EAAO,WAAW;AAKtB,SAAI7B,MAAc,WAChB6B,EAAO,YAAY7B,IAGd6B;AACT;"}

package/dist/shared/src/util/getGroupByDataType.cjs.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=(e,r)=>{if(!e?.id)return"string";const t=e.id;if(t==="assignees"||t==="tags")return"list_of_strings";if(t.startsWith("attrib.")){const i=t.split(".")[1];return r.find(s=>s.name===i)?.data?.type||"string"}return"string"};exports.getGroupByDataType=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=(e,i)=>{if(!e?.id||typeof e.id!="string")return"string";const t=e.id;if(t==="assignees"||t==="tags")return"list_of_strings";if(t.startsWith("attrib.")){const r=t.split(".")[1];return i.find(s=>s.name===r)?.data?.type||"string"}return"string"};exports.getGroupByDataType=n;
 //# sourceMappingURL=getGroupByDataType.cjs.js.map

package/dist/shared/src/util/getGroupByDataType.cjs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getGroupByDataType.cjs.js","sources":["../../../../src/util/getGroupByDataType.ts"],"sourcesContent":["import { ProjectTableAttribute } from '@shared/containers'\nimport type { TableGroupBy } from '../containers/ProjectTreeTable/context'\nimport { AttributeModel } from '@shared/api'\n\ntype DataType = 'string' \| 'list_of_strings' \| string\n\n/*\n Determines the data type for a groupBy field.\n * Handles special cases for built-in group types (assignees, tags) and attribute-based grouping.\n \n @param groupBy - The group by configuration\n * @param attribFields - Array of available attribute fields\n * @returns The data type as a string ('string', 'list_of_strings', or the attribute type)\n \n @example\n * const dataType = getGroupByDataType(groupBy, attribFields)\n * // Returns 'list_of_strings' for assignees/tags\n * // Returns the attribute type for 'attrib.attributeName'\n * // Returns 'string' as default fallback\n */\nexport const getGroupByDataType = (\n groupBy: TableGroupBy \| undefined,\n attribFields: (ProjectTableAttribute \| AttributeModel)[],\n): DataType => {\n if (!groupBy?.id) return 'string'\n\n const groupById = groupBy.id\n\n // Handle special cases for built-in group types\n if (groupById === 'assignees' \|\| groupById === 'tags') {\n return 'list_of_strings'\n }\n\n // Handle attribute-based grouping (format: \"attrib.attributeName\")\n if (groupById.startsWith('attrib.')) {\n const attributeName = groupById.split('.')[1]\n const attribute = attribFields.find((field) => field.name === attributeName)\n return attribute?.data?.type \|\| 'string'\n }\n\n // Default fallback\n return 'string'\n}\n"],"names":["getGroupByDataType","groupBy","attribFields","groupById","attributeName","field"],"mappings":"gFAoBO,MAAMA,EAAqB,CAChCC,EACAC,IACa,CACb,GAAI,CAACD,GAAS,~~GAAI~~,MAAO,~~SAEzB~~,MAAME,EAAYF,EAAQ,GAG1B,GAAIE,IAAc,aAAeA,IAAc,OAC7C,MAAO,kBAIT,GAAIA,EAAU,WAAW,SAAS,EAAG,CACnC,MAAMC,EAAgBD,EAAU,MAAM,GAAG,EAAE,CAAC,EAE5C,OADkBD,EAAa,KAAMG,GAAUA,EAAM,OAASD,CAAa,GACzD,MAAM,MAAQ,QAClC,CAGA,MAAO,QACT"}
1	+ {"version":3,"file":"getGroupByDataType.cjs.js","sources":["../../../../src/util/getGroupByDataType.ts"],"sourcesContent":["import { ProjectTableAttribute } from '@shared/containers'\nimport type { TableGroupBy } from '../containers/ProjectTreeTable/context'\nimport { AttributeModel } from '@shared/api'\n\ntype DataType = 'string' \| 'list_of_strings' \| string\n\n/*\n Determines the data type for a groupBy field.\n * Handles special cases for built-in group types (assignees, tags) and attribute-based grouping.\n \n @param groupBy - The group by configuration\n * @param attribFields - Array of available attribute fields\n * @returns The data type as a string ('string', 'list_of_strings', or the attribute type)\n \n @example\n * const dataType = getGroupByDataType(groupBy, attribFields)\n * // Returns 'list_of_strings' for assignees/tags\n * // Returns the attribute type for 'attrib.attributeName'\n * // Returns 'string' as default fallback\n */\nexport const getGroupByDataType = (\n groupBy: TableGroupBy \| undefined,\n attribFields: (ProjectTableAttribute \| AttributeModel)[],\n): DataType => {\n if (!groupBy?.id \|\| typeof groupBy.id !== 'string') return 'string'\n\n const groupById = groupBy.id\n\n // Handle special cases for built-in group types\n if (groupById === 'assignees' \|\| groupById === 'tags') {\n return 'list_of_strings'\n }\n\n // Handle attribute-based grouping (format: \"attrib.attributeName\")\n if (groupById.startsWith('attrib.')) {\n const attributeName = groupById.split('.')[1]\n const attribute = attribFields.find((field) => field.name === attributeName)\n return attribute?.data?.type \|\| 'string'\n }\n\n // Default fallback\n return 'string'\n}\n"],"names":["getGroupByDataType","groupBy","attribFields","groupById","attributeName","field"],"mappings":"gFAoBO,MAAMA,EAAqB,CAChCC,EACAC,IACa,CACb,GAAI,CAACD,GAAS,IAAM,OAAOA,EAAQ,IAAO,SAAU,MAAO,SAE3D,MAAME,EAAYF,EAAQ,GAG1B,GAAIE,IAAc,aAAeA,IAAc,OAC7C,MAAO,kBAIT,GAAIA,EAAU,WAAW,SAAS,EAAG,CACnC,MAAMC,EAAgBD,EAAU,MAAM,GAAG,EAAE,CAAC,EAE5C,OADkBD,EAAa,KAAMG,GAAUA,EAAM,OAASD,CAAa,GACzD,MAAM,MAAQ,QAClC,CAGA,MAAO,QACT"}

package/dist/shared/src/util/getGroupByDataType.es.js CHANGED Viewed

@@ -1,11 +1,11 @@
-const a = (r, i) => {
-  if (!r?.id) return "string";
-  const t = r.id;
+const a = (i, r) => {
+  if (!i?.id || typeof i.id != "string") return "string";
+  const t = i.id;
   if (t === "assignees" || t === "tags")
     return "list_of_strings";
   if (t.startsWith("attrib.")) {
     const s = t.split(".")[1];
-    return i.find((e) => e.name === s)?.data?.type || "string";
+    return r.find((e) => e.name === s)?.data?.type || "string";
   }
   return "string";
 };

package/dist/shared/src/util/getGroupByDataType.es.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getGroupByDataType.es.js","sources":["../../../../src/util/getGroupByDataType.ts"],"sourcesContent":["import { ProjectTableAttribute } from '@shared/containers'\nimport type { TableGroupBy } from '../containers/ProjectTreeTable/context'\nimport { AttributeModel } from '@shared/api'\n\ntype DataType = 'string' \| 'list_of_strings' \| string\n\n/*\n Determines the data type for a groupBy field.\n * Handles special cases for built-in group types (assignees, tags) and attribute-based grouping.\n \n @param groupBy - The group by configuration\n * @param attribFields - Array of available attribute fields\n * @returns The data type as a string ('string', 'list_of_strings', or the attribute type)\n \n @example\n * const dataType = getGroupByDataType(groupBy, attribFields)\n * // Returns 'list_of_strings' for assignees/tags\n * // Returns the attribute type for 'attrib.attributeName'\n * // Returns 'string' as default fallback\n */\nexport const getGroupByDataType = (\n groupBy: TableGroupBy \| undefined,\n attribFields: (ProjectTableAttribute \| AttributeModel)[],\n): DataType => {\n if (!groupBy?.id) return 'string'\n\n const groupById = groupBy.id\n\n // Handle special cases for built-in group types\n if (groupById === 'assignees' \|\| groupById === 'tags') {\n return 'list_of_strings'\n }\n\n // Handle attribute-based grouping (format: \"attrib.attributeName\")\n if (groupById.startsWith('attrib.')) {\n const attributeName = groupById.split('.')[1]\n const attribute = attribFields.find((field) => field.name === attributeName)\n return attribute?.data?.type \|\| 'string'\n }\n\n // Default fallback\n return 'string'\n}\n"],"names":["getGroupByDataType","groupBy","attribFields","groupById","attributeName","field"],"mappings":"AAoBO,MAAMA,IAAqB,CAChCC,GACAC,MACa;AACb,MAAI,CAACD,GAAS,~~GAAI~~,QAAO;~~AAEzB~~,QAAME,IAAYF,EAAQ;AAG1B,MAAIE,MAAc,eAAeA,MAAc;AAC7C,WAAO;AAIT,MAAIA,EAAU,WAAW,SAAS,GAAG;AACnC,UAAMC,IAAgBD,EAAU,MAAM,GAAG,EAAE,CAAC;AAE5C,WADkBD,EAAa,KAAK,CAACG,MAAUA,EAAM,SAASD,CAAa,GACzD,MAAM,QAAQ;AAAA,EAClC;AAGA,SAAO;AACT;"}
1	+ {"version":3,"file":"getGroupByDataType.es.js","sources":["../../../../src/util/getGroupByDataType.ts"],"sourcesContent":["import { ProjectTableAttribute } from '@shared/containers'\nimport type { TableGroupBy } from '../containers/ProjectTreeTable/context'\nimport { AttributeModel } from '@shared/api'\n\ntype DataType = 'string' \| 'list_of_strings' \| string\n\n/*\n Determines the data type for a groupBy field.\n * Handles special cases for built-in group types (assignees, tags) and attribute-based grouping.\n \n @param groupBy - The group by configuration\n * @param attribFields - Array of available attribute fields\n * @returns The data type as a string ('string', 'list_of_strings', or the attribute type)\n \n @example\n * const dataType = getGroupByDataType(groupBy, attribFields)\n * // Returns 'list_of_strings' for assignees/tags\n * // Returns the attribute type for 'attrib.attributeName'\n * // Returns 'string' as default fallback\n */\nexport const getGroupByDataType = (\n groupBy: TableGroupBy \| undefined,\n attribFields: (ProjectTableAttribute \| AttributeModel)[],\n): DataType => {\n if (!groupBy?.id \|\| typeof groupBy.id !== 'string') return 'string'\n\n const groupById = groupBy.id\n\n // Handle special cases for built-in group types\n if (groupById === 'assignees' \|\| groupById === 'tags') {\n return 'list_of_strings'\n }\n\n // Handle attribute-based grouping (format: \"attrib.attributeName\")\n if (groupById.startsWith('attrib.')) {\n const attributeName = groupById.split('.')[1]\n const attribute = attribFields.find((field) => field.name === attributeName)\n return attribute?.data?.type \|\| 'string'\n }\n\n // Default fallback\n return 'string'\n}\n"],"names":["getGroupByDataType","groupBy","attribFields","groupById","attributeName","field"],"mappings":"AAoBO,MAAMA,IAAqB,CAChCC,GACAC,MACa;AACb,MAAI,CAACD,GAAS,MAAM,OAAOA,EAAQ,MAAO,SAAU,QAAO;AAE3D,QAAME,IAAYF,EAAQ;AAG1B,MAAIE,MAAc,eAAeA,MAAc;AAC7C,WAAO;AAIT,MAAIA,EAAU,WAAW,SAAS,GAAG;AACnC,UAAMC,IAAgBD,EAAU,MAAM,GAAG,EAAE,CAAC;AAE5C,WADkBD,EAAa,KAAK,CAACG,MAAUA,EAAM,SAASD,CAAa,GACzD,MAAM,QAAQ;AAAA,EAClC;AAGA,SAAO;AACT;"}

package/dist/types/api/queries/activities/getActivities.d.ts CHANGED Viewed

@@ -2577,7 +2577,7 @@ export declare const useGetEntityTooltipQuery: <R extends Record<string, any> =
         first?: number;
         last?: number;
     }, import('@reduxjs/toolkit/query').BaseQueryFn<string | import('@reduxjs/toolkit/query').FetchArgs, unknown, FetchBaseQueryError>, string, ActivitiesResult, "restApi", unknown>>;
-}, "refetch"> & Pick<{
+}, "refetch" | "fetchNextPage" | "fetchPreviousPage"> & Pick<{
     refetch: (options?: Pick<import('@reduxjs/toolkit/query').SubscriptionOptions & {
         skip?: boolean;
         refetchOnMountOrArgChange?: boolean | number;