Fix resource switch with special characters

OpenSourceBrain · Nov 15, 2023 · fc57208 · fc57208
1 parent 0d8fde5
commit fc57208
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/applications/osb-portal/src/components/workspace/drawer/WorkspaceResourceBrowser.tsx b/applications/osb-portal/src/components/workspace/drawer/WorkspaceResourceBrowser.tsx
@@ -103,7 +103,7 @@ const OSBResourceItem = (props: {
     Icon,
   } = props;
   const canOpenFile: boolean =
-    resource.status === ResourceStatus.available && !active;
+    resource.status === ResourceStatus.available;
   const [waiting, setWaiting] = React.useState(
     resource.status === ResourceStatus.pending
   );
@@ -129,7 +129,7 @@ const OSBResourceItem = (props: {
   (e: any) => {
     navigate(
       {pathname: `/workspace/open/${workspaceId}/${resource.type.application.code}`,
-      search: `?resource=${resource.name}`},
+      search: `?resource=${encodeURIComponent(resource.name)}`},
     )
   };
 

diff --git a/applications/osb-portal/src/pages/SampleIframePage.tsx b/applications/osb-portal/src/pages/SampleIframePage.tsx
@@ -4,8 +4,7 @@ const SampleIframePage = () => {
   const [fileLoaded, setFileLoaded] = React.useState("");
   React.useEffect(() => {
     if (window !== window.parent) {
-      setTimeout(() => {
-      window.parent.postMessage({ type: "APP_READY" }, "*");}, 1000);
+      window.parent.postMessage({ type: "APP_READY" }, "*");
     }
     return () => {};
   }, []);

diff --git a/applications/osb-portal/src/pages/WorkspaceOpenPage.tsx b/applications/osb-portal/src/pages/WorkspaceOpenPage.tsx
@@ -14,7 +14,9 @@ export default (props: any) => {
     app: string;
   }>();
 
-  props.selectWorkspace(workspaceId);
+  React.useEffect(() => {
+    props.selectWorkspace(workspaceId);
+  }, [workspaceId]);
 
   return (
     <Box className="verticalFill">