Skip to content

Commit af856fd

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #1130 from KelvinTegelaar/dev
Dev to release
2 parents db8aeb2 + c2a1831 commit af856fd

File tree

22 files changed

+569
-157
lines changed

22 files changed

+569
-157
lines changed

‎.eslintrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": "detect"
1212
}
1313
},
14-
"extends": ["react-app", "plugin:react/recommended", "plugin:prettier/recommended"],
15-
"plugins": ["react", "react-hooks"],
14+
"extends": ["plugin:prettier/recommended"],
15+
"plugins": ["react-hooks"],
1616
"rules": {}
1717
}

‎deployment/AzureDeploymentTemplate.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@
189189
{
190190
"name": "FUNCTIONS_WORKER_RUNTIME",
191191
"value": "powershell"
192+
},
193+
{
194+
"name": "WEBSITE_RUN_FROM_PACKAGE",
195+
"value": "1"
192196
}
193197
]
194198
}
@@ -201,9 +205,30 @@
201205
"dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
202206
"properties": {
203207
"RepoUrl": "[parameters('GithubAPIRepository')]",
208+
"repositoryToken": "[parameters('GithubToken')]",
204209
"branch": "master",
205210
"publishRunbook": true,
206-
"IsManualIntegration": true
211+
"gitHubActionConfiguration": {
212+
"codeConfiguration": null,
213+
"containerConfiguration": null,
214+
"isLinux": false,
215+
"generateWorkflowFile": true,
216+
"workflowSettings": {
217+
"appType": "functionapp",
218+
"publishType": "code",
219+
"os": "windows",
220+
"variables": {
221+
"runtimeVersion": "7.2",
222+
"sitename": "[variables('funcAppName')]",
223+
"slotname": "Production",
224+
"publishingprofilesecretname": "[variables('funcAppName')]",
225+
"branch": "master"
226+
},
227+
"runtimeStack": "powershell",
228+
"workflowApiVersion": "2020-12-01",
229+
"useCanaryFusionServer": false
230+
}
231+
}
207232
}
208233
}
209234
]

‎deployment/AzureDeploymentTemplate_regionoptions.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@
189189
{
190190
"name": "FUNCTIONS_WORKER_RUNTIME",
191191
"value": "powershell"
192+
},
193+
{
194+
"name": "WEBSITE_RUN_FROM_PACKAGE",
195+
"value": "1"
192196
}
193197
]
194198
}
@@ -201,9 +205,30 @@
201205
"dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
202206
"properties": {
203207
"RepoUrl": "[parameters('GithubAPIRepository')]",
208+
"repositoryToken": "[parameters('GithubToken')]",
204209
"branch": "master",
205210
"publishRunbook": true,
206-
"IsManualIntegration": true
211+
"gitHubActionConfiguration": {
212+
"codeConfiguration": null,
213+
"containerConfiguration": null,
214+
"isLinux": false,
215+
"generateWorkflowFile": true,
216+
"workflowSettings": {
217+
"appType": "functionapp",
218+
"publishType": "code",
219+
"os": "windows",
220+
"variables": {
221+
"runtimeVersion": "7.2",
222+
"sitename": "[variables('funcAppName')]",
223+
"slotname": "Production",
224+
"publishingprofilesecretname": "[variables('funcAppName')]",
225+
"branch": "master"
226+
},
227+
"runtimeStack": "powershell",
228+
"workflowApiVersion": "2020-12-01",
229+
"useCanaryFusionServer": false
230+
}
231+
}
207232
}
208233
}
209234
]

‎deployment/DevAzureDeploymentTemplate.json‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@
224224
{
225225
"name": "FUNCTIONS_WORKER_RUNTIME",
226226
"value": "powershell"
227+
},
228+
{
229+
"name": "WEBSITE_RUN_FROM_PACKAGE",
230+
"value": "1"
227231
}
228232
]
229233
}
@@ -236,9 +240,30 @@
236240
"dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
237241
"properties": {
238242
"RepoUrl": "[parameters('GithubAPIRepository')]",
239-
"branch": "dev",
243+
"repositoryToken": "[parameters('GithubToken')]",
244+
"branch": "master",
240245
"publishRunbook": true,
241-
"IsManualIntegration": true
246+
"gitHubActionConfiguration": {
247+
"codeConfiguration": null,
248+
"containerConfiguration": null,
249+
"isLinux": false,
250+
"generateWorkflowFile": true,
251+
"workflowSettings": {
252+
"appType": "functionapp",
253+
"publishType": "code",
254+
"os": "windows",
255+
"variables": {
256+
"runtimeVersion": "7.2",
257+
"sitename": "[variables('funcAppName')]",
258+
"slotname": "Production",
259+
"publishingprofilesecretname": "[variables('funcAppName')]",
260+
"branch": "master"
261+
},
262+
"runtimeStack": "powershell",
263+
"workflowApiVersion": "2020-12-01",
264+
"useCanaryFusionServer": false
265+
}
266+
}
242267
}
243268
}
244269
]

‎deployment/DevAzureDeploymentTemplate_regionoptions.json‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@
224224
{
225225
"name": "FUNCTIONS_WORKER_RUNTIME",
226226
"value": "powershell"
227+
},
228+
{
229+
"name": "WEBSITE_RUN_FROM_PACKAGE",
230+
"value": "1"
227231
}
228232
]
229233
}
@@ -236,9 +240,30 @@
236240
"dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
237241
"properties": {
238242
"RepoUrl": "[parameters('GithubAPIRepository')]",
239-
"branch": "dev",
243+
"repositoryToken": "[parameters('GithubToken')]",
244+
"branch": "master",
240245
"publishRunbook": true,
241-
"IsManualIntegration": true
246+
"gitHubActionConfiguration": {
247+
"codeConfiguration": null,
248+
"containerConfiguration": null,
249+
"isLinux": false,
250+
"generateWorkflowFile": true,
251+
"workflowSettings": {
252+
"appType": "functionapp",
253+
"publishType": "code",
254+
"os": "windows",
255+
"variables": {
256+
"runtimeVersion": "7.2",
257+
"sitename": "[variables('funcAppName')]",
258+
"slotname": "Production",
259+
"publishingprofilesecretname": "[variables('funcAppName')]",
260+
"branch": "master"
261+
},
262+
"runtimeStack": "powershell",
263+
"workflowApiVersion": "2020-12-01",
264+
"useCanaryFusionServer": false
265+
}
266+
}
242267
}
243268
}
244269
]

‎public/version_latest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.12.0
1+
2.13.0

‎src/_nav.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ const _nav = [
7171
to: '/identity/reports',
7272
icon: <FontAwesomeIcon icon={faChartBar} className="nav-icon" />,
7373
items: [
74-
{
75-
component: CNavItem,
76-
name: 'Devices',
77-
to: '/identity/reports/devices',
78-
},
7974
{
8075
component: CNavItem,
8176
name: 'MFA Report',
@@ -86,6 +81,11 @@ const _nav = [
8681
name: 'Basic Auth Report',
8782
to: '/identity/reports/basic-auth-report',
8883
},
84+
{
85+
component: CNavItem,
86+
name: 'Sign-in Report',
87+
to: '/identity/reports/signin-report',
88+
},
8989
{
9090
component: CNavItem,
9191
name: 'AAD Connect Report',
@@ -346,7 +346,7 @@ const _nav = [
346346
},
347347
{
348348
component: CNavItem,
349-
name: 'List Devices',
349+
name: 'List Autopilot Devices',
350350
to: '/endpoint/autopilot/list-devices',
351351
},
352352
{
@@ -368,6 +368,11 @@ const _nav = [
368368
to: '/endpoint/MEM',
369369
icon: <FontAwesomeIcon icon={faExchangeAlt} className="nav-icon" />,
370370
items: [
371+
{
372+
component: CNavItem,
373+
name: 'List Devices',
374+
to: '/endpoint/reports/devices',
375+
},
371376
{
372377
component: CNavItem,
373378
name: 'List MEM Policies',

‎src/components/tables/CellProgressBar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const CellProgressBar = ({ value, reverse = false }) => {
2424
color = 'success'
2525
}
2626
}
27-
if (value) {
27+
if (value > 0) {
2828
return (
2929
<div style={{ width: '100%' }}>
3030
<CProgress>

‎src/components/utilities/CippActionsOffcanvas.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,11 @@ export default function CippActionsOffcanvas(props) {
168168
{postResults.isError && (
169169
<CCallout color="danger">Could not connect to API: {postResults.error.message}</CCallout>
170170
)}
171-
{getResults.isSuccess && <CCallout color="info">{getResults.data?.Results}</CCallout>}
171+
{getResults.isSuccess && (
172+
<CCallout color={getResults.data?.colour ? getResults.data?.colour : 'info'}>
173+
{getResults.data?.Results}
174+
</CCallout>
175+
)}
172176
{getResults.isError && (
173177
<CCallout color="danger">Could not connect to API: {getResults.error.message}</CCallout>
174178
)}

‎src/routes.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react'
22

3-
/* eslint-disable prettier/prettier */
43
const Home = React.lazy(() => import('src/views/home/Home'))
54
const Logs = React.lazy(() => import('src/views/cipp/Logs'))
65
const Users = React.lazy(() => import('src/views/identity/administration/Users'))
@@ -14,7 +13,7 @@ const AddGroup = React.lazy(() => import('src/views/identity/administration/AddG
1413
const EditGroup = React.lazy(() => import('src/views/identity/administration/EditGroup'))
1514
const ViewGroup = React.lazy(() => import('src/views/identity/administration/ViewGroup'))
1615
const Roles = React.lazy(() => import('src/views/identity/administration/Roles'))
17-
const Devices = React.lazy(() => import('src/views/identity/reports/Devices'))
16+
const Devices = React.lazy(() => import('src/views/endpoint/MEM/Devices'))
1817
const Page404 = React.lazy(() => import('src/views/pages/page404/Page404'))
1918
const Page403 = React.lazy(() => import('src/views/pages/page403/Page403'))
2019
const MFAReport = React.lazy(() => import('src/views/identity/reports/MFAReport'))
@@ -43,6 +42,8 @@ const ListLicences = React.lazy(() => import('src/views/tenant/administration/Li
4342
const ListAppConsent = React.lazy(() => import('src/views/tenant/administration/ListOauthApps'))
4443

4544
const BasicAuthReport = React.lazy(() => import('src/views/identity/reports/BasicAuthReport'))
45+
const SignInReport = React.lazy(() => import('src/views/identity/reports/SignIns'))
46+
4647
const AzureADConnectReport = React.lazy(() =>
4748
import('src/views/identity/reports/AzureADConnectReport'),
4849
)
@@ -203,13 +204,18 @@ const routes = [
203204
component: OffboardingWizard,
204205
},
205206
{ path: '/identity/reports', name: 'Reports' },
206-
{ path: '/identity/reports/devices', name: 'Devices', component: Devices },
207+
{ path: '/endpoint/reports/devices', name: 'Devices', component: Devices },
207208
{ path: '/identity/reports/mfa-report', name: 'MFA Report', component: MFAReport },
208209
{
209210
path: '/identity/reports/basic-auth-report',
210211
name: 'Basic Auth Report',
211212
component: BasicAuthReport,
212213
},
214+
{
215+
path: '/identity/reports/Signin-report',
216+
name: 'Sign-In Report',
217+
component: SignInReport,
218+
},
213219
{
214220
path: '/identity/reports/azure-ad-connect-report',
215221
name: 'AAD Connect Report',

0 commit comments

Comments
 (0)