Fix resources issue

OpenSourceBrain · Mar 5, 2024 · ad90802 · ad90802
1 parent ca2b907
commit ad90802
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/applications/osb-portal/src/components/workspace/drawer/WorkspaceInteractions.tsx b/applications/osb-portal/src/components/workspace/drawer/WorkspaceInteractions.tsx
@@ -113,6 +113,7 @@ interface WorkspaceProps {
   refreshWorkspacePage?: () => void;
   currentResource: WorkspaceResource;
   hideTabs: Boolean;
+  staticPage: Boolean;
 }
 
 const SidebarBox = styled(Box)(({ theme }) => ({
@@ -292,6 +293,7 @@ export default (props: WorkspaceProps | any) => {
               currentResource={props.currentResource}
               refreshWorkspace={handleWorkspaceRefresh}
               user={props.user}
+              staticPage={props.staticPage}
             />
           </TabPanel>
           <TabPanel value={tabValue} index={1}>

diff --git a/applications/osb-portal/src/components/workspace/drawer/WorkspaceResourceBrowser.tsx b/applications/osb-portal/src/components/workspace/drawer/WorkspaceResourceBrowser.tsx
@@ -134,7 +134,7 @@ const OSBResourceItem = (props: {
   const handleOpenResource =
   (e: any | Event) => {
     e.preventDefault();
-    const isApplicationChanged = currentResource.type.application.code !== resource.type.application.code;
+    const isApplicationChanged = currentResource && currentResource.type.application.code !== resource.type.application.code;
     if(isApplicationChanged && window.confirm("Unsaved changes will be lost: are you sure you want to change application?")){
       navigate(
         {pathname: `/workspaces/open/${workspaceId}/${resource.type.application.code}`,
@@ -197,6 +197,7 @@ interface WorkspaceProps {
   refreshWorkspace: () => void;
   currentResource: WorkspaceResource;
   user: UserInfo;
+  staticPage: Boolean;
 }
 
 const WorkspaceResourceBrowser = (props: WorkspaceProps) => {
@@ -277,7 +278,8 @@ const WorkspaceResourceBrowser = (props: WorkspaceProps) => {
                 currentResourceId={currentResourceId}
                 Icon={Icon}
                 workspaceId={workspace.id}
-                currentResource={currentResource}
+                currentResource={props.staticPage ? null: currentResource}
+
               />
             ))}
         </Box>

diff --git a/applications/osb-portal/src/pages/WorkspacePage.tsx b/applications/osb-portal/src/pages/WorkspacePage.tsx
@@ -240,6 +240,7 @@ export const WorkspacePage = (props: any) => {
                     user={user}
                     open={true}
                     hideTabs={true}
+                    staticPage={true}
                     refreshWorkspace={props.refreshWorkspace}
                     currentResource={
                       workspace.lastOpen || workspace.resources[0]