fix(dashboardeditor): keep state of images to upload

carbon-design-system · Dec 7, 2020 · 0bd0a77 · 0bd0a77
1 parent 08b17bd
commit 0bd0a77
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/components/DashboardEditor/DashboardEditor.jsx b/src/components/DashboardEditor/DashboardEditor.jsx
@@ -257,6 +257,7 @@ const DashboardEditor = ({
 
   // show the card gallery if no card is being edited
   const [dashboardJson, setDashboardJson] = useState(initialValue);
+  const [imagesToUpload, setImagesToUpload] = useState([]);
   const [selectedCardId, setSelectedCardId] = useState();
   const [selectedBreakpointIndex, setSelectedBreakpointIndex] = useState(
     breakpointSwitcher?.initialValue
@@ -326,7 +327,16 @@ const DashboardEditor = ({
       cardConfig.content.src = availableImages.find(
         (image) => image.id === cardConfig.content.id
       )?.src;
+    } else if (
+      cardConfig.content.imgState === 'new' &&
+      !imagesToUpload.some((image) => image.id === cardConfig.content.id)
+    ) {
+      setImagesToUpload((prevImagesToUpload) => [
+        ...prevImagesToUpload,
+        { id: cardConfig.content.id, src: cardConfig.content.src },
+      ]);
     }
+
     // TODO: this is really inefficient
     setDashboardJson((oldJSON) => ({
       ...oldJSON,
@@ -399,10 +409,10 @@ const DashboardEditor = ({
             breadcrumbs={headerBreadcrumbs}
             onEditTitle={onEditTitle}
             onImport={onImport}
-            onExport={() => onExport(dashboardJson)}
+            onExport={() => onExport(dashboardJson, imagesToUpload)}
             onDelete={onDelete}
             onCancel={onCancel}
-            onSubmit={onSubmit}
+            onSubmit={(params) => onSubmit(params, imagesToUpload)}
             isSubmitDisabled={isSubmitDisabled}
             isSubmitLoading={isSubmitLoading}
             i18n={mergedI18n}

diff --git a/src/components/DashboardEditor/DashboardEditor.test.jsx b/src/components/DashboardEditor/DashboardEditor.test.jsx
@@ -238,14 +238,17 @@ describe('DashboardEditor', () => {
     const submitBtn = screen.getByText('Save and close');
     expect(submitBtn).toBeInTheDocument();
     fireEvent.click(submitBtn);
-    expect(mockOnSubmit).toBeCalledWith({
-      cards: [],
-      layouts: {
-        lg: [],
-        md: [],
-        xl: [],
+    expect(mockOnSubmit).toBeCalledWith(
+      {
+        cards: [],
+        layouts: {
+          lg: [],
+          md: [],
+          xl: [],
+        },
       },
-    });
+      []
+    );
   });
 
   it('selecting cancel should fire onCancel', () => {