- Disables import of multiple assets for one feature

TACC-Cloud · Feb 14, 2025 · eac0164 · eac0164
1 parent cece066
commit eac0164
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/react/src/components/AssetDetail/AssetButton.tsx b/react/src/components/AssetDetail/AssetButton.tsx
@@ -31,11 +31,8 @@ const AssetButton: React.FC<AssetButtonProps> = ({
   /* Uncomment when WG-422 polling is merged 
   const notification = useNotification();*/
   const featureId = selectedFeature.id;
-  const {
-    mutate: importFeatureAsset,
-    isPending: isImporting,
-    isSuccess: isImportingSuccess,
-  } = useImportFeatureAsset(projectId, featureId);
+  const { mutate: importFeatureAsset, isPending: isImporting } =
+    useImportFeatureAsset(projectId, featureId);
 
   const handleSubmit = (files: TapisFilePath[]) => {
     for (const file of files) {
@@ -82,7 +79,7 @@ const AssetButton: React.FC<AssetButtonProps> = ({
           type="primary"
           onClick={() => setIsModalOpen(true)}
           isLoading={isImporting}
-          disabled={isImportingSuccess}
+          disabled={isImporting}
         >
           Add Asset from DesignSafe
         </Button>

diff --git a/react/src/components/FileBrowserModal/FileBrowserModal.tsx b/react/src/components/FileBrowserModal/FileBrowserModal.tsx
@@ -1,8 +1,10 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import { Modal, Button, Layout, Typography } from 'antd';
 import { FileListing } from '../Files';
 import { File, TapisFilePath } from '@hazmapper/types';
 import { convertFilesToTapisPaths } from '@hazmapper/utils/fileUtils';
+import { IMPORTABLE_FEATURE_ASSET_TYPES } from '@hazmapper/utils/fileUtils';
+import { SectionMessage } from '@tacc/core-components';
 
 type FileBrowserModalProps = {
   isOpen: boolean;
@@ -21,6 +23,15 @@ const FileBrowserModal = ({
   allowedFileExtensions = [],
 }: FileBrowserModalProps) => {
   const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
+  const [isMultiSelectError, setIsMultiSelectError] = useState<boolean>(false);
+  const isSingleSelectMode = useMemo(() => {
+    return (
+      JSON.stringify(allowedFileExtensions.sort()) ===
+      JSON.stringify(IMPORTABLE_FEATURE_ASSET_TYPES.sort())
+    );
+  }, [allowedFileExtensions]);
+
+  console.log(isSingleSelectMode);
 
   const handleClose = () => {
     parentToggle();
@@ -31,6 +42,10 @@ const FileBrowserModal = ({
   };
 
   const handleImport = () => {
+    setIsMultiSelectError(false);
+    if (isSingleSelectMode && selectedFiles.length > 1) {
+      setIsMultiSelectError(true);
+    }
     if (onImported) {
       const tapisFilePaths = convertFilesToTapisPaths(selectedFiles);
       onImported(tapisFilePaths);
@@ -45,6 +60,11 @@ const FileBrowserModal = ({
       onCancel={handleClose}
       footer={[
         <Text key="fileCount" type="secondary" style={{ marginRight: 16 }}>
+          {isSingleSelectMode && selectedFiles.length > 1 && (
+            <SectionMessage type="error">
+              Adding multiple asset to a feature is not supported.
+            </SectionMessage>
+          )}
           {selectedFiles.length > 0 && `${selectedFiles.length} files selected`}
         </Text>,
         <Button key="closeModalButton" onClick={handleClose}>
@@ -55,7 +75,10 @@ const FileBrowserModal = ({
           htmlType="submit"
           type="primary"
           onClick={handleImport}
-          disabled={selectedFiles.length === 0} // Disable if no files are selected
+          disabled={
+            selectedFiles.length === 0 ||
+            (isSingleSelectMode && selectedFiles.length > 1)
+          } // Disable if no files are selected. If single select mode, disable if multiple files are selected
         >
           Import
         </Button>,