Feat/cleanup old GWAS UI app code

.eslintrc.js

@@ -184,12 +184,6 @@ module.exports = {
         'react/no-unused-prop-types': 'off',
       },
     },
-    {
-      files: ['src/Analysis/GWASWizard/shared/CustomDichotomousSelect.jsx'],
-      rules: {
-        'react/no-unknown-property': ['error', { ignore: ['align'] }], // centering in h3
-      },
-    },
     // Linting settings for Typescript
     {
       files: ['*.ts', '*.tsx'],

.github/linters/.eslintrc.json

@@ -225,21 +225,6 @@
                 "react/no-unused-prop-types": "off"
             }
         },
-        {
-            "files": [
-                "src/Analysis/GWASWizard/shared/CustomDichotomousSelect.jsx"
-            ],
-            "rules": {
-                "react/no-unknown-property": [
-                    "error",
-                    {
-                        "ignore": [
-                            "align"
-                        ]
-                    }
-                ]
-            }
-        },
         {
             "files": [
                 "*.ts",

src/Analysis/AnalysisApp.jsx

@@ -8,11 +8,10 @@ import { TourProvider } from '@reactour/tour';
 import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock';
 import BackLink from '../components/BackLink';
 import HIVCohortFilter from '../HIVCohortFilter/HIVCohortFilter';
-import ReduxGWASUIApp from './GWASUIApp/ReduxGWASUIApp';
 import { analysisApps } from '../localconf';
 import './AnalysisApp.css';
 import sessionMonitor from '../SessionMonitor';
-import GWASWorkflowList from './GWASUIApp/GWASWorkflowList';
+import GWASWorkflowList from './GWASResults/GWASWorkflowList';
 import GWASContainer from './GWASV2/GWASContainer';
 
 const queryClient = new QueryClient();
@@ -96,30 +95,13 @@ class AnalysisApp extends React.Component {
           <Button label='Run' buttonType='primary' onClick={this.onSubmitJob} isPending={this.isJobRunning()} />
         </React.Fragment>
       );
-    case 'GWASUIApp':
-      return (
-        <TourProvider
-          afterOpen={disableBody}
-          beforeClose={enableBody}
-          disableInteraction
-          onClickClose={({ setCurrentStep, setIsOpen }) => {
-            setIsOpen(false);
-
-            setCurrentStep(0);
-          }}
-        >
-          <div className='analysis-app_flex_col'>
-            <ReduxGWASUIApp />
-          </div>
-        </TourProvider>
-      );
     case 'GWASResults':
       return (
         <div className='analysis-app_flex_row'>
           <GWASWorkflowList refetchInterval={5000} />
         </div>
       );
-    case 'GWAS++': {
+    case 'GWASUIApp': {
       return (
         <TourProvider
           afterOpen={disableBody}

src/Analysis/GWASWizard/shared/GWASJob.jsx → src/Analysis/GWASResults/GWASJob.jsx

@@ -12,9 +12,9 @@ import {
 } from '@ant-design/icons';
 import { useQuery } from 'react-query';
 import PropTypes from 'prop-types';
-import { gwasWorkflowPath } from '../../../localconf';
-import { headers } from '../../../configs';
-import { getPresignedUrl } from '../../AnalysisJob';
+import { gwasWorkflowPath } from '../../localconf';
+import { headers } from '../../configs';
+import { getPresignedUrl } from '../AnalysisJob';
 import { gwasStatus } from './constants';
 
 const GWASJob = ({ workflow }) => {
@@ -163,7 +163,7 @@ const GWASJob = ({ workflow }) => {
 };
 
 GWASJob.propTypes = {
-  workflow: PropTypes.string.isRequired,
+  workflow: PropTypes.object.isRequired,
 };
 
 export default GWASJob;

src/Analysis/GWASUIApp/GWASWorkflowList.jsx → src/Analysis/GWASResults/GWASWorkflowList.jsx

@@ -4,7 +4,7 @@ import './GWASUIApp.css';
 import { useQuery } from 'react-query';
 import PropTypes from 'prop-types';
 import { gwasWorkflowPath } from '../../localconf';
-import GWASJob from '../GWASWizard/shared/GWASJob';
+import GWASJob from './GWASJob';
 
 const GWASWorkflowList = ({ refetchInterval }) => {
   const { Panel } = Collapse;

src/Analysis/GWASUIApp/GWASWorkflowList.stories.jsx → src/Analysis/GWASResults/GWASWorkflowList.stories.jsx

@@ -2,10 +2,10 @@ import React, { useState } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { rest } from 'msw';
 import GWASWorkflowList from './GWASWorkflowList';
-import { gwasStatus } from '../GWASWizard/shared/constants';
+import { gwasStatus } from './constants';
 
 export default {
-  title: 'Tests2/GWASUI/WorkflowList',
+  title: 'Tests2/GWASResults/WorkflowList',
   component: GWASWorkflowList,
 };
 

src/Analysis/GWASResults/constants.js

@@ -0,0 +1,7 @@
+export const gwasStatus = {
+  pending: 'Pending',
+  running: 'Running',
+  succeeded: 'Succeeded',
+  failed: 'Failed',
+  error: 'Error',
+};

src/Analysis/GWASV2/Components/Covariates/CustomDichotomousCovariates.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import SelectCohortDropDown from '../SelectCohort/SelectCohortDropDown';
 import CohortsOverlapDiagram from '../Diagrams/CohortsOverlapDiagram/CohortsOverlapDiagram';
 import './Covariates.css';
-import '../../../GWASUIApp/GWASUIApp.css';
+import '../../../GWASResults/GWASUIApp.css';
 
 const CustomDichotomousCovariates = ({
   dispatch,

src/Analysis/GWASV2/Components/SearchBar/SearchBar.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { SearchOutlined } from '@ant-design/icons';
-import '../../../GWASUIApp/GWASUIApp.css';
+import '../../../GWASResults/GWASUIApp.css';
 
 const SearchBar = ({ searchTerm, handleSearch, field = 'variable name' }) => (
   <div data-tour='search-bar' className='GWASUI-searchContainer'>

src/Analysis/GWASV2/Components/SelectCohort/SelectCohort.stories.jsx

@@ -8,7 +8,7 @@ import { SourceContextProvider } from '../../Utils/Source';
 import ACTIONS from '../../Utils/StateManagement/Actions';
 import './SelectCohort.css';
 import '../../../GWASV2/GWASV2.css';
-import '../../../GWASUIApp/GWASUIApp.css';
+import '../../../GWASResults/GWASUIApp.css';
 
 export default {
   title: 'Tests3/GWASV2/SelectCohort/SelectCohort',

src/Analysis/GWASV2/Components/SelectCohort/SelectCohortDropDown.stories.jsx

@@ -6,7 +6,7 @@ import { Space } from 'antd';
 import { SourceContextProvider } from '../../Utils/Source';
 import './SelectCohort.css';
 import '../../../GWASV2/GWASV2.css';
-import '../../../GWASUIApp/GWASUIApp.css';
+import '../../../GWASResults/GWASUIApp.css';
 
 export default {
   title: 'Tests3/GWASV2/SelectCohort/SelectCohortDropDown',