fix: close sidesheet when context changes (#1012)

equinor · May 3, 2024 · b40d3e8 · b40d3e8
1 parent c4a2175
commit b40d3e8
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 1 deletion.
diff --git a/libs/handoverapp/src/lib/config/workspaceConfig.tsx b/libs/handoverapp/src/lib/config/workspaceConfig.tsx
@@ -1,5 +1,6 @@
 import {
   useCCApiAccessCheck,
+  useCloseSidesheetOnContextChange,
   useContextId,
   usePBIOptions,
   useWorkspaceBookmarks,
@@ -18,6 +19,7 @@ import { useTableConfig } from './tableConfig';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient('cc-app');
   const { isLoading } = useCCApiAccessCheck(contextId, client, 'handover');
 

diff --git a/libs/heattraceapp/src/lib/config/workspaceConfig.tsx b/libs/heattraceapp/src/lib/config/workspaceConfig.tsx
@@ -7,6 +7,7 @@ import { useTableConfig } from './tableConfig';
 import { useStatusBarConfig } from './statusBarConfig';
 import {
   useCCApiAccessCheck,
+  useCloseSidesheetOnContextChange,
   useContextId,
   useHttpClient,
   usePBIOptions,
@@ -18,6 +19,7 @@ import { sidesheetConfig } from './heattraceSidesheet';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient();
   const { isLoading } = useCCApiAccessCheck(contextId, client, 'heat-trace');
 

diff --git a/libs/loopapp/src/lib/config/workspaceConfig.tsx b/libs/loopapp/src/lib/config/workspaceConfig.tsx
@@ -4,6 +4,7 @@ import {
   useContextId,
   useHttpClient,
   useWorkspaceBookmarks,
+  useCloseSidesheetOnContextChange,
 } from '@cc-components/shared';
 import { useFilterConfig } from '@cc-components/shared/workspace-config';
 import { Workspace } from '@equinor/workspace-fusion';
@@ -19,6 +20,7 @@ import { CCApiAccessLoading } from '@cc-components/sharedcomponents';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const pbi = usePBIOptions('loop-analytics', {
     column: 'ProjectMaster GUID',
     table: 'Dim_ProjectMaster',

diff --git a/libs/mechanicalcompletionapp/src/lib/config/workspaceConfig.tsx b/libs/mechanicalcompletionapp/src/lib/config/workspaceConfig.tsx
@@ -1,5 +1,6 @@
 import {
   useCCApiAccessCheck,
+  useCloseSidesheetOnContextChange,
   useContextId,
   useWorkspaceBookmarks,
 } from '@cc-components/shared';
@@ -18,6 +19,7 @@ import { useTableConfig } from './tableConfig';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient('cc-app');
   const { isLoading } = useCCApiAccessCheck(contextId, client, 'mechanical-completion');
 

diff --git a/libs/pipingapp/src/lib/config/workspaceConfig.tsx b/libs/pipingapp/src/lib/config/workspaceConfig.tsx
@@ -11,13 +11,15 @@ import {
   useCCApiAccessCheck,
   useWorkspaceBookmarks,
   usePBIOptions,
+  useCloseSidesheetOnContextChange,
 } from '@cc-components/shared';
 import { useGardenConfig } from './gardenConfig';
 import { sidesheetConfig } from './pipingSidesheet';
 import { CCApiAccessLoading } from '@cc-components/sharedcomponents';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient();
   const { isLoading } = useCCApiAccessCheck(contextId, client, 'pipetest');
   const { bookmarkKey, currentBookmark, onBookmarkChange } = useWorkspaceBookmarks();

diff --git a/libs/punchapp/src/lib/config/workspaceConfig.tsx b/libs/punchapp/src/lib/config/workspaceConfig.tsx
@@ -1,5 +1,6 @@
 import {
   useCCApiAccessCheck,
+  useCloseSidesheetOnContextChange,
   useContextId,
   useHttpClient,
   usePBIOptions,
@@ -21,6 +22,7 @@ import { useGardenConfig } from './gardenConfig';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const ccApi = useHttpClient();
   const { bookmarkKey, currentBookmark, onBookmarkChange } = useWorkspaceBookmarks();
 

diff --git a/libs/scopechangerequestapp/src/lib/config/workspaceConfig.tsx b/libs/scopechangerequestapp/src/lib/config/workspaceConfig.tsx
@@ -7,6 +7,7 @@ import { gridModule } from '@equinor/workspace-fusion/grid-module';
 import { useTableConfig } from './tableConfig';
 import { useFilterConfig } from '@cc-components/shared/workspace-config';
 import {
+  useCloseSidesheetOnContextChange,
   useContextId,
   useHttpClient,
   useWorkspaceBookmarks,
@@ -19,6 +20,7 @@ const options: WorkspaceConfig<ScopeChangeRequest> = {
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient();
 
   const pbi = usePBIOptions('pp-scope-change-analytics', {

diff --git a/libs/shared/src/packages/hooks/src/lib/index.ts b/libs/shared/src/packages/hooks/src/lib/index.ts
@@ -2,3 +2,4 @@ export { usePackageResource } from './useResourceData';
 export * from './useExternalContextId';
 export * from './useContextId';
 export * from './useServiceDiscovery';
+export * from './useCloseSidesheetOnContextChanges';
diff --git a/libs/shared/src/packages/hooks/src/lib/useCloseSidesheetOnContextChanges.ts b/libs/shared/src/packages/hooks/src/lib/useCloseSidesheetOnContextChanges.ts
@@ -0,0 +1,25 @@
+import { useEffect, useRef } from "react";
+import { useContextId } from "./useContextId";
+
+function usePrevious(value: string) {
+  const ref = useRef<string>();
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref.current;
+}
+
+export function useCloseSidesheetOnContextChange() {
+  const contextId = useContextId();
+  const previous = usePrevious(contextId)
+
+  useEffect(() => {
+    if (previous && previous !== contextId) {
+
+      const url = new URL(window.location.href)
+      url.searchParams.delete("item")
+      window.history.pushState(null, "", url);
+    }
+  }, [contextId])
+
+}
diff --git a/libs/swcrapp/src/lib/config/workspaceConfig.tsx b/libs/swcrapp/src/lib/config/workspaceConfig.tsx
@@ -1,5 +1,6 @@
 import {
   useCCApiAccessCheck,
+  useCloseSidesheetOnContextChange,
   useContextId,
   useHttpClient,
   usePBIOptions,
@@ -21,6 +22,7 @@ import { useTableConfig } from './tableConfig';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
+  useCloseSidesheetOnContextChange();
   const ccApi = useHttpClient();
 
   const pbi = usePBIOptions('swcr-analytics', {

diff --git a/libs/workorderapp/src/lib/config/workspace.tsx b/libs/workorderapp/src/lib/config/workspace.tsx
@@ -4,6 +4,7 @@ import {
   useHttpClient,
   usePBIOptions,
   useWorkspaceBookmarks,
+  useCloseSidesheetOnContextChange
 } from '@cc-components/shared';
 import { useFilterConfig } from '@cc-components/shared/workspace-config';
 import Workspace from '@equinor/workspace-fusion';
@@ -20,7 +21,7 @@ import { CCApiAccessLoading } from '@cc-components/sharedcomponents';
 
 export const WorkspaceWrapper = () => {
   const contextId = useContextId();
-
+  useCloseSidesheetOnContextChange();
   const client = useHttpClient();
   const { bookmarkKey, currentBookmark, onBookmarkChange } = useWorkspaceBookmarks();
   const { isLoading } = useCCApiAccessCheck(contextId, client, 'work-orders');
@@ -36,10 +37,12 @@ export const WorkspaceWrapper = () => {
   const statusBarConfig = useStatusBarConfig(contextId);
   const gardenConfig = useGardenConfig(contextId);
 
+
   if (isLoading) {
     return <CCApiAccessLoading />;
   }
 
+
   return (
     <>
       <Workspace