From f147f01ba60ae5d03ea0b6713a4b8e7c7082bc7e Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Sun, 21 Jul 2024 19:55:24 +0200 Subject: [PATCH 1/4] Avoid builtin deletion except from library screen --- frontend/src/lib/components/ModelTable/ModelTable.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte index 3a621ce4c1..2540b8f4e6 100644 --- a/frontend/src/lib/components/ModelTable/ModelTable.svelte +++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte @@ -207,7 +207,8 @@ const actionsURLModel = source.meta?.urlmodel ?? URLModel; const preventDelete = (row: TableSource) => - (row.meta.builtin && actionsURLModel !== 'loaded-libraries') || + row.meta.builtin || + (URLModel !== 'libraries' && Object.hasOwn(row.meta, 'urn') && row.meta.urn) || (Object.hasOwn(row.meta, 'reference_count') && row.meta.reference_count > 0); import { popup } from '@skeletonlabs/skeleton'; From fa70a9ec4fcef706297321b15a3ce237affcda9d Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Fri, 26 Jul 2024 23:43:17 +0200 Subject: [PATCH 2/4] Update ModelTable.svelte Make LoadedLibraries deletable when not used --- frontend/src/lib/components/ModelTable/ModelTable.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte index 2540b8f4e6..21ccbe3cd8 100644 --- a/frontend/src/lib/components/ModelTable/ModelTable.svelte +++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte @@ -207,7 +207,7 @@ const actionsURLModel = source.meta?.urlmodel ?? URLModel; const preventDelete = (row: TableSource) => - row.meta.builtin || + (row.meta.builtin && actionsURLModel !== 'loaded-libraries') || (URLModel !== 'libraries' && Object.hasOwn(row.meta, 'urn') && row.meta.urn) || (Object.hasOwn(row.meta, 'reference_count') && row.meta.reference_count > 0); From 82d1c4851a286ff82862995731dd1986e2e077e1 Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Fri, 26 Jul 2024 23:56:59 +0200 Subject: [PATCH 3/4] Create 0019_merge_20240726_2156.py merge migrations --- .../core/migrations/0019_merge_20240726_2156.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 backend/core/migrations/0019_merge_20240726_2156.py diff --git a/backend/core/migrations/0019_merge_20240726_2156.py b/backend/core/migrations/0019_merge_20240726_2156.py new file mode 100644 index 0000000000..20f3140e42 --- /dev/null +++ b/backend/core/migrations/0019_merge_20240726_2156.py @@ -0,0 +1,14 @@ +# Generated by Django 5.0.6 on 2024-07-26 21:56 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0018_appliedcontrol_csf_function_and_more'), + ('core', '0018_framework_translations_loadedlibrary_translations_and_more'), + ] + + operations = [ + ] From 028673caf6f3690eda5c83e3a302ec5198c43958 Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Sat, 27 Jul 2024 00:15:07 +0200 Subject: [PATCH 4/4] Update 0019_merge_20240726_2156.py ruff --- backend/core/migrations/0019_merge_20240726_2156.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/core/migrations/0019_merge_20240726_2156.py b/backend/core/migrations/0019_merge_20240726_2156.py index 20f3140e42..30137e1f45 100644 --- a/backend/core/migrations/0019_merge_20240726_2156.py +++ b/backend/core/migrations/0019_merge_20240726_2156.py @@ -4,11 +4,9 @@ class Migration(migrations.Migration): - dependencies = [ - ('core', '0018_appliedcontrol_csf_function_and_more'), - ('core', '0018_framework_translations_loadedlibrary_translations_and_more'), + ("core", "0018_appliedcontrol_csf_function_and_more"), + ("core", "0018_framework_translations_loadedlibrary_translations_and_more"), ] - operations = [ - ] + operations = []