From 58f9eec8b1a43dd8dc05b1afcd193debdfee093a Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Wed, 31 Jan 2024 10:51:16 -0800
Subject: [PATCH] refactor: targeting keyType strings for Starter / Unleashed

---
 web/components/Registration.ce.vue              |  2 +-
 web/components/UserProfile/CallbackFeedback.vue | 12 +++++++++++-
 web/store/server.ts                             | 12 +++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/web/components/Registration.ce.vue b/web/components/Registration.ce.vue
index 4bf458422..ad0b042b3 100644
--- a/web/components/Registration.ce.vue
+++ b/web/components/Registration.ce.vue
@@ -92,7 +92,7 @@ const devicesAvailable = computed((): number => {
 });
 
 const showTrialExpiration = computed((): boolean => state.value === 'TRIAL' || state.value === 'EEXPIRED');
-const showUpdateEligibility = computed((): boolean => !!(regExp.value && (state.value === 'STARTER' || state.value === 'UNLEASHED')));
+const showUpdateEligibility = computed((): boolean => !!(regExp.value));
 const keyInstalled = computed((): boolean => !!(!stateDataError.value && state.value !== 'ENOKEYFILE'));
 const showTransferStatus = computed((): boolean => !!(keyInstalled.value && guid.value && !showTrialExpiration.value));
 // filter out renew action and only display other key actions…renew is displayed in RegistrationUpdateExpirationAction
diff --git a/web/components/UserProfile/CallbackFeedback.vue b/web/components/UserProfile/CallbackFeedback.vue
index 60dc56269..04dc62362 100644
--- a/web/components/UserProfile/CallbackFeedback.vue
+++ b/web/components/UserProfile/CallbackFeedback.vue
@@ -199,6 +199,16 @@ const accountActionStatusCopy = computed((): { text: string; } => {
 });
 
 const { copy, copied, isSupported } = useClipboard({ source: keyUrl.value });
+
+/**
+ * Ideally we'd show this based off of regExp.value, but we will not have that value yet.
+ * So we'll use the keyType.value that we get from the keyInstall store.
+ */
+const showUpdateEligibility = computed(() => {
+  // rather than specifically targeting 'Starter' and 'Unleashed' we'll target all keys that are not 'Basic', 'Plus', 'Pro', 'Lifetime', or 'Trial'
+  if (!keyType.value) { return false; }
+  return !['Basic', 'Plus', 'Pro', 'Lifetime', 'Trial'].includes(keyType.value);
+});
 </script>
 
 <template>
@@ -236,7 +246,7 @@ const { copy, copied, isSupported } = useClipboard({ source: keyUrl.value });
               {{ t('Calculating trial expiration…') }}
             </p>
           </div>
-          <div v-if="keyType === 'Starter' || keyType === 'Unleashed'" class="opacity-75 italic mt-4px">
+          <div v-if="showUpdateEligibility" class="opacity-75 italic mt-4px">
             <RegistrationUpdateExpiration
               v-if="refreshServerStateStatus === 'done'"
               :t="t"
diff --git a/web/store/server.ts b/web/store/server.ts
index fd28fb183..113e903ef 100644
--- a/web/store/server.ts
+++ b/web/store/server.ts
@@ -104,7 +104,7 @@ export const useServerStore = defineStore('server', () => {
   const regExp = ref<number>(0);
   const parsedRegExp = computed(() => regExp.value ? dayjs(regExp.value).format('YYYY-MM-DD') : null);
   const regUpdatesExpired = computed(() => {
-    if (!regExp.value || (state.value !== 'STARTER' && state.value !== 'UNLEASHED')) { return false; }
+    if (!regExp.value) { return false; }
     const today = dayjs();
     const parsedUpdateExpirationDate = dayjs(regExp.value);
 
@@ -452,11 +452,11 @@ export const useServerStore = defineStore('server', () => {
         return {
           actions: [
             ...(!registered.value && connectPluginInstalled.value ? [signInAction.value] : []),
-            ...(state.value === 'STARTER' && regUpdatesExpired.value ? [renewAction.value] : []),
+            ...(regUpdatesExpired.value ? [renewAction.value] : []),
             ...([upgradeAction.value]),
             ...(registered.value && connectPluginInstalled.value ? [signOutAction.value] : []),
           ],
-          humanReadable: state.value === 'BASIC' ? 'Basic' : 'Starter',
+          humanReadable: 'Starter',
           heading: 'Thank you for choosing Unraid OS!',
           message: !registered.value && connectPluginInstalled.value
             ? '<p>Register for Connect by signing in to your Unraid.net account</p>'
@@ -485,12 +485,10 @@ export const useServerStore = defineStore('server', () => {
         return {
           actions: [
             ...(!registered.value && connectPluginInstalled.value ? [signInAction.value] : []),
-            ...(state.value === 'UNLEASHED' && regUpdatesExpired.value ? [renewAction.value] : []),
+            ...(regUpdatesExpired.value ? [renewAction.value] : []),
             ...(registered.value && connectPluginInstalled.value ? [signOutAction.value] : []),
           ],
-          humanReadable: state.value === 'PRO'
-            ? 'Pro'
-            : (state.value === 'LIFETIME' ? 'Lifetime' : 'Unleashed'),
+          humanReadable: 'Unleashed',
           heading: 'Thank you for choosing Unraid OS!',
           message: !registered.value && connectPluginInstalled.value
             ? '<p>Register for Connect by signing in to your Unraid.net account</p>'