fix(web): unify UPC license actions into manage/trial entry

web/__test__/components/DropdownContent.test.ts

@@ -0,0 +1,211 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { shallowMount } from '@vue/test-utils';
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { ServerStateData, ServerStateDataAction } from '~/types/server';
+import type { UserProfileLink } from '~/types/userProfile';
+import type { Ref } from 'vue';
+
+import DropdownContent from '~/components/UserProfile/DropdownContent.vue';
+import { createTestI18n } from '../utils/i18n';
+
+const { accountStoreMocks, errorsStoreRefs, serverStoreRefs, updateOsStoreRefs } = vi.hoisted(() => ({
+  accountStoreMocks: {
+    manage: vi.fn(),
+    myKeys: vi.fn(),
+  },
+  errorsStoreRefs: {
+    errors: null as Ref<unknown[]> | null,
+  },
+  serverStoreRefs: {
+    connectPluginInstalled: null as Ref<'dynamix.unraid.net.plg' | ''> | null,
+    keyActions: null as Ref<ServerStateDataAction[] | undefined> | null,
+    rebootType: null as Ref<string> | null,
+    registered: null as Ref<boolean> | null,
+    regUpdatesExpired: null as Ref<boolean> | null,
+    stateData: null as Ref<ServerStateData> | null,
+    stateDataError: null as Ref<{ message: string } | undefined> | null,
+  },
+  updateOsStoreRefs: {
+    available: null as Ref<string | null> | null,
+    availableWithRenewal: null as Ref<string | null> | null,
+  },
+}));
+
+vi.mock('~/store/account', () => ({
+  useAccountStore: () => accountStoreMocks,
+}));
+
+vi.mock('~/store/errors', async () => {
+  const { ref } = await import('vue');
+  const { defineStore } = await import('pinia');
+
+  errorsStoreRefs.errors = ref([]);
+
+  const useErrorsStore = defineStore('errorsMockForDropdownContent', () => ({
+    errors: errorsStoreRefs.errors!,
+  }));
+
+  return { useErrorsStore };
+});
+
+vi.mock('~/store/updateOs', async () => {
+  const { ref } = await import('vue');
+  const { defineStore } = await import('pinia');
+
+  updateOsStoreRefs.available = ref(null);
+  updateOsStoreRefs.availableWithRenewal = ref(null);
+
+  const useUpdateOsStore = defineStore('updateOsMockForDropdownContent', () => ({
+    available: updateOsStoreRefs.available!,
+    availableWithRenewal: updateOsStoreRefs.availableWithRenewal!,
+    localCheckForUpdate: vi.fn(),
+    setModalOpen: vi.fn(),
+  }));
+
+  return { useUpdateOsStore };
+});
+
+vi.mock('~/store/server', async () => {
+  const { ref } = await import('vue');
+  const { defineStore } = await import('pinia');
+
+  serverStoreRefs.keyActions = ref([]);
+  serverStoreRefs.connectPluginInstalled = ref('dynamix.unraid.net.plg');
+  serverStoreRefs.rebootType = ref('');
+  serverStoreRefs.registered = ref(false);
+  serverStoreRefs.regUpdatesExpired = ref(false);
+  serverStoreRefs.stateData = ref({
+    actions: [],
+    error: false,
+    heading: '',
+    humanReadable: '',
+    message: '',
+  });
+  serverStoreRefs.stateDataError = ref(undefined);
+
+  const useServerStore = defineStore('serverMockForDropdownContent', () => ({
+    keyActions: serverStoreRefs.keyActions!,
+    connectPluginInstalled: serverStoreRefs.connectPluginInstalled!,
+    rebootType: serverStoreRefs.rebootType!,
+    registered: serverStoreRefs.registered!,
+    regUpdatesExpired: serverStoreRefs.regUpdatesExpired!,
+    stateData: serverStoreRefs.stateData!,
+    stateDataError: serverStoreRefs.stateDataError!,
+  }));
+
+  return { useServerStore };
+});
+
+describe('DropdownContent', () => {
+  const isManageLicenseItem = (
+    item: unknown
+  ): item is UserProfileLink<'manageLicense'> & { name: 'manageLicense' } => {
+    return (
+      typeof item === 'object' && item !== null && (item as { name?: string }).name === 'manageLicense'
+    );
+  };
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+
+    serverStoreRefs.keyActions!.value = [];
+    serverStoreRefs.connectPluginInstalled!.value = 'dynamix.unraid.net.plg';
+    serverStoreRefs.rebootType!.value = '';
+    serverStoreRefs.registered!.value = false;
+    serverStoreRefs.regUpdatesExpired!.value = false;
+    serverStoreRefs.stateData!.value = {
+      actions: [{ name: 'signIn', text: 'Sign in to Unraid Connect' }],
+      error: false,
+      heading: '',
+      humanReadable: '',
+      message: '',
+    };
+    serverStoreRefs.stateDataError!.value = undefined;
+
+    errorsStoreRefs.errors!.value = [];
+    updateOsStoreRefs.available!.value = null;
+    updateOsStoreRefs.availableWithRenewal!.value = null;
+  });
+
+  it('does not show manage-license helper text when sign-in is the only action', () => {
+    const wrapper = shallowMount(DropdownContent, {
+      global: {
+        plugins: [createTestI18n()],
+      },
+    });
+
+    expect(wrapper.text()).toContain('Sign In to your Unraid.net account to get started');
+    expect(wrapper.text()).not.toContain(
+      'Replace, recover, or link your license on your Unraid Account.'
+    );
+  });
+
+  it('shows manage-license helper text when key actions are available', () => {
+    serverStoreRefs.keyActions!.value = [{ name: 'replace', text: 'Replace Key' }];
+
+    const wrapper = shallowMount(DropdownContent, {
+      global: {
+        plugins: [createTestI18n()],
+      },
+    });
+
+    expect(wrapper.text()).toContain('Replace, recover, or link your license on your Unraid Account.');
+  });
+
+  it('shows the localized trial helper text when trial start is available', () => {
+    serverStoreRefs.keyActions!.value = [{ name: 'trialStart', text: 'Start Trial' }];
+
+    const wrapper = shallowMount(DropdownContent, {
+      global: {
+        plugins: [createTestI18n()],
+      },
+    });
+
+    expect(wrapper.text()).toContain('Start your trial from Manage License in your Unraid Account.');
+  });
+
+  it('uses the first key action behavior for Manage License', () => {
+    const replaceClick = vi.fn();
+    serverStoreRefs.registered!.value = true;
+    serverStoreRefs.stateData!.value = {
+      actions: [],
+      error: false,
+      heading: '',
+      humanReadable: '',
+      message: '',
+    };
+    serverStoreRefs.keyActions!.value = [
+      {
+        click: replaceClick,
+        clickParams: ['foo'],
+        disabled: true,
+        external: true,
+        name: 'replace',
+        text: 'Replace Key',
+        title: 'Replace',
+      },
+    ];
+
+    const wrapper = shallowMount(DropdownContent, {
+      global: {
+        plugins: [createTestI18n()],
+      },
+    });
+
+    const dropdownItems = wrapper.findAllComponents({ name: 'DropdownItem' });
+    const manageItem = dropdownItems
+      .map((itemWrapper) => itemWrapper.props('item'))
+      .find(isManageLicenseItem);
+
+    expect(manageItem).toBeDefined();
+    expect(manageItem?.disabled).toBe(true);
+    expect(manageItem?.external).toBe(true);
+
+    manageItem?.click?.(manageItem.clickParams);
+
+    expect(replaceClick).toHaveBeenCalledTimes(1);
+    expect(accountStoreMocks.myKeys).not.toHaveBeenCalled();
+  });
+});

web/__test__/components/Registration.test.ts

@@ -440,6 +440,6 @@ describe('Registration.standalone.vue', () => {
     await wrapper.vm.$nextTick();
 
     const actionNames = serverStore.keyActions?.map((action) => action.name);
-    expect(actionNames).toEqual(['activate', 'recover']);
+    expect(actionNames).toEqual(['activate', 'recover', 'trialStart']);
   });
 });

web/__test__/store/account.test.ts

@@ -38,6 +38,12 @@ const mockUseMutation = vi.fn(() => {
   };
 });
 
+const { activationCodeStoreMock } = vi.hoisted(() => ({
+  activationCodeStoreMock: {
+    activationCode: null as { code?: string; partner?: string; system?: string } | null,
+  },
+}));
+
 const mockSend = vi.fn();
 const mockSetError = vi.fn();
 
@@ -74,6 +80,10 @@ vi.mock('~/store/unraidApi', () => ({
   }),
 }));
 
+vi.mock('~/components/Onboarding/store/activationCodeData', () => ({
+  useActivationCodeDataStore: () => activationCodeStoreMock,
+}));
+
 describe('Account Store', () => {
   let store: ReturnType<typeof useAccountStore>;
 
@@ -83,6 +93,7 @@ describe('Account Store', () => {
     vi.mocked(useMutation);
     vi.clearAllMocks();
     vi.useFakeTimers();
+    activationCodeStoreMock.activationCode = null;
   });
 
   afterEach(() => {
@@ -113,6 +124,37 @@ describe('Account Store', () => {
       );
     });
 
+    it('should include activationCodeData in payload when available', () => {
+      activationCodeStoreMock.activationCode = {
+        code: 'PARTNER-CODE-123',
+        partner: 'Partner Name',
+        system: 'Partner System',
+      };
+
+      store.myKeys();
+
+      expect(mockSend).toHaveBeenCalledTimes(1);
+      expect(mockSend).toHaveBeenCalledWith(
+        ACCOUNT_CALLBACK.toString(),
+        [
+          {
+            server: {
+              guid: 'test-guid',
+              name: 'test-server',
+              activationCodeData: {
+                code: 'PARTNER-CODE-123',
+                partner: 'Partner Name',
+                system: 'Partner System',
+              },
+            },
+            type: 'myKeys',
+          },
+        ],
+        undefined,
+        'post'
+      );
+    });
+
     it('should call recover action correctly', () => {
       store.recover();
       expect(mockSend).toHaveBeenCalledTimes(1);
@@ -228,6 +270,18 @@ describe('Account Store', () => {
         'post'
       );
     });
+
+    it('should call trialStart action correctly', () => {
+      store.trialStart();
+
+      expect(mockSend).toHaveBeenCalledTimes(1);
+      expect(mockSend).toHaveBeenCalledWith(
+        ACCOUNT_CALLBACK.toString(),
+        [{ server: { guid: 'test-guid', name: 'test-server' }, type: 'trialStart' }],
+        undefined,
+        'post'
+      );
+    });
   });
 
   describe('State Management', () => {

web/src/components/UserProfile/DropdownContent.vue

@@ -21,6 +21,7 @@ import {
   WEBGUI_TOOLS_UPDATE,
 } from '~/helpers/urls';
 
+import type { ServerStateDataAction } from '~/types/server';
 import type { UserProfileLink } from '~/types/userProfile';
 
 import Beta from '~/components/UserProfile/Beta.vue';
@@ -62,12 +63,52 @@ const signInAction = computed(
 const signOutAction = computed(
   () => stateData.value.actions?.filter((act: { name: string }) => act.name === 'signOut') ?? []
 );
+const createManageLicenseAction = (
+  text: string,
+  sourceAction?: ServerStateDataAction
+): UserProfileLink<'manageLicense'> => {
+  const wrappedClick = sourceAction?.click
+    ? (...args: Parameters<NonNullable<ServerStateDataAction['click']>>) => {
+        sourceAction.click?.(...args);
+        emit('close-dropdown');
+      }
+    : sourceAction
+      ? undefined
+      : () => {
+          accountStore.myKeys();
+          emit('close-dropdown');
+        };
 
-/**
- * Filter out the renew action from the key actions so we can display it separately and link to the Tools > Registration page
- */
-const filteredKeyActions = computed(() =>
-  keyActions.value?.filter((action) => !['renew'].includes(action.name))
+  return {
+    ...sourceAction,
+    click: wrappedClick,
+    external: sourceAction?.external ?? true,
+    icon: sourceAction?.icon ?? KeyIcon,
+    name: 'manageLicense',
+    text,
+    title: sourceAction?.title ?? text,
+  };
+};
+const manageLicenseAction = computed(() =>
+  createManageLicenseAction('onboarding.licenseStep.actions.manageLicense', keyActions.value?.[0])
+);
+
+const filteredKeyActions = computed(() => {
+  if (!keyActions.value?.length) {
+    return keyActions.value;
+  }
+  return [manageLicenseAction.value];
+});
+const showManageLicenseHelperText = computed(
+  () => !!filteredKeyActions.value?.some((action) => action.name === 'manageLicense')
+);
+const hasTrialStartAction = computed(
+  () => keyActions.value?.some((action) => action.name === 'trialStart') ?? false
+);
+const manageLicenseHelperText = computed(() =>
+  hasTrialStartAction.value
+    ? t('onboarding.licenseStep.actions.manageLicenseTrialStartHelperText')
+    : t('onboarding.licenseStep.actions.manageLicenseHelperText')
 );
 
 const manageUnraidNetAccount = computed((): UserProfileLink => {
@@ -233,10 +274,13 @@ const unraidConnectWelcome = computed(() => {
         <DropdownItem :item="signInAction[0]" />
       </li>
 
-      <template v-if="filteredKeyActions">
+      <template v-if="filteredKeyActions?.length">
         <li v-for="action in filteredKeyActions" :key="action.name">
           <DropdownItem :item="action" />
         </li>
+        <li v-if="showManageLicenseHelperText" class="-mt-1 px-2 text-xs leading-relaxed opacity-75">
+          {{ manageLicenseHelperText }}
+        </li>
       </template>
 
       <template v-if="links.length">

web/src/locales/ar.json

@@ -319,7 +319,6 @@
   "onboarding.licenseStep.labels.activationCode": "رمز التفعيل",
   "onboarding.licenseStep.labels.none": "لا شيء",
   "onboarding.licenseStep.actions.manageLicense": "إدارة الترخيص",
-  "onboarding.licenseStep.actions.manageLicenseHelperText": "Replace, recover, or link your license on your Unraid Account.",
   "onboarding.licenseStep.actions.activateServer": "تفعيل الخادم",
   "onboarding.licenseStep.actions.nextStep": "الخطوة التالية",
   "onboarding.licenseStep.actions.skipForNow": "تخطي الآن",