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

Use global update interval as the default for update sources (dev)
CybercentreCanada · Mar 7, 2025 · 524f65c · 524f65c
2 parents 7e3179b + fe76d83
commit 524f65c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/components/routes/admin/service_detail/updater.tsx b/src/components/routes/admin/service_detail/updater.tsx
@@ -18,7 +18,7 @@ import {
   useTheme
 } from '@mui/material';
 import FormControl from '@mui/material/FormControl';
-import { Service, UpdateSource } from 'components/models/base/service';
+import { DEFAULT_SOURCE, Service, UpdateSource } from 'components/models/base/service';
 import { SourceCard } from 'components/routes/manage/signature_sources';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -365,7 +365,12 @@ const ServiceUpdater = ({ service, defaults, setService, setModified }: ServiceU
       </Grid>
 
       <Grid item xs={12}>
-        <SourceDialog open={dialog} setOpen={setDialog} onSave={handleSaveSource} />
+        <SourceDialog
+          open={dialog}
+          source={{ ...DEFAULT_SOURCE, update_interval: service.update_config.update_interval_seconds }}
+          setOpen={setDialog}
+          onSave={handleSaveSource}
+        />
         <Button variant="contained" color="primary" onClick={() => setDialog(true)}>
           {t('updater.sources.add')}
         </Button>

diff --git a/src/components/routes/manage/signature_sources.tsx b/src/components/routes/manage/signature_sources.tsx
@@ -507,9 +507,10 @@ type ServiceDetailProps = {
   service: string;
   sources: UpdateConfig['sources'];
   generatesSignatures: UpdateConfig['generates_signatures'];
+  updateIntervalSeconds: UpdateConfig['update_interval_seconds'];
 };
 
-const ServiceDetail = ({ service, sources, generatesSignatures }: ServiceDetailProps) => {
+const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSeconds }: ServiceDetailProps) => {
   const { t } = useTranslation(['manageSignatureSources']);
   const theme = useTheme();
   const classes = useStyles();
@@ -565,7 +566,7 @@ const ServiceDetail = ({ service, sources, generatesSignatures }: ServiceDetailP
                   color: theme.palette.mode === 'dark' ? theme.palette.success.light : theme.palette.success.dark,
                   margin: '-4px 0'
                 }}
-                onClick={() => openDrawer(service, null)}
+                onClick={() => openDrawer(service, { ...DEFAULT_SOURCE, update_interval: updateIntervalSeconds })}
                 size="large"
               >
                 <AddCircleOutlineOutlinedIcon />
@@ -627,7 +628,18 @@ const ServiceDetail = ({ service, sources, generatesSignatures }: ServiceDetailP
         </Collapse>
       </div>
     ),
-    [classes.title, generatesSignatures, open, openDrawer, service, sources, t, theme, triggerSourceUpdateAll]
+    [
+      classes.title,
+      generatesSignatures,
+      open,
+      openDrawer,
+      service,
+      sources,
+      t,
+      theme,
+      triggerSourceUpdateAll,
+      updateIntervalSeconds
+    ]
   );
 };
 
@@ -678,6 +690,7 @@ export default function SignatureSources() {
                 service={key}
                 sources={sources[key].sources}
                 generatesSignatures={sources[key].generates_signatures}
+                updateIntervalSeconds={sources[key].update_interval_seconds}
               />
             ))
           : [...Array(2)].map((item, i) => (