Merge pull request #1438 from CybercentreCanada/assemblyline/issues/333

Fix source name field when adding a source (dev)
CybercentreCanada · Mar 9, 2025 · 52a55cc · 52a55cc
2 parents 2e8b1b6 + bacf414
commit 52a55cc
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/src/components/routes/admin/service_detail/source_dialog.tsx b/src/components/routes/admin/service_detail/source_dialog.tsx
@@ -52,7 +52,7 @@ const WrappedSourceDialog = ({ open, setOpen, source = null, defaults, onSave }:
           <DialogContent>
             <SourceDetail
               source={tempSource}
-              addMode={!source}
+              addMode={!source?.name}
               defaults={defaults}
               setSource={setTempSource}
               setModified={setModified}

diff --git a/src/components/routes/manage/signature_sources.tsx b/src/components/routes/manage/signature_sources.tsx
@@ -139,11 +139,18 @@ const queueSourceUpdate = (source: UpdateSource) => ({
 type SourceDetailDrawerProps = {
   service: string;
   base: UpdateSource;
+  defaults: UpdateSource;
   generatesSignatures: UpdateConfig['generates_signatures'];
   onClose?: () => void;
 };
 
-const WrappedSourceDetailDrawer = ({ service, base, onClose, generatesSignatures }: SourceDetailDrawerProps) => {
+const WrappedSourceDetailDrawer = ({
+  service,
+  base,
+  defaults,
+  onClose,
+  generatesSignatures
+}: SourceDetailDrawerProps) => {
   const { t } = useTranslation(['manageSignatureSources']);
   const theme = useTheme();
   const { apiCall } = useMyAPI();
@@ -324,8 +331,8 @@ const WrappedSourceDetailDrawer = ({ service, base, onClose, generatesSignatures
         </div>
         <SourceDetail
           source={source}
-          defaults={null}
-          addMode={!base}
+          defaults={defaults}
+          addMode={!base?.name}
           setSource={setSource}
           setModified={setModified}
           showDetails={false}
@@ -508,10 +515,16 @@ type ServiceDetailProps = {
   sources: UpdateConfig['sources'];
   generatesSignatures: UpdateConfig['generates_signatures'];
   updateIntervalSeconds: UpdateConfig['update_interval_seconds'];
-  defaultPattern: UpdateConfig['default_pattern']
+  defaultPattern: UpdateConfig['default_pattern'];
 };
 
-const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSeconds, defaultPattern }: ServiceDetailProps) => {
+const ServiceDetail = ({
+  service,
+  sources,
+  generatesSignatures,
+  updateIntervalSeconds,
+  defaultPattern
+}: ServiceDetailProps) => {
   const { t } = useTranslation(['manageSignatureSources']);
   const theme = useTheme();
   const classes = useStyles();
@@ -534,11 +547,12 @@ const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSe
     });
   };
 
-  const openDrawer = useCallback((currentService: string, source) => {
+  const openDrawer = useCallback((currentService: string, source, defaults) => {
     setGlobalDrawer(
       <SourceDetailDrawer
         service={currentService}
         base={source}
+        defaults={defaults}
         generatesSignatures={generatesSignatures}
         onClose={closeGlobalDrawer}
       />
@@ -569,12 +583,20 @@ const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSe
                   margin: '-4px 0'
                 }}
                 onClick={() =>
-                  openDrawer(service, {
-                    ...DEFAULT_SOURCE,
-                    update_interval: updateIntervalSeconds,
-                    default_classification: c12nDef.UNRESTRICTED,
-                    pattern: defaultPattern
-                  })
+                  openDrawer(
+                    service,
+                    {
+                      ...DEFAULT_SOURCE,
+                      update_interval: updateIntervalSeconds,
+                      default_classification: c12nDef.UNRESTRICTED,
+                      pattern: defaultPattern
+                    },
+                    {
+                      update_interval: updateIntervalSeconds,
+                      default_classification: c12nDef.UNRESTRICTED,
+                      pattern: defaultPattern
+                    }
+                  )
                 }
                 size="large"
               >
@@ -624,7 +646,7 @@ const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSe
                   key={id}
                   source={source}
                   service={service}
-                  onClick={() => openDrawer(service, source)}
+                  onClick={() => openDrawer(service, source, source)}
                   generatesSignatures={generatesSignatures}
                 />
               ))