Merge pull request #1157 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

deployment/AzureDeploymentTemplate.json

@@ -201,6 +201,9 @@
           "dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
           "properties": {
             "RepoUrl": "[parameters('GithubAPIRepository')]",
+            "repositoryToken": "[parameters('GithubToken')]",
+            "token": "[parameters('GithubToken')]",
+
             "branch": "master",
             "publishRunbook": true,
             "IsManualIntegration": true
@@ -250,7 +253,7 @@
       "type": "Microsoft.Web/staticSites",
       "apiVersion": "2021-01-15",
       "name": "[variables('swaName')]",
-      "location": "centralus",
+      "location": "[resourceGroup().location]",
       "properties": {
         "repositoryUrl": "[parameters('GithubRepository')]",
         "branch": "main",
@@ -270,7 +273,7 @@
       "type": "Microsoft.Web/staticSites/userProvidedFunctionApps",
       "apiVersion": "2020-12-01",
       "name": "[concat(variables('swaName'), '/', variables('swaName'))]",
-      "location": "centralus",
+      "location": "[resourceGroup().location]",
       "dependsOn": [
         "[resourceId('Microsoft.Web/staticSites', variables('swaName'))]",
         "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"

deployment/AzureDeploymentTemplate_regionoptions.json

@@ -201,9 +201,6 @@
           "dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
           "properties": {
             "RepoUrl": "[parameters('GithubAPIRepository')]",
-            "repositoryToken": "[parameters('GithubToken')]",
-            "token": "[parameters('GithubToken')]",
-
             "branch": "master",
             "publishRunbook": true,
             "IsManualIntegration": true
@@ -253,7 +250,7 @@
       "type": "Microsoft.Web/staticSites",
       "apiVersion": "2021-01-15",
       "name": "[variables('swaName')]",
-      "location": "[resourceGroup().location]",
+      "location": "centralus",
       "properties": {
         "repositoryUrl": "[parameters('GithubRepository')]",
         "branch": "main",
@@ -273,7 +270,7 @@
       "type": "Microsoft.Web/staticSites/userProvidedFunctionApps",
       "apiVersion": "2020-12-01",
       "name": "[concat(variables('swaName'), '/', variables('swaName'))]",
-      "location": "[resourceGroup().location]",
+      "location": "centralus",
       "dependsOn": [
         "[resourceId('Microsoft.Web/staticSites', variables('swaName'))]",
         "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"

public/GDAPRoles.json

@@ -153,7 +153,7 @@
   },
   {
     "ExtensionData": {},
-    "Description": "Can manage all aspects of Azure AD and Microsoft services that use Azure AD identities.",
+    "Description": "Can manage all aspects of Azure AD and Microsoft services that use Azure AD identities. This role was formerly known as Global Administrator.",
     "IsEnabled": true,
     "IsSystem": true,
     "Name": "Company Administrator",

public/version_latest.txt

@@ -1 +1 @@
-2.14.0
+2.15.0

src/_nav.js

@@ -48,6 +48,16 @@ const _nav = [
         name: 'Groups',
         to: '/identity/administration/groups',
       },
+      {
+        component: CNavItem,
+        name: 'Group Templates',
+        to: '/identity/administration/group-templates',
+      },
+      {
+        component: CNavItem,
+        name: 'Deploy Group Template',
+        to: '/identity/administration/deploy-group-template',
+      },
       {
         component: CNavItem,
         name: 'Roles',
@@ -198,6 +208,11 @@ const _nav = [
         name: 'List Policies',
         to: '/tenant/conditional/list-policies',
       },
+      {
+        component: CNavItem,
+        name: 'List Named Locations',
+        to: '/tenant/conditional/list-named-locations',
+      },
       {
         component: CNavItem,
         name: 'Deploy Conditional Access',
@@ -287,7 +302,7 @@ const _nav = [
   },
   {
     component: CNavTitle,
-    name: 'Endpoint Management',
+    name: 'Intune',
   },
   {
     component: CNavGroup,
@@ -364,7 +379,7 @@ const _nav = [
   },
   {
     component: CNavGroup,
-    name: 'MEM (Intune)',
+    name: 'Device Management',
     section: 'Endpoint Management',
     to: '/endpoint/MEM',
     icon: <FontAwesomeIcon icon={faExchangeAlt} className="nav-icon" />,
@@ -594,6 +609,11 @@ const _nav = [
         name: 'GDAP Migration Status',
         to: '/tenant/administration/gdap-status',
       },
+      {
+        component: CNavItem,
+        name: 'Application Approval',
+        to: '/tenant/administration/appapproval',
+      },
       {
         component: CNavItem,
         name: 'Documentation',

src/adminRoutes.js

@@ -4,13 +4,15 @@ const Setup = React.lazy(() => import('src/views/cipp/Setup'))
 const ApplyStandard = React.lazy(() => import('src/views/tenant/standards/ApplyStandard'))
 const GDAPStatus = React.lazy(() => import('src/views/tenant/administration/ListGDAPQueue'))
 const GDAP = React.lazy(() => import('src/views/tenant/administration/GDAPWizard'))
+const appapproval = React.lazy(() => import('src/views/cipp/AppApproval'))
 
 const adminRoutes = [
   { path: '/cipp', name: 'CIPP' },
   { path: '/cipp/cipp', name: 'CIPP' },
   { path: '/cipp/settings', name: 'Settings', component: CIPPSettings },
   { path: '/cipp/setup', name: 'Setup', component: Setup },
   { path: '/tenant/administration/gdap', name: 'GDAP Wizard', component: GDAP },
+  { path: '/tenant/administration/appapproval', name: 'App Approval', component: appapproval },
   { path: '/tenant/administration/gdap-status', name: 'GDAP Status', component: GDAPStatus },
   { path: '/tenant/standards/apply-standard', name: 'Apply Standard', component: ApplyStandard },
 ]

src/components/forms/RFFComponents.js

@@ -258,11 +258,20 @@ RFFCFormSelect.propTypes = {
   values: PropTypes.arrayOf(PropTypes.shape({ label: PropTypes.string, value: PropTypes.any })),
 }
 
-export function Condition({ when, is, children }) {
+export function Condition({ when, is, children, like }) {
   return (
-    <Field name={when} subscription={{ value: true }}>
-      {({ input: { value } }) => (value === is ? children : null)}
-    </Field>
+    <>
+      {is && (
+        <Field name={when} subscription={{ value: true }}>
+          {({ input: { value } }) => (value === is ? children : null)}
+        </Field>
+      )}
+      {like && (
+        <Field name={when} subscription={{ value: true }}>
+          {({ input: { value } }) => (value.includes(like) ? children : null)}
+        </Field>
+      )}
+    </>
   )
 }
 

src/components/utilities/TenantSelector.js

@@ -35,7 +35,7 @@ const TenantSelector = ({ action, showAllTenantSelector = true, NavSelector = fa
   )
 
   useEffect(() => {
-    const Paramcount = searchParams.length
+    const Paramcount = Array.from(searchParams).length
     if (Paramcount <= 1) {
       const customerId = searchParams.get('customerId')
       if (customerId && isSuccess) {
@@ -59,7 +59,7 @@ const TenantSelector = ({ action, showAllTenantSelector = true, NavSelector = fa
     if (typeof action === 'function') {
       action(selectedTenant[0])
     } else {
-      setSearchParams({ customerId: currentTenant?.customerId })
+      setSearchParams({ customerId: customerId })
     }
   }
 

src/routes.js

@@ -10,6 +10,14 @@ const EditUser = React.lazy(() => import('src/views/identity/administration/Edit
 const ViewUser = React.lazy(() => import('src/views/identity/administration/ViewUser'))
 const Groups = React.lazy(() => import('src/views/identity/administration/Groups'))
 const AddGroup = React.lazy(() => import('src/views/identity/administration/AddGroup'))
+const AddGroupTemplates = React.lazy(() =>
+  import('src/views/identity/administration/AddGroupTemplate'),
+)
+const DeployGroupTemplates = React.lazy(() =>
+  import('src/views/identity/administration/DeployGroupTemplate'),
+)
+const GroupTemplates = React.lazy(() => import('src/views/identity/administration/GroupTemplates'))
+
 const EditGroup = React.lazy(() => import('src/views/identity/administration/EditGroup'))
 const ViewGroup = React.lazy(() => import('src/views/identity/administration/ViewGroup'))
 const Roles = React.lazy(() => import('src/views/identity/administration/Roles'))
@@ -25,6 +33,8 @@ const GraphExplorer = React.lazy(() => import('src/views/tenant/administration/G
 const Domains = React.lazy(() => import('src/views/tenant/administration/Domains'))
 const EditTenant = React.lazy(() => import('src/views/tenant/administration/EditTenant'))
 const ConditionalAccess = React.lazy(() => import('src/views/tenant/conditional/ConditionalAccess'))
+const NamedLocations = React.lazy(() => import('src/views/tenant/conditional/NamedLocations'))
+
 const ListConditionalTemplates = React.lazy(() =>
   import('src/views/tenant/conditional/ListCATemplates'),
 )
@@ -187,6 +197,21 @@ const routes = [
   { path: '/identity/administration', name: 'Administration' },
   { path: '/identity/administration/users', name: 'Users', component: Users },
   { path: '/identity/administration/groups/add', name: 'Add Group', component: AddGroup },
+  {
+    path: '/identity/administration/group-templates',
+    name: 'Group Templates',
+    component: GroupTemplates,
+  },
+  {
+    path: '/identity/administration/group-add-template',
+    name: 'Add Group Template',
+    component: AddGroupTemplates,
+  },
+  {
+    path: '/identity/administration/deploy-group-template',
+    name: 'Deploy Group Template',
+    component: DeployGroupTemplates,
+  },
   { path: '/identity/administration/groups/edit', name: 'Edit Group', component: EditGroup },
   { path: '/identity/administration/groups/view', name: 'View Group', component: ViewGroup },
   { path: '/identity/administration/groups', name: 'Groups', component: Groups },
@@ -243,6 +268,11 @@ const routes = [
     name: 'Conditional Access',
     component: ConditionalAccess,
   },
+  {
+    path: '/tenant/conditional/list-named-locations',
+    name: 'Named Locations',
+    component: NamedLocations,
+  },
   {
     path: '/tenant/conditional/deploy',
     name: 'Deploy Conditional Access',