feat(vadc_sprint22): Added sanitize function for team project variable

uc-cdis · Nov 14, 2023 · 612e7f2 · 612e7f2
1 parent 597ab2e
commit 612e7f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/Analysis/AnalysisApp.jsx b/src/Analysis/AnalysisApp.jsx
@@ -14,6 +14,7 @@ import GWASContainer from './GWASApp/GWASContainer';
 import GWASResultsContainer from './GWASResults/GWASResultsContainer';
 import CheckForTeamProjectApplication from './SharedUtils/TeamProject/Utils/CheckForTeamProjectApplication';
 import TeamProjectHeader from './SharedUtils/TeamProject/TeamProjectHeader/TeamProjectHeader';
+import SanitizeTeamProjectString from './SharedUtils/TeamProject/Utils/SanitizeTeamProjectString';
 import './AnalysisApp.css';
 
 const queryClient = new QueryClient();
@@ -150,7 +151,11 @@ class AnalysisApp extends React.Component {
               frameBorder='0'
               src={
                 this.state.app.title === 'OHDSI Atlas'
-                  ? `${this.state.app.applicationUrl}#/home?teamproject=${localStorage.getItem('teamProject')}`
+                  ? `${
+                    this.state.app.applicationUrl
+                  }#/home?teamproject=${SanitizeTeamProjectString(
+                    localStorage.getItem('teamProject'),
+                  )}`
                   : `${this.state.app.applicationUrl}`
               }
               onLoad={this.handleIframeApp}

diff --git a/src/Analysis/SharedUtils/TeamProject/Utils/SanitizeTeamProjectString.js b/src/Analysis/SharedUtils/TeamProject/Utils/SanitizeTeamProjectString.js
@@ -0,0 +1,7 @@
+const SanitizeTeamProjectString = (inputString) => {
+  // allow only alphanumeric and slashes
+  const regex = /[^a-zA-Z0-9/]/g;
+  return inputString.replace(regex, '');
+};
+
+export default SanitizeTeamProjectString;
diff --git a/src/Workspace/index.jsx b/src/Workspace/index.jsx
@@ -264,14 +264,12 @@ class Workspace extends React.Component {
       ))) {
         workspaceLaunchStepsConfig.steps[2].description = 'Error';
         workspaceLaunchStepsConfig.currentStepsStatus = 'error';
-      }
-      else
-      {
-        //If container states are available, display detailed pod statuses
+      } else {
+        // If container states are available, display detailed pod statuses
         if (cs.length > 0) {
           for (let i = 0; i < cs.length; i++) {
-            const j = i+1
-            workspaceLaunchStepsConfig.steps[2].description = workspaceLaunchStepsConfig.steps[2].description.concat(' \n Container ' + j + ' Ready: ' + cs[i].ready);
+            const j = i + 1;
+            workspaceLaunchStepsConfig.steps[2].description = workspaceLaunchStepsConfig.steps[2].description.concat(` \n Container ${j} Ready: ${cs[i].ready}`);
           }
         }
       }
@@ -287,8 +285,7 @@ class Workspace extends React.Component {
       workspaceLaunchStepsConfig.currentIndex = 2;
       if (workspaceStatusData.status === 'Launching') {
         workspaceLaunchStepsConfig.steps[2].description = 'ECS task pending';
-      }
-      else if (workspaceStatusData.status !== 'Active') {
+      } else if (workspaceStatusData.status !== 'Active') {
         workspaceLaunchStepsConfig.steps[2].description = 'ECS task failed';
       }
       return workspaceLaunchStepsConfig;
@@ -658,7 +655,7 @@ class Workspace extends React.Component {
                         >
                           {(this.state.workspaceLaunchStepsConfig.steps.map((step) => (
                             <Step
-                              classname = 'workspaceStep'
+                              classname='workspaceStep'
                               key={step.title}
                               title={step.title}
                               description={step.description}