Merge pull request KelvinTegelaar#33 from KelvinTegelaar/dev

DChorn-ANS · Aug 3, 2023 · fceefbb · fceefbb
2 parents 1f0d42e + 5db8164
commit fceefbb
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 90 deletions.
diff --git a/.env b/.env
@@ -2,4 +2,4 @@ PORT=3000
 CHOKIDAR_USEPOLLING=true
 BROWSER=none
 GENERATE_SOURCEMAP=false
-WDS_SOCKET_PORT=0
+WDS_SOCKET_PORT=3000
diff --git a/.vscode/cert.crt b/.vscode/cert.crt
diff --git a/.vscode/key.key b/.vscode/key.key
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,38 +10,29 @@
     },
     {
       "command": "npm run start-swa",
-      "name": "Run emulator",
+      "name": "Run Emulator",
       "request": "launch",
       "type": "node-terminal"
     },
     {
       "command": "npm start",
-      "name": "Run frontend",
+      "name": "Run Frontend",
       "request": "launch",
       "type": "node-terminal",
-      "preLaunchTask": "RunAllTasks",
+      "preLaunchTask": "Run All Tasks",
       "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"]
     },
     {
-      "name": "Launch Edge",
+      "type": "chrome",
       "request": "launch",
-      "type": "pwa-msedge",
-      "url": "https://localhost:4280",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "name": "Attach to Edge",
-      "port": 9222,
-      "request": "attach",
-      "type": "pwa-msedge",
-      "urlFilter": "https://localhost:4280/*",
-      "webRoot": "${workspaceFolder}"
+      "name": "Launch Chrome Debugger",
+      "url": "http://localhost:4280"
     }
   ],
   "compounds": [
     {
       "name": "Launch it all 🚀",
-      "configurations": ["Run frontend", "Run emulator"]
+      "configurations": ["Run Frontend", "Run Emulator"]
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,13 +2,13 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "RunAllTasks",
-      "dependsOn": ["RunAPI", "RunAzurite"]
+      "label": "Run All Tasks",
+      "dependsOn": ["Run API", "Run Azurite"]
     },
     {
-      "label": "RunAzurite",
+      "label": "Run Azurite",
       "type": "shell",
-      "command": "azurite",
+      "command": "azurite --location ../",
       "isBackground": true,
       "problemMatcher": {
         "pattern": [
@@ -27,7 +27,7 @@
       }
     },
     {
-      "label": "RunAPI",
+      "label": "Run API",
       "type": "shell",
       "command": "func start --verbose",
       "isBackground": true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,11 +17,11 @@
     "changelog": "auto-changelog --starting-version 3.0.0 --commit-limit false --hide-credit",
     "eject": "react-scripts eject",
     "lint": "eslint \"src/**/*.js\"",
-    "start": "set HTTPS=true&&set SSL_CRT_FILE=./.vscode/cert.crt&&set SSL_KEY_FILE=./.vscode/key.key&&react-scripts start",
+    "start": "react-scripts start",
     "test": "react-scripts test",
     "test:cov": "npm test -- --coverage --watchAll=false",
     "test:debug": "react-scripts --inspect-brk test --runInBand",
-    "start-swa": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location .vscode https://localhost:3000 --api-location http://localhost:7071",
+    "start-swa": "swa start --swa-config-location .vscode http://127.0.0.1:3000 --api-location http://localhost:7071",
     "prepare": "husky install"
   },
   "config": {
@@ -92,7 +92,7 @@
     "prettier": "2.4.1",
     "react-scripts": "^5.0.0",
     "redux-immutable-state-invariant": "^2.1.0",
-    "sass": "^1.44",
+    "sass": "^1.64.2",
     "stylelint": "^14.3.0",
     "stylelint-config-sass-guidelines": "^9.0.1",
     "stylelint-order": "^5.0.0"

diff --git a/src/views/email-exchange/administration/EditMailboxPermissions.js b/src/views/email-exchange/administration/EditMailboxPermissions.js
@@ -122,6 +122,8 @@ const MailboxPermissions = () => {
       RemoveFullAccess: values.RemoveFullAccess ? values.RemoveFullAccess : null,
       AddSendAs: values.AddSendAs ? values.AddSendAs : null,
       RemoveSendAs: values.RemoveSendAs ? values.RemoveSendAs : null,
+      AddSendOnBehalf: values.AddSendOnBehalf ? values.AddSendOnBehalf : null,
+      RemoveSendOnBehalf: values.RemoveSendOnBehalf ? values.RemoveSendOnBehalf : null,
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/ExecEditMailboxPermissions', values: shippedValues })
@@ -250,6 +252,34 @@ const MailboxPermissions = () => {
                                 />
                                 {usersError && <span>Failed to load list of users</span>}
                               </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Add Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="AddSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Remove Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="RemoveSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
                             </CRow>
                             <CRow className="mb-3">
                               <CCol md={6}>

diff --git a/src/views/endpoint/applications/ApplicationsAddChocoApp.js b/src/views/endpoint/applications/ApplicationsAddChocoApp.js
@@ -284,7 +284,8 @@ const ApplyStandard = () => {
                           Disable Restart: {props.values.DisableRestart ? 'Yes' : 'No'}
                         </CListGroupItem>
                         <CListGroupItem className="d-flex justify-content-between align-items-center">
-                          Assign to: {props.values.AssignTo}
+                          Assign to:
+                          {props.values.AssignTo == 'on' ? ' None' : ` ${props.values.AssignTo}`}
                         </CListGroupItem>
                       </CListGroup>
                     </CCol>

diff --git a/src/views/endpoint/intune/MEMListPolicyTemplates.js b/src/views/endpoint/intune/MEMListPolicyTemplates.js
@@ -68,18 +68,18 @@ const AutopilotListTemplates = () => {
   const columns = [
     {
       name: 'Display Name',
-      selector: (row) => row['Displayname'],
+      selector: (row) => row['displayName'],
       sortable: true,
-      cell: (row) => CellTip(row['Displayname']),
+      cell: (row) => CellTip(row['displayName']),
       exportSelector: 'Displayname',
       minWidth: '400px',
       maxWidth: '400px',
     },
     {
       name: 'Description',
-      selector: (row) => row['Description'],
+      selector: (row) => row['description'],
       sortable: true,
-      cell: (row) => CellTip(row['Description']),
+      cell: (row) => CellTip(row['description']),
       exportSelector: 'Description',
       minWidth: '400px',
       maxWidth: '400px',
@@ -124,7 +124,7 @@ const AutopilotListTemplates = () => {
           <CippDatatable
             keyField="id"
             reportName={`${tenant?.defaultDomainName}-MEMPolicyTemplates-List`}
-            path="/api/ListIntuneTemplates"
+            path="/api/ListIntuneTemplates?View=true"
             columns={columns}
             params={{ TenantFilter: tenant?.defaultDomainName }}
           />

diff --git a/src/views/tenant/administration/ListLicences.js b/src/views/tenant/administration/ListLicences.js
@@ -52,7 +52,7 @@ const columns = [
     cell: cellBooleanFormatter(),
   },
   {
-    name: 'Time until renewal (days)',
+    name: 'Days until renewal',
     selector: (row) => row['TimeUntilRenew'],
     sortable: true,
     exportSelector: 'TimeUntilRenew',
@@ -65,7 +65,7 @@ const columns = [
     cell: cellDateFormatter(),
   },
   {
-    name: 'Time until renewal (days)',
+    name: 'Renewal Date',
     selector: (row) => row['dateExpires'],
     sortable: true,
     exportSelector: 'dateExpires',