feat: add display name to grouping keys (#771)

libs/handoverapp/src/lib/config/gardenConfig.ts

@@ -2,7 +2,7 @@ import { HandoverPackage } from '@cc-components/handovershared';
 import { useGardenDataSource } from '@cc-components/shared/workspace-config';
 import { useHttpClient } from '@equinor/fusion-framework-react-app/http';
 import { FilterState } from '@equinor/workspace-fusion/filter';
-import { GardenConfig } from '@equinor/workspace-fusion/garden';
+import { CustomItemView, GardenConfig } from '@equinor/workspace-fusion/garden';
 import { GardenHeader, GardenItem } from '../ui-garden';
 
 export const useGardenConfig = (
@@ -32,8 +32,9 @@ export const useGardenConfig = (
     getHeader,
     getSubgroupItems,
     customViews: {
-      customItemView: GardenItem,
-      customHeaderView: GardenHeader,
+      //bs typescript error
+      customItemView: GardenItem as any,
+      customHeaderView: GardenHeader as any,
     },
     visuals: {
       rowHeight: 31,

libs/handoverapp/src/lib/ui-garden/Item.tsx

@@ -16,7 +16,7 @@ import {
 import { PopoverContent } from './PopoverContent';
 import { ItemOptions } from './types';
 
-const HandoverItem = (props: CustomItemView<HandoverPackage>) => {
+const HandoverItem = (args: CustomItemView<HandoverPackage>) => {
   const [isOpen, setIsOpen] = useState(false);
   const hoverTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
@@ -32,7 +32,7 @@ const HandoverItem = (props: CustomItemView<HandoverPackage>) => {
     rowStart,
     columnStart,
     parentRef,
-  } = props;
+  } = args;
 
   const size = getItemSize(data.volume, 100 || 0);
 

libs/handoversidesheet/src/lib/utils-sidesheet/useHandoverResource.ts

@@ -1,5 +1,6 @@
 import { useContextId, usePackageResource } from '@cc-components/shared/hooks';
 import { useHttpClient } from '@equinor/fusion-framework-react-app/http';
+
 import { useCallback } from 'react';
 import {
   HandoverDetails,

libs/heattraceapp/src/lib/config/gardenConfig.tsx

@@ -29,7 +29,7 @@ export const useGardenConfig = (
     getDisplayName: (item) => item.heatTraceCableNo,
     initialGrouping: ['RFC'],
     customViews: {
-      customItemView: GardenItem,
+      customItemView: GardenItem as any,
     },
   };
 };

libs/loopapp/src/lib/config/gardenConfig.ts

@@ -1,5 +1,5 @@
 import { Loop } from '@cc-components/loopshared';
-import { GardenConfig } from '@equinor/workspace-fusion/garden';
+import { CustomItemView, GardenConfig } from '@equinor/workspace-fusion/garden';
 import { FilterState } from '@equinor/workspace-fusion/filter';
 import { GardenItem } from '../ui-garden';
 import { useHttpClient } from '@equinor/fusion-framework-react-app/http';
@@ -25,7 +25,8 @@ export const useGardenConfig = (contextId: string): GardenConfig<Loop, FilterSta
     getDisplayName: (item) => item.loopNo,
     initialGrouping: ['Responsible'],
     customViews: {
-      customItemView: GardenItem,
+      //bs typescript error
+      customItemView: GardenItem as any,
     },
   };
 };

libs/mechanicalcompletionapp/src/lib/config/gardenConfig.tsx

@@ -44,7 +44,7 @@ export const useGardenConfig = (
     getHeader,
     getSubgroupItems,
     customViews: {
-      customItemView: GardenItem,
+      customItemView: GardenItem as any,
     },
     visuals: {
       rowHeight: 31,

libs/modelviewer/src/modules/configurator.ts

@@ -3,7 +3,7 @@ import {
   BaseConfigBuilder,
   ConfigBuilderCallbackArgs,
 } from '@equinor/fusion-framework-module';
-import { type IHttpClient } from '@equinor/fusion-framework-module-http';
+import { IAuthProvider } from '@equinor/fusion-framework-module-msal';
 
 export type ClientOptions = {
   baseUrl: string;
@@ -31,7 +31,7 @@ export class ModelViewerConfigurator extends BaseConfigBuilder<IModelViewerConfi
   protected async _getAutModule({
     hasModule,
     requireInstance,
-  }: ConfigBuilderCallbackArgs) {
+  }: ConfigBuilderCallbackArgs): Promise<IAuthProvider> {
     if (!hasModule('auth')) {
       throw new Error('Fusion MsalModule required to activate this module');
     }

libs/modelviewer/src/services/htmlOverlayToolHandler.ts

@@ -1,4 +1,5 @@
-import { HtmlOverlayOptions, HtmlOverlayTool } from '@cognite/reveal';
+import { HtmlOverlayOptions, HtmlOverlayTool } from '@cognite/reveal/tools';
+
 import { throttle } from 'throttle-typescript';
 import { debounce } from '../utils/debounceUtils';
 import { Echo3dViewer } from '@equinor/echo-3d-viewer';

libs/modelviewer/src/utils/overlayUtils.ts

@@ -1,7 +1,7 @@
 import { AabbModel, Echo3dViewer, combineHierarchyAabbs } from '@equinor/echo-3d-viewer';
 import { Cluster } from '../types/cluster';
 
-import { HtmlOverlayTool } from '@cognite/reveal';
+import { HtmlOverlayTool } from '@cognite/reveal/tools';
 import { OverlayTag, TagMap, TagOverlay } from '../types/overlayTags';
 import { HtmlOverlayToolHandler } from '../services';
 import { ViewerNodeSelection } from '../types/viewerNodeSelection';

libs/pipingapp/src/lib/config/gardenConfig.tsx

@@ -28,7 +28,7 @@ export const useGardenConfig = (
     getDisplayName: (item) => item.id,
     initialGrouping: ['Priority1'],
     customViews: {
-      customItemView: GardenItem,
+      customItemView: GardenItem as any,
     },
   };
 };

libs/punchapp/src/lib/config/gardenConfig.ts

@@ -29,7 +29,7 @@ export const useGardenConfig = (contextId: string): GardenConfig<Punch, FilterSt
       rowHeight: 25,
     },
     customViews: {
-      customItemView: PunchGardenItem,
+      customItemView: PunchGardenItem as any,
     },
   };
 };

libs/shared/package.json

@@ -88,7 +88,7 @@
     "@cc-components/sharedcomponents": "workspace:^",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@equinor/workspace-ag-grid": "2.0.3",
+    "@equinor/workspace-ag-grid": "2.0.5",
     "@remirror/pm": "^2.0.8",
     "@remirror/react": "^2.0.27",
     "@remirror/react-editors": "^1.0.38",

libs/shared/src/packages/cc-api/useCCApiAccessCheck.ts

@@ -1,6 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { CCApiUnauthorizedError } from '../error-boundary';
-import { IHttpClient } from '@equinor/fusion-framework-react-app/http';
+
+import { IHttpClient } from '@equinor/fusion-framework-react/http';
 
 export function useCCApiAccessCheck(
   contextId: string,

libs/shared/src/packages/hooks/src/lib/useServiceDiscovery.ts

@@ -1,6 +1,5 @@
 import { useFramework } from '@equinor/fusion-framework-react';
-import type { IHttpClient } from '@equinor/fusion-framework-react/http';
-
+import { type IHttpClient } from '@equinor/fusion-framework-module-http';
 type ServiceDiscoTypes =
   | 'app-proxy'
   | 'pre-auth-proxy'

libs/shared/src/packages/pbi-helpers/src/lib/usePBIHelpers.ts

@@ -1,7 +1,7 @@
 import { useServiceDiscovery } from '../../../hooks/src/lib/useServiceDiscovery';
-import { IHttpClient } from '@equinor/fusion-framework-react-app/http';
 import { EmbedInfo, EmbedToken, ReportInfo } from './types';
 import { useExternalContextId } from '../../../hooks';
+import { type IHttpClient } from '@equinor/fusion-framework-module-http';
 
 const isEmbedInfo = (embedInfo: unknown): embedInfo is EmbedInfo => {
   return (embedInfo as EmbedInfo).embedConfig.embedUrl !== undefined ? true : false;

libs/shared/src/packages/root-app-wrapper/src/ClientProvider.tsx

@@ -1,5 +1,5 @@
-import { IHttpClient } from '@equinor/fusion-framework-react-app/http';
 import { PropsWithChildren, createContext, useContext } from 'react';
+import { type IHttpClient } from '@equinor/fusion-framework-module-http';
 
 /**
  * Facade for fusion framework http client

libs/shared/src/packages/root-app-wrapper/src/index.tsx

@@ -1,9 +1,9 @@
 import { PropsWithChildren, StrictMode } from 'react';
 import { ClientProvider } from './ClientProvider';
-import { IHttpClient } from '@equinor/fusion-framework-react-app/http';
 import { AppErrorBoundary } from '../../error-boundary';
 import { StyledDefaultLayout } from './DefaultLayout';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { type IHttpClient } from '@equinor/fusion-framework-module-http';
 
 const queryClient = new QueryClient();
 export const RootAppWrapper = ({

libs/shared/src/packages/workspace-config/src/useGardenDataSource.ts

@@ -1,20 +1,21 @@
 import { FilterState } from '@equinor/workspace-fusion/filter';
 import { GardenDataSource } from '@equinor/workspace-fusion/garden';
 
+type GroupingOption = {
+  displayName: string;
+  groupingKey: string;
+  timeInterval: string[] | null;
+  dateVariant: string[] | null;
+};
+
 type ApiGardenMeta = {
   startIndex: number | null;
   columnCount: number;
   columnWidth?: number;
   rowCount: number;
   subGroupCount: number;
-  allGroupingOptions:
-    | string[]
-    | {
-        groupingKey: string;
-        timeInterval: string[] | null;
-        dateVariant: string[] | null;
-      }[];
-  validGroupingOptions: string[];
+  allGroupingOptions: GroupingOption[];
+  validGroupingOptions: GroupingOption[];
 };
 
 type ApiHeader = {
@@ -72,24 +73,8 @@ export function useGardenDataSource(
       }
       const meta: ApiGardenMeta = await res.json();
 
-      const possibleItem = meta.allGroupingOptions.at(0);
-
-      //TODO: remove when api is migrated
-      const groupingOptions: {
-        groupingKey: string;
-        timeInterval: string[] | null;
-        dateVariant: string[] | null;
-      }[] =
-        typeof possibleItem === 'string'
-          ? meta.allGroupingOptions.map((s) => ({
-              timeInterval: null,
-              dateVariant: null,
-              groupingKey: s as string,
-            }))
-          : (meta.allGroupingOptions as any);
-
       return {
-        allGroupingOptions: groupingOptions,
+        allGroupingOptions: meta.allGroupingOptions,
         columnCount: meta.columnCount,
         validGroupingOptions: meta.validGroupingOptions,
         columnStart: meta.startIndex,

libs/swcrapp/src/lib/config/gardenConfig.tsx

@@ -30,7 +30,7 @@ export const useGardenConfig = (
       rowHeight: 25,
     },
     customViews: {
-      customItemView: SwcrItem,
+      customItemView: SwcrItem as any,
     },
   };
 };

libs/workorderapp/src/lib/config/gardenConfig.ts

@@ -33,8 +33,8 @@ export const useGardenConfig = (
     getHeader,
     getSubgroupItems,
     customViews: {
-      customItemView: GardenItem,
-      customHeaderView: GardenHeader,
+      customItemView: GardenItem as any,
+      customHeaderView: GardenHeader as any,
     },
     visuals: {
       rowHeight: 30,

package.json

@@ -59,11 +59,13 @@
     "@equinor/eds-core-react": "^0.28.0",
     "@equinor/eds-icons": "0.19.3",
     "@equinor/eds-tokens": "0.9.2",
-    "@equinor/fusion-framework-module-ag-grid": "30.2.0",
-    "@equinor/fusion-framework-react-app": "^4.1.8",
-    "@equinor/fusion-framework-react-module-context": "^6.0.14",
-    "@equinor/fusion-observable": "8.1.2",
-    "@equinor/workspace-fusion": "6.1.0",
+    "@equinor/fusion-framework-module-ag-grid": "30.2.1",
+    "@equinor/fusion-framework-module-msal": "^3.0.8",
+    "@equinor/fusion-framework-react-app": "^4.1.17",
+    "@equinor/fusion-framework-react-module-context": "^6.0.18",
+    "@equinor/fusion-framework-react-module-http": "^4.0.3",
+    "@equinor/fusion-observable": "8.1.4",
+    "@equinor/workspace-fusion": "6.1.2-pr.5",
     "@microsoft/applicationinsights-web": "^3.0.3",
     "@swc/helpers": "0.5.2",
     "@tanstack/react-query": "^4.35.3",