From 70c790ff89075a785d7f0623bbf3c34a3806bbdc Mon Sep 17 00:00:00 2001
From: Pujit Mehrotra <pujit@lime-technology.com>
Date: Thu, 19 Jun 2025 08:46:18 -0400
Subject: [PATCH] fix: alignment of settings on ManagementAccess settings page
 (#1421)

## Summary by CodeRabbit

- **Refactor**
- Removed description text display from a form field for a cleaner
interface.
- Enhanced form field matching to better target specific string array
inputs.
- Updated remote access settings UI for clearer layout and separation of
title and details.
  - Adjusted label container styling to allow more flexible width.
- Improved grouping of precondition information for better visual
structure.
  - Added a colon to the SSO users settings label for consistency.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---
- To see the specific tasks where the Asana app for GitHub is being
used, see below:
  - https://app.asana.com/0/0/1210572375587668
---
 .../resolvers/settings/settings.service.ts    |  2 +-
 .../src/service/connect-settings.service.ts   | 39 ++++++++++++-------
 unraid-ui/src/forms/LabelRenderer.vue         |  2 +-
 unraid-ui/src/forms/PreconditionsLabel.vue    | 18 +++++----
 unraid-ui/src/forms/StringArrayField.vue      |  1 -
 unraid-ui/src/forms/renderers.ts              |  2 +-
 6 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/settings/settings.service.ts b/api/src/unraid-api/graph/resolvers/settings/settings.service.ts
index 457803194..7b5365aff 100644
--- a/api/src/unraid-api/graph/resolvers/settings/settings.service.ts
+++ b/api/src/unraid-api/graph/resolvers/settings/settings.service.ts
@@ -146,7 +146,7 @@ export class ApiSettings {
             elements: [
                 createLabeledControl({
                     scope: '#/properties/api/properties/ssoSubIds',
-                    label: 'Unraid Connect SSO Users',
+                    label: 'Unraid Connect SSO Users:',
                     description: `Provide a list of Unique Unraid Account IDs. Find yours at <a href="https://account.unraid.net/settings" target="_blank" rel="noopener noreferrer">account.unraid.net/settings</a>. Requires restart if adding first user.`,
                     controlOptions: {
                         inputType: 'text',
diff --git a/packages/unraid-api-plugin-connect/src/service/connect-settings.service.ts b/packages/unraid-api-plugin-connect/src/service/connect-settings.service.ts
index 421f2a2f9..a9ccf90fd 100644
--- a/packages/unraid-api-plugin-connect/src/service/connect-settings.service.ts
+++ b/packages/unraid-api-plugin-connect/src/service/connect-settings.service.ts
@@ -294,22 +294,31 @@ export class ConnectSettingsService {
         /** shown when preconditions are not met */
         const requirements: UIElement[] = [
             {
-                type: 'Label',
-                text: 'Allow Remote Access',
-                options: {
-                    format: 'preconditions',
-                    description: 'Remote Access is disabled. To enable, please make sure:',
-                    items: [
-                        {
-                            text: 'You are signed in to Unraid Connect',
-                            status: isSignedIn,
+                type: 'UnraidSettingsLayout',
+                elements: [
+                    {
+                        type: 'Label',
+                        text: 'Allow Remote Access:',
+                    },
+                    {
+                        type: 'Label',
+                        text: 'Allow Remote Access',
+                        options: {
+                            format: 'preconditions',
+                            description: 'Remote Access is disabled. To enable, please make sure:',
+                            items: [
+                                {
+                                    text: 'You are signed in to Unraid Connect',
+                                    status: isSignedIn,
+                                },
+                                {
+                                    text: 'You have provisioned a valid SSL certificate',
+                                    status: isSSLCertProvisioned,
+                                },
+                            ],
                         },
-                        {
-                            text: 'You have provisioned a valid SSL certificate',
-                            status: isSSLCertProvisioned,
-                        },
-                    ],
-                },
+                    },
+                ],
             },
         ];
 
diff --git a/unraid-ui/src/forms/LabelRenderer.vue b/unraid-ui/src/forms/LabelRenderer.vue
index af367ce80..be6b3009a 100644
--- a/unraid-ui/src/forms/LabelRenderer.vue
+++ b/unraid-ui/src/forms/LabelRenderer.vue
@@ -70,7 +70,7 @@ const descriptionClass = computed(() => {
 
 <template>
   <!-- Use the computed isVisible based on renderer.value.visible -->
-  <div class="flex flex-col gap-2 max-w-lg flex-shrink-0">
+  <div class="flex flex-col gap-2 flex-shrink-0">
     <!-- Replace native label with the Label component -->
     <Label v-if="labelText" :class="labelClass">{{ labelText }}</Label>
     <!-- Use v-html with the parsedDescription ref -->
diff --git a/unraid-ui/src/forms/PreconditionsLabel.vue b/unraid-ui/src/forms/PreconditionsLabel.vue
index 0ad58aff1..82433b917 100644
--- a/unraid-ui/src/forms/PreconditionsLabel.vue
+++ b/unraid-ui/src/forms/PreconditionsLabel.vue
@@ -28,12 +28,14 @@ const description = computed(() => props.uischema.options?.description);
 
 <template>
   <!-- Render each precondition as a list item with an icon bullet -->
-  <p v-if="description" class="mb-2">{{ description }}</p>
-  <ul class="list-none space-y-1">
-    <li v-for="(item, index) in items" :key="index" class="flex items-center">
-      <span v-if="item.status" class="text-green-500 mr-2 font-bold">✓</span>
-      <span v-else class="text-red-500 mr-2 font-extrabold">✕</span>
-      <span>{{ item.text }}</span>
-    </li>
-  </ul>
+  <div>
+    <p v-if="description" class="mb-2">{{ description }}</p>
+    <ul class="list-none space-y-1">
+      <li v-for="(item, index) in items" :key="index" class="flex items-center">
+        <span v-if="item.status" class="text-green-500 mr-2 font-bold">✓</span>
+        <span v-else class="text-red-500 mr-2 font-extrabold">✕</span>
+        <span>{{ item.text }}</span>
+      </li>
+    </ul>
+  </div>
 </template>
diff --git a/unraid-ui/src/forms/StringArrayField.vue b/unraid-ui/src/forms/StringArrayField.vue
index 16a1d9403..9ed868987 100644
--- a/unraid-ui/src/forms/StringArrayField.vue
+++ b/unraid-ui/src/forms/StringArrayField.vue
@@ -41,7 +41,6 @@ const placeholder = computed(() => control.value.uischema?.options?.placeholder
 
 <template>
   <div class="space-y-4">
-    <p v-if="control.description" v-html="control.description" />
     <div v-for="(item, index) in items" :key="index" class="flex gap-2">
       <Input
         :type="inputType"
diff --git a/unraid-ui/src/forms/renderers.ts b/unraid-ui/src/forms/renderers.ts
index 5ffffa30a..84f0c07e3 100644
--- a/unraid-ui/src/forms/renderers.ts
+++ b/unraid-ui/src/forms/renderers.ts
@@ -92,7 +92,7 @@ export const jsonFormsRenderers: JsonFormsRendererRegistryEntry[] = [
   },
   {
     renderer: markRaw(withErrorWrapper(StringArrayField)),
-    tester: rankWith(4, and(isControl, schemaMatches(isStringArray))),
+    tester: rankWith(4, and(isControl, schemaMatches(isStringArray), optionIs('format', 'array'))),
   },
   // Labels
   {