fix unique key

rubenthoms · Sep 13, 2024 · 5bd7d3f · 5bd7d3f
1 parent edce812
commit 5bd7d3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/frontend/src/lib/components/SortableList/sortableList.tsx b/frontend/src/lib/components/SortableList/sortableList.tsx
@@ -40,7 +40,7 @@ export const SortableListContext = React.createContext<SortableListContextType>(
 });
 
 export type SortableListProps = {
-    contentWhenEmpty?: React.ReactNode;
+    contentWhenEmpty?: React.ReactElement;
     children: React.ReactElement<SortableListItemProps | SortableListGroupProps>[];
     isMoveAllowed?: (args: IsMoveAllowedArgs) => boolean;
     onItemMoved?: (
@@ -505,11 +505,16 @@ export function SortableList(props: SortableListProps): React.ReactNode {
     }
 
     function makeChildren(): React.ReactNode[] {
+        const children: React.ReactNode[] = [];
         if (props.children.length === 0 && props.contentWhenEmpty) {
-            return [props.contentWhenEmpty];
+            children.push(
+                React.cloneElement(props.contentWhenEmpty, {
+                    key: "contentWhenEmpty",
+                })
+            );
+            return children;
         }
 
-        const children: React.ReactNode[] = [];
         for (const child of props.children) {
             if (typeof child.type === "string") {
                 continue;

diff --git a/frontend/src/modules/LayerSpike/layers/delegates/LayerDelegate.ts b/frontend/src/modules/LayerSpike/layers/delegates/LayerDelegate.ts
@@ -225,6 +225,7 @@ export class LayerDelegate<TSettings extends Settings, TData>
             this.setStatus(LayerStatus.SUCCESS);
         } catch (error: any) {
             if (error.constructor?.name === "CancelledError") {
+                this.setStatus(LayerStatus.IDLE);
                 return;
             }
             const apiError = ApiErrorHelper.fromError(error);