Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default pattern based on update_config (dev) #1437

Merged
merged 1 commit into from
Mar 9, 2025
Merged

Set default pattern based on update_config (dev) #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/models/base/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,9 @@ export type UpdateConfig = {
/** Custom delimiter definition */
custom_delimiter?: string;

/** Default pattern for finding signatures*/
default_pattern: string

/** Does the updater produce signatures? */
generates_signatures: boolean;

Expand Down
3 changes: 2 additions & 1 deletion src/components/routes/admin/service_detail/updater.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ const ServiceUpdater = ({ service, defaults, setService, setModified }: ServiceU
source={{
...DEFAULT_SOURCE,
update_interval: service.update_config.update_interval_seconds,
default_classification: c12nDef.UNRESTRICTED
default_classification: c12nDef.UNRESTRICTED,
pattern: service.update_config.default_pattern
}}
setOpen={setDialog}
onSave={handleSaveSource}
Expand Down
7 changes: 5 additions & 2 deletions src/components/routes/manage/signature_sources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,10 @@ type ServiceDetailProps = {
sources: UpdateConfig['sources'];
generatesSignatures: UpdateConfig['generates_signatures'];
updateIntervalSeconds: UpdateConfig['update_interval_seconds'];
defaultPattern: UpdateConfig['default_pattern']
};

const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSeconds }: ServiceDetailProps) => {
const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSeconds, defaultPattern }: ServiceDetailProps) => {
const { t } = useTranslation(['manageSignatureSources']);
const theme = useTheme();
const classes = useStyles();
Expand Down Expand Up @@ -567,7 +568,8 @@ const ServiceDetail = ({ service, sources, generatesSignatures, updateIntervalSe
openDrawer(service, {
...DEFAULT_SOURCE,
update_interval: updateIntervalSeconds,
default_classification: c12nDef.UNRESTRICTED
default_classification: c12nDef.UNRESTRICTED,
pattern: defaultPattern
})
}
size="large"
Expand Down Expand Up @@ -694,6 +696,7 @@ export default function SignatureSources() {
sources={sources[key].sources}
generatesSignatures={sources[key].generates_signatures}
updateIntervalSeconds={sources[key].update_interval_seconds}
defaultPattern={sources[key].default_pattern}
/>
))
: [...Array(2)].map((item, i) => (
Expand Down