move isCronValid in harvester code base

harvester · Sep 23, 2024 · 49dd503 · 49dd503
1 parent 98d5db9
commit 49dd503
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue b/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue
@@ -8,7 +8,7 @@ import Tab from '@shell/components/Tabbed/Tab';
 import MessageLink from '@shell/components/MessageLink';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import CreateEditView from '@shell/mixins/create-edit-view';
-import { isCronValid } from '@shell/utils/validators/cron-schedule';
+import { isCronValid } from '@pkg/harvester/utils/cron';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
 import { allHash } from '@shell/utils/promise';
 import { HCI } from '../types';

diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
@@ -148,7 +148,7 @@ harvester:
     setDefaultVersion: Set default version
     addTemplateVersion: Add template version
     backup: Take Backup
-    createSchedule: Create VM Schedule
+    createSchedule: Create Schedule
     restore: Restore
     restoreNewVM: Restore New
     resumeSchedule: Resume
@@ -193,7 +193,7 @@ harvester:
     scheduleType: Type
     maxFailure: Max Failure
     sourceVm: Source VM
-    vmSchedule: VM Schedule
+    vmSchedule: Virtual Machine Schedule
     hostIp: Host IP
     vm:
       ipAddress: IP Address
@@ -808,10 +808,10 @@ harvester:
       moreNotes: For more details about the release notes, please visit -
 
   schedule:
-    label: VM Schedules
-    createTitle: Create VM Schedule
-    createButtonText: Create VM Schedule
-    scheduleType: VM Schedule Type
+    label: Virtual Machine Schedules
+    createTitle: Create Schedule
+    createButtonText: Create Schedule
+    scheduleType: Virtual Machine Schedule Type
     cron: Cron Schedule
     detail: 
       namespace: Namespace
@@ -1495,8 +1495,8 @@ typeLabel:
     }
   harvesterhci.io.schedulevmbackup: |-
     {count, plural,
-      one { VM Schedule }
-      other { VM Schedules }
+      one { Virtual Machine Schedule }
+      other { Virtual Machine Schedules }
     }
   harvesterhci.io.virtualmachinebackup: |-
     {count, plural,

diff --git a/pkg/harvester/list/harvesterhci.io.schedulevmbackup.vue b/pkg/harvester/list/harvesterhci.io.schedulevmbackup.vue
@@ -91,7 +91,7 @@ export default {
       :schema="schema"
       :resource="resource"
       :type-display="typeDisplay"
-      :parentNameOverride="'VM schedule'"
+      :parentNameOverride="'Virtual Machine schedule'"
       :create-button-label="t('harvester.schedule.createButtonText')"
     />
     <ResourceTable

diff --git a/pkg/harvester/utils/cron.js b/pkg/harvester/utils/cron.js
@@ -0,0 +1,11 @@
+import cronstrue from 'cronstrue';
+
+export function isCronValid(schedule = '') {
+  try {
+    const hint = cronstrue.toString(schedule);
+
+    return !!hint;
+  } catch (e) {
+    return false;
+  }
+}
diff --git a/shell/utils/validators/cron-schedule.js b/shell/utils/validators/cron-schedule.js
@@ -7,13 +7,3 @@ export function cronSchedule(schedule = '', getters, errors) {
     errors.push(getters['i18n/t']('validation.invalidCron'));
   }
 }
-
-export function isCronValid(schedule = '') {
-  try {
-    const hint = cronstrue.toString(schedule);
-
-    return !!hint;
-  } catch (e) {
-    return false;
-  }
-}