Another fix for #6: change interventionWarning to just take props, an…

…d wire in current edits
acteng · Nov 5, 2024 · 764a0da · 764a0da
1 parent 98f9c2e
commit 764a0da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -25,7 +25,7 @@ export interface Config<F, S> {
 
   initializeEmptyScheme: (scheme: SchemeData) => SchemeData & S;
 
-  interventionWarning: (feature: FeatureWithID<F>) => string | null;
+  interventionWarning: (props: FeatureProps<F>) => string | null;
 
   // When id is null, a new feature is being created
   editFeatureForm: null | ComponentType<

diff --git a/src/lib/sidebar/EditFeatureForm.svelte b/src/lib/sidebar/EditFeatureForm.svelte
@@ -36,7 +36,7 @@
   Delete
 </WarningButton>
 
-<ErrorMessage errorMessage={cfg.interventionWarning(feature)} />
+<ErrorMessage errorMessage={cfg.interventionWarning($featureProps)} />
 
 <svelte:component
   this={cfg.editFeatureForm}

diff --git a/src/lib/sidebar/PerSchemeControls.svelte b/src/lib/sidebar/PerSchemeControls.svelte
@@ -33,7 +33,7 @@
   $: numErrors = $gjSchemes.features.filter(
     (f) =>
       f.properties.scheme_reference == scheme_reference &&
-      cfg.interventionWarning(f) != null,
+      cfg.interventionWarning(f.properties) != null,
   ).length;
   $: numFeatures = $gjSchemes.features.filter(
     (f) => f.properties.scheme_reference == scheme_reference,
@@ -170,7 +170,7 @@
 
   <ol class="govuk-list govuk-list--number">
     {#each $gjSchemes.features.filter((f) => f.properties.scheme_reference == scheme_reference) as feature (feature.id)}
-      {@const warning = cfg.interventionWarning(feature)}
+      {@const warning = cfg.interventionWarning(feature.properties)}
       <li>
         <!-- svelte-ignore a11y-invalid-attribute -->
         <a

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -85,7 +85,7 @@
       return s;
     },
 
-    interventionWarning: (feature) => null,
+    interventionWarning: (props) => null,
 
     editFeatureForm: ExampleFeatureForm,