Merge remote-tracking branch 'upstream/dev' into dev

JohnDuprey · May 31, 2024 · 8bb45a4 · 8bb45a4
2 parents 5aff8e1 + 900c007
commit 8bb45a4
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/src/views/cipp/app-settings/SettingsGeneral.jsx b/src/views/cipp/app-settings/SettingsGeneral.jsx
@@ -253,37 +253,37 @@ export function SettingsGeneral() {
                     </CCallout>
                   </CCol>
                   <CCol>
-                    {permissionsResult.data.Results?.ErrorMessages?.length > 0 ||
-                      (permissionsResult.data.Results?.MissingPermissions.length > 0 && (
-                        <CCallout color="danger">
+                    {(permissionsResult.data.Results?.ErrorMessages?.length > 0 ||
+                      permissionsResult.data.Results?.MissingPermissions.length > 0) && (
+                      <CCallout color="danger">
+                        <>
+                          {permissionsResult.data.Results?.ErrorMessages?.map((m, idx) => (
+                            <div key={idx}>{m}</div>
+                          ))}
+                        </>
+                        {permissionsResult.data.Results?.MissingPermissions.length > 0 && (
                           <>
-                            {permissionsResult.data.Results?.ErrorMessages?.map((m, idx) => (
-                              <div key={idx}>{m}</div>
-                            ))}
+                            Your Secure Application Model is missing the following permissions. See
+                            the documentation on how to add permissions{' '}
+                            <a
+                              target="_blank"
+                              rel="noreferrer"
+                              href="https://docs.cipp.app/setup/installation/permissions#manual-permissions"
+                            >
+                              here
+                            </a>
+                            .
+                            <CListGroup flush>
+                              {permissionsResult.data.Results?.MissingPermissions?.map(
+                                (r, index) => (
+                                  <CListGroupItem key={index}>{r}</CListGroupItem>
+                                ),
+                              )}
+                            </CListGroup>
                           </>
-                          {permissionsResult.data.Results?.MissingPermissions.length > 0 && (
-                            <>
-                              Your Secure Application Model is missing the following permissions.
-                              See the documentation on how to add permissions{' '}
-                              <a
-                                target="_blank"
-                                rel="noreferrer"
-                                href="https://docs.cipp.app/setup/installation/permissions#manual-permissions"
-                              >
-                                here
-                              </a>
-                              .
-                              <CListGroup flush>
-                                {permissionsResult.data.Results?.MissingPermissions?.map(
-                                  (r, index) => (
-                                    <CListGroupItem key={index}>{r}</CListGroupItem>
-                                  ),
-                                )}
-                              </CListGroup>
-                            </>
-                          )}
-                        </CCallout>
-                      ))}
+                        )}
+                      </CCallout>
+                    )}
                   </CCol>
                 </CRow>
               </>