Minor refactorings

src/__test__/components/PipelineLoadingScreen.test.jsx → src/__test__/components/Gem2SLoadingScreen.test.jsx

@@ -10,7 +10,7 @@ import fetchAPI from 'utils/http/fetchAPI';
 import GEM2SLoadingScreen from 'components/GEM2SLoadingScreen';
 import '__test__/test-utils/setupTests';
 
-const { Title, Text } = Typography;
+const { Title } = Typography;
 
 const mockStore = configureMockStore([thunk]);
 

src/__test__/utils/upload/processSeuratUpload.test.js

@@ -14,8 +14,6 @@ import UploadStatus from 'utils/upload/UploadStatus';
 
 import processUpload from 'utils/upload/processUpload';
 
-import validate from 'utils/upload/validateSeurat';
-import pushNotificationMessage from 'utils/pushNotificationMessage';
 import mockFile from '__test__/test-utils/mockFile';
 
 const FILE_SIZE = 1024 * 1024 * 15;
@@ -76,7 +74,6 @@ jest.mock('axios', () => ({
 }));
 
 jest.mock('utils/pushNotificationMessage');
-jest.mock('utils/upload/validateSeurat');
 
 let store = null;
 
@@ -233,34 +230,4 @@ describe('processUpload', () => {
       expect(axios.request).not.toHaveBeenCalled();
     });
   });
-
-  it('Should not validate .rds files', async () => {
-    const mockAxiosCalls = [];
-    const uploadSuccess = (params) => {
-      mockAxiosCalls.push(params);
-      return Promise.resolve({ headers: { etag: 'etag-blah' } });
-    };
-
-    axios.request.mockImplementation(uploadSuccess);
-
-    validate.mockImplementationOnce(
-      () => (['Some file error']),
-    );
-
-    await processUpload(
-      getValidFiles(),
-      sampleType,
-      store.getState().samples,
-      mockExperimentId,
-      store.dispatch,
-    );
-
-    // We expect uploads to happen
-    await waitFor(() => {
-      expect();
-      expect(pushNotificationMessage).toHaveBeenCalledTimes(0);
-      expect(axios.request).toHaveBeenCalledTimes(2);
-      expect(validate).toHaveBeenCalledTimes(1);
-    });
-  });
 });

src/components/data-exploration/cell-sets-tool/CellSetsTool.jsx

@@ -72,7 +72,7 @@ const CellSetsTool = (props) => {
     setTreeData(composeTree(hierarchy, properties));
   }, [hierarchy, properties]);
 
-  const [numSelectedCellSetKeys, setNumSelectedCellSetKeys] = useState(0);
+  const [numSelectedCellSetKeys, setNumSelectedCellSetKeys] = useState(null);
 
   useEffect(() => {
     const louvainClusters = hierarchy.find(({ key }) => key === 'louvain')?.children;
@@ -89,6 +89,11 @@ const CellSetsTool = (props) => {
   }, [hierarchy]);
 
   useEffect(() => {
+    if (selectedCellSetKeys.length === 0) {
+      setNumSelectedCellSetKeys(null);
+      return;
+    }
+
     const selectedCells = union(selectedCellSetKeys, properties);
 
     const numSelectedFiltered = new Set([...selectedCells]
@@ -124,7 +129,7 @@ const CellSetsTool = (props) => {
   const renderContent = () => {
     let operations = null;
 
-    if (numSelectedCellSetKeys > 0) {
+    if (numSelectedCellSetKeys !== null) {
       operations = (
         <Space style={{ marginBottom: '10px' }}>
           <SubsetCellSetsOperation

src/utils/upload/validateSeurat.js

@@ -1,3 +1,5 @@
-const validateSeurat = async () => {};
+const validateSeurat = async () => {
+  // Currently there is no content checking for H5 files
+};
 
 export default validateSeurat;