chore: bump version to v1.8.0-dev (#672)

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.7.1-dev",
+  "version": "1.8.0-dev",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
@@ -24,7 +24,7 @@
     "glob": "7.2.3",
     "glob-parent": "6.0.2",
     "json5": "2.2.3",
-    "@types/lodash": "4.17.23",
+    "@types/lodash": "4.17.21",
     "merge": "2.1.1",
     "node-forge": "1.3.3",
     "nth-check": "2.1.1",

pkg/harvester/detail/harvesterhci.io.schedulevmbackup/index.vue

@@ -75,7 +75,7 @@ export default {
       <div class="row">
         <div class="col span-6 mb-20">
           <LabelValue
-            :name="t('harvester.schedule.cron')"
+            :name="t('harvester.schedule.cron.label')"
             :value="cronExpression"
           />
         </div>

pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue

@@ -1,4 +1,5 @@
 <script>
+import { mapGetters } from 'vuex';
 import { RadioGroup } from '@components/Form/Radio';
 import { Banner } from '@components/Banner';
 import { LabeledInput } from '@components/Form/LabeledInput';
@@ -16,6 +17,7 @@ import { sortBy } from '@shell/utils/sort';
 import { BACKUP_TYPE } from '../config/types';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 import { isBackupTargetSettingEmpty, isBackupTargetSettingUnavailable } from '../utils/setting';
+import CronExpressionEditorModal from '@shell/components/Cron/CronExpressionEditorModal.vue';
 
 export default {
   name:       'CreateVMSchedule',
@@ -28,6 +30,7 @@ export default {
     LabeledSelect,
     MessageLink,
     Banner,
+    CronExpressionEditorModal
   },
 
   mixins: [CreateEditView],
@@ -86,10 +89,12 @@ export default {
       }
     }
 
-    return { settings: [] };
+    return { settings: [], showModel: false };
   },
 
   computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
     backupTargetResource() {
       return this.settings.find( (O) => O.id === 'backup-target');
     },
@@ -172,6 +177,9 @@ export default {
         this.value.spec['maxFailure'] = this.value.spec.retain;
       }
     },
+    openModal() {
+      this.showModel = true;
+    },
   },
 };
 </script>
@@ -256,16 +264,28 @@ export default {
         :weight="99"
         class="bordered-table"
       >
-        <LabeledInput
-          v-model:value="value.spec.cron"
-          class="mb-30"
-          type="cron"
-          required
-          :mode="mode"
-          :label="t('harvester.schedule.cron')"
-          placeholder="0 * * * *"
-          :disabled="isBackupTargetUnAvailable || isView"
-        />
+        <div class="cronEditor">
+          <LabeledInput
+            v-model:value="value.spec.cron"
+            class="mb-30"
+            type="cron"
+            required
+            :mode="mode"
+            :label="t('harvester.schedule.cron.label')"
+            placeholder="0 * * * *"
+            :disabled="isBackupTargetUnAvailable || isView"
+          />
+          <button
+            class="editCronBtn btn role-primary"
+            @click="openModal"
+          >
+            {{ t('harvester.schedule.cron.editButton') }}
+          </button>
+          <CronExpressionEditorModal
+            v-model:show="showModel"
+            v-model:cron-expression="value.spec.cron"
+          />
+        </div>
         <LabeledInput
           v-model:value.number="value.spec.retain"
           class="mb-30"
@@ -292,3 +312,16 @@ export default {
     </Tabbed>
   </CruResource>
 </template>
+
+<style lang="scss" scoped>
+.cronEditor {
+  align-items: center;
+  display: flex;
+}
+
+.editCronBtn {
+  margin-bottom: 30px;
+  margin-left: 10px;
+  height: 60px;
+}
+</style>

pkg/harvester/l10n/en-us.yaml

@@ -983,7 +983,9 @@ harvester:
     createTitle: Create Schedule
     createButtonText: Create Schedule
     scheduleType: Virtual Machine Schedule Type
-    cron: Cron Schedule
+    cron: 
+      label: Cron Schedule
+      editButton: Edit
     detail:
       namespace: Namespace
       sourceVM: Source Virtual Machine

pkg/harvester/mixins/harvester-vm/index.js

@@ -690,6 +690,7 @@ export default {
         set(this.spec.template.spec, 'domain.memory.maxGuest', this.maxMemory);
         set(this.spec.template.spec, 'domain.resources.limits.memory', this.maxMemory);
       } else {
+        this.spec.template.spec.domain.cpu.maxSockets = 1;
         this.spec.template.spec.domain.cpu.sockets = 1;
         this.spec.template.spec.domain.cpu.cores = this.cpu;
         this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();

pkg/harvester/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.7.1-dev",
+  "version": "1.8.0-dev",
   "private": false,
   "rancher": {
     "annotations": {

yarn.lock

@@ -3430,10 +3430,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@4.17.23":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.23.tgz#c1bb06db218acc8fc232da0447473fc2fb9d9841"
-  integrity sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==
+"@types/lodash@4.17.21":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.21.tgz#b806831543d696b14f8112db600ea9d3a1df6ea4"
+  integrity sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==
 
 "@types/mime@^1":
   version "1.3.5"
@@ -3453,9 +3453,9 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
-  version "20.19.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.28.tgz#d968c492e405e4a572f5c27e4f5efc24f0eb9937"
-  integrity sha512-VyKBr25BuFDzBFCK5sUM6ZXiWfqgCTwTAOK8qzGV/m9FCirXYDlmczJ+d5dXBAQALGCdRRdbteKYfJ84NGEusw==
+  version "20.19.27"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.27.tgz#d51333f77953a5e4e71d3b5aefa83ec5297fbb80"
+  integrity sha512-N2clP5pJhB2YnZJ3PIHFk5RkygRX5WO/5f0WC08tp0wd+sv0rsJk3MqWn3CbNmT2J505a5336jaQj4ph1AdMug==
   dependencies:
     undici-types "~6.21.0"