Merge pull request #8 from KelvinTegelaar/dev

BNWEIN · Jul 4, 2023 · 0c06c9c · 0c06c9c
2 parents 34c8bd5 + b025b6c
commit 0c06c9c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 54 deletions.
diff --git a/LICENSE.CustomLicenses b/LICENSE.CustomLicenses
@@ -0,0 +1 @@
+Custom licenses are available upon agreement via Github Sponsorships. Custom licenses will not have to be published in this repository. All contributors automatically agree with this provision.
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-3.6.0
+3.7.0
diff --git a/src/routes.js b/src/routes.js
@@ -116,12 +116,7 @@ const AutopilotListStatusPages = React.lazy(() =>
 )
 const IntuneListPolicies = React.lazy(() => import('src/views/endpoint/intune/MEMListPolicies'))
 const MEMEditPolicy = React.lazy(() => import('src/views/endpoint/intune/MEMEditPolicy'))
-const EditAutopilotProfile = React.lazy(() =>
- import('src/views/endpoint/autopilot/AutopilotEditProfile'),
-)
-const EditAutopilotStatusPage = React.lazy(() =>
- import('src/views/endpoint/autopilot/AutopilotEditStatusPage'),
-)
+
 const IntuneCAPolicies = React.lazy(() => import('src/views/endpoint/intune/MEMCAPolicies'))
 const IntuneAddPolicy = React.lazy(() => import('src/views/endpoint/intune/MEMAddPolicy'))
 const MEMAddPolicyTemplate = React.lazy(() =>
@@ -432,16 +427,6 @@ const routes = [
  name: 'List Status Pages',
  component: AutopilotListStatusPages,
  },
- {
- path: '/endpoint/autopilot/edit-autopilot-profiles',
- name: 'Edit Autopilot Profiles',
- component: EditAutopilotProfile,
- },
- {
- path: '/endpoint/autopilot/edit-autopilot-status-page',
- name: 'Edit Autopilot Status Page',
- component: EditAutopilotStatusPage,
- },
  { path: '/endpoint/MEM', name: 'MEM' },
  { path: '/endpoint/MEM/list-policies', name: 'List MEM Policies', component: IntuneListPolicies },
  { path: '/endpoint/MEM/edit-policy', name: 'Edit MEM Policy', component: MEMEditPolicy },

diff --git a/src/views/endpoint/autopilot/AutopilotAddDevice.js b/src/views/endpoint/autopilot/AutopilotAddDevice.js
@@ -73,7 +73,8 @@ const AddAPDevice = () => {
  },
  },
  ]
-
+ const valbutton = (value) =>
+ autopilotData ? undefined : 'You must add at least one device. Did you forget to click add?'
  const handleOnDrop = (data) => {
  const importdata = data.map((item) => {
  const normalizedData = {}
@@ -209,6 +210,14 @@ const AddAPDevice = () => {
  }}
  </FormSpy>
  </CCol>
+ <Field
+ key={autopilotData}
+ name="BlockNext"
+ component="hidden"
+ type="hidden"
+ validate={valbutton}
+ ></Field>
+ <Error name="BlockNext" />
  </CRow>
  <CRow>
  <CCol>

diff --git a/src/views/endpoint/autopilot/AutopilotAddPolicyTemplate.js b/src/views/endpoint/autopilot/AutopilotAddPolicyTemplate.js
diff --git a/src/views/endpoint/autopilot/AutopilotAddProfile.js b/src/views/endpoint/autopilot/AutopilotAddProfile.js
@@ -169,7 +169,6 @@ const ApplyStandard = () => {
  {!postResults.isSuccess && (
  <FormSpy>
  {(props) => {
- /* eslint-disable react/prop-types */
  return (
  <>
  <CRow>

diff --git a/src/views/endpoint/autopilot/AutopilotAddStatusPage.js b/src/views/endpoint/autopilot/AutopilotAddStatusPage.js
@@ -141,7 +141,6 @@ const ApplyStandard = () => {
  {!postResults.isSuccess && (
  <FormSpy>
  {(props) => {
- /* eslint-disable react/prop-types */
  return (
  <>
  <CRow>

diff --git a/src/views/endpoint/autopilot/AutopilotEditProfile.js b/src/views/endpoint/autopilot/AutopilotEditProfile.js
diff --git a/src/views/endpoint/autopilot/AutopilotEditStatusPage.js b/src/views/endpoint/autopilot/AutopilotEditStatusPage.js
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-3.6.0
+3.7.0