Skip to content

fix: alignment of settings on ManagementAccess settings page #1421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 19, 2025
Merged

fix: alignment of settings on ManagementAccess settings page #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd708fe
rm rigid description placement in `StringArrayField`
pujitm Jun 18, 2025
07763d5
narrow matcher for `StringFieldArray` renderer
pujitm Jun 18, 2025
8fd7a94
rm width restriction on `LabelRenderer`
pujitm Jun 18, 2025
1383551
wrap remote access preconditions in `UnraidSettingsLayout`
pujitm Jun 18, 2025
1f2b57a
consistent ending colons on labels
pujitm Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/unraid-api/graph/resolvers/settings/settings.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
39 changes: 24 additions & 15 deletions packages/unraid-api-plugin-connect/src/service/connect-settings.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{
text: 'You have provisioned a valid SSL certificate',
status: isSSLCertProvisioned,
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,
},
],
},
],
},
},
],
},
];

Expand Down
2 changes: 1 addition & 1 deletion unraid-ui/src/forms/LabelRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elibosley would this break assumptions in ui's you've been building?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably not

<!-- Replace native label with the Label component -->
<Label v-if="labelText" :class="labelClass">{{ labelText }}</Label>
<!-- Use v-html with the parsedDescription ref -->
Expand Down
18 changes: 10 additions & 8 deletions unraid-ui/src/forms/PreconditionsLabel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion unraid-ui/src/forms/StringArrayField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion unraid-ui/src/forms/renderers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading