Vuelidate, I18n, and filter are upgraded to vue3
While navigating to the pages i18n, vuelidate, and filters errors
occurred. i18n, and vuelidate code changes in each page adapted to
vue3. Filter global function for date and time format implemented
in the main.js file and those files which as called the filter
functions.
Change-Id: If1a2ee22d47750faef1c35ef2c263299067d9a20
Signed-off-by: Surya Venkatesan <suryav@ami.com>
diff --git a/src/store/modules/Settings/DateTimeStore.js b/src/store/modules/Settings/DateTimeStore.js
index 9d804a7..94a1dfc 100644
--- a/src/store/modules/Settings/DateTimeStore.js
+++ b/src/store/modules/Settings/DateTimeStore.js
@@ -74,11 +74,13 @@
}
})
.then(() => {
- return i18n.t('pageDateTime.toast.successSaveDateTime');
+ return i18n.global.t('pageDateTime.toast.successSaveDateTime');
})
.catch((error) => {
console.log(error);
- throw new Error(i18n.t('pageDateTime.toast.errorSaveDateTime'));
+ throw new Error(
+ i18n.global.t('pageDateTime.toast.errorSaveDateTime'),
+ );
});
},
},
diff --git a/src/store/modules/Settings/NetworkStore.js b/src/store/modules/Settings/NetworkStore.js
index a249d22..9dc006e 100644
--- a/src/store/modules/Settings/NetworkStore.js
+++ b/src/store/modules/Settings/NetworkStore.js
@@ -119,15 +119,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dhcp'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dhcp'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dhcp'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dhcp'),
}),
);
});
@@ -183,8 +183,8 @@
data,
)
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.domainName'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.domainName'),
});
})
.catch((error) => {
@@ -193,8 +193,8 @@
else if (ipVersion === 'IPv6')
commit('setDomainNameStateIpv6', !domainState);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.domainName'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.domainName'),
}),
);
});
@@ -224,8 +224,8 @@
data,
)
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
});
})
.catch((error) => {
@@ -233,8 +233,8 @@
if (ipVersion === 'IPv4') commit('setDnsState', !dnsState);
else if (ipVersion === 'IPv6') commit('setDnsStateIpv6', !dnsState);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
}),
);
});
@@ -264,8 +264,8 @@
data,
)
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ntp'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ntp'),
});
})
.catch((error) => {
@@ -273,8 +273,8 @@
if (ipVersion === 'IPv4') commit('setNtpState', !ntpState);
else if (ipVersion === 'IPv6') commit('setNtpStateIpv6', !ntpState);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ntp'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ntp'),
}),
);
});
@@ -304,15 +304,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ipv4'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ipv4'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ipv4'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ipv4'),
}),
);
});
@@ -356,15 +356,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ipv4'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ipv4'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ipv4'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.ipv4'),
}),
);
});
@@ -398,15 +398,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.network'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.network'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.network'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.network'),
}),
);
});
@@ -423,15 +423,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
}),
);
});
@@ -444,15 +444,15 @@
)
.then(dispatch('getEthernetData'))
.then(() => {
- return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ return i18n.global.t('pageNetwork.toast.successSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ i18n.global.t('pageNetwork.toast.errorSaveNetworkSettings', {
+ setting: i18n.global.t('pageNetwork.dns'),
}),
);
});
diff --git a/src/store/modules/Settings/PowerPolicyStore.js b/src/store/modules/Settings/PowerPolicyStore.js
index fc65381..9ee1239 100644
--- a/src/store/modules/Settings/PowerPolicyStore.js
+++ b/src/store/modules/Settings/PowerPolicyStore.js
@@ -29,7 +29,7 @@
}) => {
let powerPoliciesData = PowerRestorePolicyTypes.enum.map(
(powerState) => {
- let desc = `${i18n.t(
+ let desc = `${i18n.global.t(
`pagePowerRestorePolicy.policies.${powerState}`,
)} - ${PowerRestorePolicyTypes.enumDescriptions[powerState]}`;
return {
@@ -57,12 +57,14 @@
.patch(`${await this.dispatch('global/getSystemPath')}`, data)
.then(() => {
dispatch('getPowerRestoreCurrentPolicy');
- return i18n.t('pagePowerRestorePolicy.toast.successSaveSettings');
+ return i18n.global.t(
+ 'pagePowerRestorePolicy.toast.successSaveSettings',
+ );
})
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pagePowerRestorePolicy.toast.errorSaveSettings'),
+ i18n.global.t('pagePowerRestorePolicy.toast.errorSaveSettings'),
);
});
},
diff --git a/src/store/modules/Settings/SnmpAlertsStore.js b/src/store/modules/Settings/SnmpAlertsStore.js
index 0871c8d..0aabf4e 100644
--- a/src/store/modules/Settings/SnmpAlertsStore.js
+++ b/src/store/modules/Settings/SnmpAlertsStore.js
@@ -39,7 +39,9 @@
})
.catch((error) => {
console.log(error);
- const message = i18n.t('pageSnmpAlerts.toast.errorLoadSnmpDetails');
+ const message = i18n.global.t(
+ 'pageSnmpAlerts.toast.errorLoadSnmpDetails',
+ );
throw new Error(message);
});
},
@@ -49,13 +51,13 @@
.delete(`${snmpAlertUrl}/${id}`)
.then(() => dispatch('getSnmpDetails'))
.then(() =>
- i18n.t('pageSnmpAlerts.toast.successDeleteDestination', {
+ i18n.global.t('pageSnmpAlerts.toast.successDeleteDestination', {
id,
}),
)
.catch((error) => {
console.log(error);
- const message = i18n.t(
+ const message = i18n.global.t(
'pageSnmpAlerts.toast.errorDeleteDestination',
{
id,
@@ -84,7 +86,7 @@
let toastMessages = [];
if (successCount) {
- const message = i18n.tc(
+ const message = i18n.global.t(
'pageSnmpAlerts.toast.successBatchDelete',
successCount,
);
@@ -92,7 +94,7 @@
}
if (errorCount) {
- const message = i18n.tc(
+ const message = i18n.global.t(
'pageSnmpAlerts.toast.errorBatchDelete',
errorCount,
);
@@ -108,10 +110,12 @@
return await api
.post(snmpAlertUrl, data)
.then(() => dispatch('getSnmpDetails'))
- .then(() => i18n.t('pageSnmpAlerts.toast.successAddDestination'))
+ .then(() => i18n.global.t('pageSnmpAlerts.toast.successAddDestination'))
.catch((error) => {
console.log(error);
- const message = i18n.t('pageSnmpAlerts.toast.errorAddDestination');
+ const message = i18n.global.t(
+ 'pageSnmpAlerts.toast.errorAddDestination',
+ );
throw new Error(message);
});
},