Merge branch 'interface-rewrite' of https://github.com/KelvinTegelaar…

…/CIPP into interface-rewrite
KelvinTegelaar · Jan 8, 2025 · 672e354 · 672e354
2 parents c4fa828 + e0f61a3
commit 672e354
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 22 deletions.
diff --git a/src/components/CippWizard/CippWizardCSVImport.jsx b/src/components/CippWizard/CippWizardCSVImport.jsx
@@ -24,7 +24,7 @@ export const CippWizardCSVImport = (props) => {
     onPreviousStep,
     fields,
     name,
-    manualFields = true,
+    manualFields = false,
     nameToCSVMapping,
     fileName = "BulkUser",
   } = props;
@@ -77,34 +77,64 @@ export const CippWizardCSVImport = (props) => {
         name={name}
         formControl={formControl}
       />
-      <Grid container spacing={2}>
-        <Grid item xs={12}>
-          <Button size="small" onClick={() => setOpen(true)}>
-            Add Item
-          </Button>
-        </Grid>
-      </Grid>
-      <Dialog open={open} onClose={() => setOpen(false)}>
-        <DialogTitle>Add a new row</DialogTitle>
-        <DialogContent>
-          <Grid container spacing={2}>
-            {fields.map((field) => (
-              <Grid item xs={12} key={field}>
+      {manualFields && (
+        <Grid container spacing={2}>
+          {fields.map((field) => (
+            <>
+              <Grid item xs={12} sm={6} md={4} key={field}>
                 <CippFormComponent
                   name={`addrow.${field}`}
                   label={getCippTranslation(field)}
                   type="textField"
                   formControl={formControl}
                 />
               </Grid>
-            ))}
+            </>
+          ))}
+          <Grid item xs={12} sm={6} md={4}>
+            <Button size="small" onClick={() => handleAddItem()}>
+              Add Item
+            </Button>
           </Grid>
-        </DialogContent>
-        <DialogActions>
-          <Button onClick={() => setOpen(false)}>Cancel</Button>
-          <Button onClick={handleAddItem}>Add</Button>
-        </DialogActions>
-      </Dialog>
+        </Grid>
+      )}
+      {!manualFields && (
+        <>
+          <Grid container spacing={2}>
+            <Grid item xs={12}>
+              <Button size="small" onClick={() => setOpen(true)}>
+                Add Item
+              </Button>
+            </Grid>
+          </Grid>
+          <Dialog open={open} onClose={() => setOpen(false)}>
+            <DialogTitle>Add a new row</DialogTitle>
+            <DialogContent>
+              <Grid container spacing={2} sx={{ py: 1 }}>
+                {fields.map((field) => (
+                  <Grid item xs={12} key={field}>
+                    <CippFormComponent
+                      name={`addrow.${field}`}
+                      label={getCippTranslation(field)}
+                      type="textField"
+                      formControl={formControl}
+                    />
+                  </Grid>
+                ))}
+              </Grid>
+            </DialogContent>
+            <DialogActions>
+              <Button variant="outlined" onClick={() => setOpen(false)}>
+                Cancel
+              </Button>
+              <Button variant="contained" onClick={handleAddItem}>
+                Add
+              </Button>
+            </DialogActions>
+          </Dialog>
+        </>
+      )}
+
       <CippDataTable
         actions={actions}
         title={`CSV Preview`}

diff --git a/src/pages/endpoint/autopilot/add-device/index.js b/src/pages/endpoint/autopilot/add-device/index.js
@@ -24,6 +24,7 @@ const Page = () => {
       component: CippWizardCSVImport,
       componentProps: {
         name: "autopilotData",
+        manualFields: true,
         fields: ["SerialNumber", "oemManufacturerName", "modelName", "productKey", "hardwareHash"],
         nameToCSVMapping: {
           SerialNumber: "Device serial number",

diff --git a/src/pages/teams-share/sharepoint/bulk-add-site.js b/src/pages/teams-share/sharepoint/bulk-add-site.js
@@ -30,9 +30,10 @@ const BulkAddSiteForm = () => {
     {
       title: "Step 2",
       description: "Upload CSV",
-      component: (props) => <CippWizardCSVImport fileName="BulkSites" {...props} />,
+      component: CippWizardCSVImport,
       componentProps: {
         name: "bulkSites",
+        fileName: "BulkSites",
         fields: fields,
         manualFields: false,
       },