Merge pull request KelvinTegelaar#2492 from JohnDuprey/dev

Fix scripted alerts
JohnDuprey · May 29, 2024 · 215de12 · 215de12
2 parents ed01c11 + 2e67192
commit 215de12
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
@@ -587,7 +587,11 @@ export const RFFSelectSearch = ({
                 {...props}
               />
             )}
-            {meta.error && meta.touched && <span className="text-danger">{meta.error}</span>}
+            {meta.error && meta.touched && (
+              <span className="text-danger">
+                {typeof meta.error === 'object' ? Object.values(meta.error).join('') : meta.error}
+              </span>
+            )}
           </div>
         )
       }}

diff --git a/src/views/cipp/app-settings/SettingsSuperAdmin.jsx b/src/views/cipp/app-settings/SettingsSuperAdmin.jsx
@@ -103,7 +103,7 @@ export function SettingsSuperAdmin() {
           </>
         </>
       </CippAccordionItem>
-      <CippAccordionItem title="Custom Roles" titleType="big">
+      <CippAccordionItem title="Custom Roles (beta)" titleType="big">
         <SettingsCustomRoles />
       </CippAccordionItem>
     </CAccordion>

diff --git a/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx b/src/views/cipp/app-settings/components/SettingsCustomRoles.jsx
@@ -227,8 +227,9 @@ const SettingsCustomRoles = () => {
           direct API access, create a role with the name 'CIPP-API'.
         </p>
         <p className="small">
-          NOTE: The custom role must be added to the user in SWA in conjunction with the base role.
-          (e.g. editor,mycustomrole)
+          <FontAwesomeIcon icon="triangle-exclamation" className="me-2" /> This functionality is in
+          beta and should be treated as such. The custom role must be added to the user in SWA in
+          conjunction with the base role. (e.g. editor,mycustomrole)
         </p>
         {(isFetching || tenantsFetching) && <Skeleton count={1} />}
         {isSuccess && !isFetching && !tenantsFetching && (

diff --git a/src/views/tenant/administration/AlertWizard.jsx b/src/views/tenant/administration/AlertWizard.jsx
@@ -96,7 +96,6 @@ const AlertWizard = () => {
   const getRecurrenceOptions = () => {
     const values = currentFormState?.values
     if (values) {
-      //console.log(currentFormState)
       const updatedRecurrenceOptions = recurrenceOptions.map((opt) => ({
         ...opt,
         name: opt.name.replace(' (Recommended)', ''),
@@ -317,7 +316,7 @@ const AlertWizard = () => {
                                     multi={true}
                                     name={`actions`}
                                     placeholder={
-                                      'Select one action or multple actions from the list'
+                                      'Select one action or multiple actions from the list'
                                     }
                                     label="Then perform the following action(s)"
                                   />