diff --git a/pkg/aks/components/CruAks.vue b/pkg/aks/components/CruAks.vue index 618a2a3f8e5..1248529071e 100644 --- a/pkg/aks/components/CruAks.vue +++ b/pkg/aks/components/CruAks.vue @@ -1195,7 +1195,7 @@ export default defineComponent({ :mode="mode" :label="t('aks.sshPublicKey.readFromFile')" class="role-tertiary mt-10" - @selected="e=>$set(config, 'sshPublicKey', e)" + @selected="e => config.sshPublicKey = e" /> diff --git a/shell/chart/monitoring/alerting/index.vue b/shell/chart/monitoring/alerting/index.vue index f8e4087855d..69ac6403fee 100644 --- a/shell/chart/monitoring/alerting/index.vue +++ b/shell/chart/monitoring/alerting/index.vue @@ -81,27 +81,15 @@ export default { watch: { filteredSecrets(newValue) { if (isEmpty(newValue)) { - this.$set( - this.value.alertmanager.alertmanagerSpec, - 'useExistingSecret', - false - ); + this.value.alertmanager.alertmanagerSpec.useExistingSecret = false; } const { existingSecret } = this; if (existingSecret) { this.$nextTick(() => { - this.$set( - this.value.alertmanager.alertmanagerSpec, - 'useExistingSecret', - true - ); - this.$set( - this.value.alertmanager.alertmanagerSpec, - 'configSecret', - existingSecret.metadata.name - ); + this.value.alertmanager.alertmanagerSpec.useExistingSecret = true; + this.value.alertmanager.alertmanagerSpec.configSecret = existingSecret.metadata.name; }); } }, @@ -110,11 +98,7 @@ export default { if (useExistingSecret) { if (existingSecret?.metadata?.name) { - this.$set( - this.value.alertmanager.alertmanagerSpec, - 'configSecret', - existingSecret.metadata.name - ); + this.value.alertmanager.alertmanagerSpec.configSecret = existingSecret.metadata.name; } } else { this.value.alertmanager.alertmanagerSpec['configSecret'] = ''; diff --git a/shell/chart/monitoring/grafana/index.vue b/shell/chart/monitoring/grafana/index.vue index ce97bc4da62..fb570a1bcfd 100644 --- a/shell/chart/monitoring/grafana/index.vue +++ b/shell/chart/monitoring/grafana/index.vue @@ -249,7 +249,7 @@ export default { :mode="mode" :options="pvcs" :label="t('monitoring.grafana.storage.existingClaim')" - @updateName="(name) => $set(value.grafana.persistence, 'existingClaim', name)" + @updateName="(name) => value.grafana.persistence.existingClaim = name" /> @@ -271,7 +271,7 @@ export default { :mode="mode" :options="storageClasses" :label="t('monitoring.prometheus.storage.className')" - @updateName="(name) => $set(value.grafana.persistence, 'storageClassName', name)" + @updateName="(name) => value.grafana.persistence.storageClassName = name" /> @@ -338,7 +338,7 @@ export default { :mode="mode" :options="storageClasses" :label="t('monitoring.prometheus.storage.className')" - @updateName="(name) => $set(value.grafana.persistence, 'storageClassName', name)" + @updateName="(name) => value.grafana.persistence.storageClassName = name" /> diff --git a/shell/chart/monitoring/prometheus/index.vue b/shell/chart/monitoring/prometheus/index.vue index 886bd0505dc..191e558c376 100644 --- a/shell/chart/monitoring/prometheus/index.vue +++ b/shell/chart/monitoring/prometheus/index.vue @@ -123,21 +123,14 @@ export default { watch: { enablePersistentStorage(enabled) { if (!!enabled) { - this.$set( - this.value.prometheus.prometheusSpec.storageSpec, - 'volumeClaimTemplate', - { - spec: { - accessModes: ['ReadWriteOnce'], - resources: { requests: { storage: '50Gi' } }, - } + this.value.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate = { + spec: { + accessModes: ['ReadWriteOnce'], + resources: { requests: { storage: '50Gi' } }, } - ); + }; } else { - this.$delete( - this.value.prometheus.prometheusSpec.storageSpec, - 'volumeClaimTemplate' - ); + delete this.value.prometheus.prometheusSpec.storageSpec['volumeClaimTemplate']; } }, }, @@ -328,7 +321,7 @@ export default { :options="storageClasses" :value="value.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.storageClassName" :label="t('monitoring.prometheus.storage.className')" - @updateName="(name) => $set(value.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec, 'storageClassName', name)" + @updateName="(name) => value.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.storageClassName = name" /> diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue index 6f0582c3a02..b70ed063ca2 100644 --- a/shell/components/form/PodAffinity.vue +++ b/shell/components/form/PodAffinity.vue @@ -379,7 +379,7 @@ export default { :value="props.row.value._anti ?t('workload.scheduling.affinity.antiAffinityOption') :t('workload.scheduling.affinity.affinityOption') " :label="t('workload.scheduling.affinity.type')" :data-testid="`pod-affinity-type-index${props.i}`" - @update:value="$set(props.row.value, '_anti',!props.row.value._anti)" + @update:value="props.row.value._anti = !props.row.value._anti" />
diff --git a/shell/edit/auth/googleoauth.vue b/shell/edit/auth/googleoauth.vue index 8bf6a7763cc..f07c1c4344a 100644 --- a/shell/edit/auth/googleoauth.vue +++ b/shell/edit/auth/googleoauth.vue @@ -196,7 +196,7 @@ export default { class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" - @selected="$set(model, 'oauthCredential', $event)" + @selected="model.oauthCredential = $event" />
@@ -231,7 +231,7 @@ export default { class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" - @selected="$set(model, 'serviceAccountCredential', $event)" + @selected="model.serviceAccountCredential = $event" /> diff --git a/shell/edit/auth/ldap/config.vue b/shell/edit/auth/ldap/config.vue index 8dd2987be1d..7bdf026dc2a 100644 --- a/shell/edit/auth/ldap/config.vue +++ b/shell/edit/auth/ldap/config.vue @@ -120,7 +120,7 @@ export default { :step="1" :mode="mode" :label="t('authConfig.ldap.port')" - @update:value="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))" + @update:value="e=> model.port = e.replace(/[^0-9]*/g, '')" /> @@ -158,7 +158,7 @@ export default { class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" - @selected="$set(model, 'certificate', $event)" + @selected="model.certificate = $event" /> diff --git a/shell/edit/auth/oidc.vue b/shell/edit/auth/oidc.vue index 1ef92a1c3f5..d625c60053f 100644 --- a/shell/edit/auth/oidc.vue +++ b/shell/edit/auth/oidc.vue @@ -233,7 +233,7 @@ export default { class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" - @selected="$set(model, 'privateKey', $event)" + @selected="model.privateKey = $event" />
@@ -248,7 +248,7 @@ export default { class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" - @selected="$set(model, 'certificate', $event)" + @selected="model.certificate = $event" />
diff --git a/shell/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue b/shell/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue index e385a21d6c9..33fc432e980 100644 --- a/shell/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue +++ b/shell/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue @@ -84,29 +84,28 @@ export default { watch: { 'value.type'(neuType, oldType) { - const { $set } = this; let resourceSpec, podSpec, objectSpec, externalSpec; switch (neuType) { case 'External': externalSpec = this.initExternalSpec(); - $set(this.value, 'external', externalSpec); + this.value.external = externalSpec; break; case 'Object': objectSpec = this.initObjectSpec(); - $set(this.value, 'object', objectSpec); + this.value.object = objectSpec; break; case 'Pods': podSpec = this.initPodsSpec(); - $set(this.value, 'pods', podSpec); + this.value.pods = podSpec; break; case 'Resource': resourceSpec = this.initResourceSpec(); - $set(this.value, 'resource', resourceSpec.resource); + this.value.resource = resourceSpec.resource; break; default: break; diff --git a/shell/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue b/shell/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue index 175ae825dbf..c906a30d029 100644 --- a/shell/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue +++ b/shell/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue @@ -64,11 +64,7 @@ export default { initializeType(authOptions, type) { authOptions.forEach((authOption) => { if (authOption.value === type && type !== 'none') { - this.$set( - this.value, - authOption.value, - this.value[authOption.value] || authOption.default - ); + this.value.authOption.value = this.value[authOption.value] || authOption.default; } else if (typeof this.value[authOption.value] !== 'undefined') { delete this.value[authOption.value]; } diff --git a/shell/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue b/shell/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue index 723d62aacd3..70507cd981a 100644 --- a/shell/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue +++ b/shell/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue @@ -28,11 +28,7 @@ export default { this.value['sendResolved'] = this.value.sendResolved || false; if (this.mode === _CREATE) { - this.$set( - this.value, - 'text', - this.value.text || '{{ template "slack.rancher.text" . }}' - ); + this.value.text = this.value.text || '{{ template "slack.rancher.text" . }}'; } return { diff --git a/shell/edit/monitoring.coreos.com.receiver/types/slack.vue b/shell/edit/monitoring.coreos.com.receiver/types/slack.vue index 6a5eae5ad9d..5f1468ba97b 100644 --- a/shell/edit/monitoring.coreos.com.receiver/types/slack.vue +++ b/shell/edit/monitoring.coreos.com.receiver/types/slack.vue @@ -28,11 +28,7 @@ export default { this.value['send_resolved'] = this.value.send_resolved || false; if (this.mode === _CREATE) { - this.$set( - this.value, - 'text', - this.value.text || '{{ template "slack.rancher.text" . }}' - ); + this.value.text = this.value.text || '{{ template "slack.rancher.text" . }}'; } return {}; diff --git a/shell/edit/service.vue b/shell/edit/service.vue index b6e4d113a64..d28f99ce6ec 100644 --- a/shell/edit/service.vue +++ b/shell/edit/service.vue @@ -226,11 +226,7 @@ export default { this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } }; // set it null and then set it with vue to make reactive. - this.$set( - this.value.spec.sessionAffinityConfig.clientIP, - 'timeoutSeconds', - SESSION_STICKY_TIME_DEFAULT - ); + this.value.spec.sessionAffinityConfig.clientIP.timeoutSeconds = SESSION_STICKY_TIME_DEFAULT; } else if ( this.value?.spec?.sessionAffinityConfig?.clientIP?.timeoutSeconds ) { @@ -425,7 +421,7 @@ export default { :mode="mode" :initial-empty-row="true" :protip="false" - @update:value="(e) => $set(value.spec, 'selector', e)" + @update:value="(e) => value.spec.selector = e" /> @@ -448,7 +444,7 @@ export default { :tooltip-key=" hasClusterIp ? 'servicesPage.ips.clusterIpHelpText' : null " - @update:value="(e) => $set(value.spec, 'clusterIP', e)" + @update:value="(e) => value.spec.clusterIP = e" /> @@ -465,7 +461,7 @@ export default { :tooltip-key=" hasClusterIp ? 'servicesPage.ips.loadBalancerIp.helpText' : null " - @update:value="(e) => $set(value.spec, 'loadBalancerIP', e)" + @update:value="(e) => value.spec.loadBalancerIP = e" /> @@ -478,7 +474,7 @@ export default { :value-placeholder="t('servicesPage.ips.external.placeholder')" :mode="mode" :protip="false" - @update:value="(e) => $set(value.spec, 'externalIPs', e)" + @update:value="(e) => value.spec.externalIPs = e" /> @@ -527,12 +523,7 @@ export default { :label="t('servicesPage.affinity.timeout.label')" :placeholder="t('servicesPage.affinity.timeout.placeholder')" @input=" - (e) => - $set( - value.spec.sessionAffinityConfig.clientIP, - 'timeoutSeconds', - e - ) + (e) => value.spec.sessionAffinityConfig.clientIP.timeoutSeconds = e " />