Merge staged 17.6 features fixes into master

untangle-vue-ui/source/src/components/settings/advanced/Advanced.vue

@@ -38,12 +38,12 @@
 
     computed: {
       /* network settings from the store */
-      networkSettings: ({ $store }) => $store.getters['settings/networkSetting'],
+      networkSettings: ({ $store }) => $store.getters['config/networkSetting'],
       /* Gets the expert mode status from the settings store */
-      isExpertMode: ({ $store }) => $store.getters['settings/isExpertMode'],
+      isExpertMode: ({ $store }) => $store.getters['config/isExpertMode'],
 
       /* Get list of interfaces from the settings store */
-      interfaces: ({ $store }) => $store.getters['settings/interfaces'],
+      interfaces: ({ $store }) => $store.getters['config/interfaces'],
       /**
        * returns the interfaces for condition value from network settings
        * @param {Object} vm.networkSettings
@@ -64,7 +64,7 @@
        * @param {boolean} refetch - Whether to force a re-fetch of the settings.
        */
       async fetchSettings(refetch) {
-        await this.$store.dispatch('settings/getNetworkSettings', refetch)
+        await this.$store.dispatch('config/getNetworkSettings', refetch)
       },
 
       /**
@@ -77,7 +77,7 @@
         if (!isValid) return
 
         this.$store.commit('SET_LOADER', true)
-        await Promise.all([this.$store.dispatch('settings/setNetworkSettingV2', advancedSettings)]).finally(() => {
+        await Promise.all([this.$store.dispatch('config/setNetworkSettingV2', advancedSettings)]).finally(() => {
           this.$store.commit('SET_LOADER', false)
         })
       },

untangle-vue-ui/source/src/components/settings/firewall/DenialOfService.vue

@@ -39,10 +39,10 @@
 
     computed: {
       // the shield settings from store
-      shieldSettings: ({ $store }) => $store.getters['settings/shieldSettings'],
+      shieldSettings: ({ $store }) => $store.getters['config/shieldSettings'],
 
       // the network settings from the store
-      networkSettings: ({ $store }) => $store.getters['settings/networkSetting'],
+      networkSettings: ({ $store }) => $store.getters['config/networkSetting'],
 
       /**
        * eturns the interfaces for condition value from network settings
@@ -68,7 +68,7 @@
 
         this.$store.commit('SET_LOADER', true)
         await store
-          .dispatch('settings/setShieldSettings', newSettings)
+          .dispatch('config/setShieldSettings', newSettings)
           .finally(() => this.$store.commit('SET_LOADER', false))
       },
 
@@ -88,8 +88,8 @@
         this.$store.commit('SET_LOADER', true)
         try {
           await Promise.all([
-            this.$store.dispatch('settings/getShieldSettings', shieldRefetch),
-            this.$store.dispatch('settings/getNetworkSettings', networkRefetch),
+            this.$store.dispatch('config/getShieldSettings', shieldRefetch),
+            this.$store.dispatch('config/getNetworkSettings', networkRefetch),
           ])
         } finally {
           this.$store.commit('SET_LOADER', false)

untangle-vue-ui/source/src/components/settings/interface/DeleteInterfaceDialog.vue

@@ -29,7 +29,7 @@
          *deleteInterface will handle for remove selected interface from all the interfaces
          * Updated Interfaces will be passed to the Network Setting
          */
-        const response = await this.$store.dispatch('settings/deleteInterface', this.intf)
+        const response = await this.$store.dispatch('config/deleteInterface', this.intf)
         if (response) {
           this.$vuntangle.toast.add(this.$t('deleted_successfully', [this.$t('interface')]))
           // notify consumer of success

untangle-vue-ui/source/src/components/settings/interface/Ipv4Aliases.vue

@@ -90,7 +90,7 @@
        */
       validateUniqueIpAddress(value) {
         // check aliases from other network interfaces
-        for (const networkInterface of this.$store.getters['settings/interfaces']) {
+        for (const networkInterface of this.$store.getters['config/interfaces']) {
           // ignore current interface, those will be checked from the current editable data
           if (networkInterface.interfaceId === this.interfaceId) {
             continue

untangle-vue-ui/source/src/components/settings/network/Dhcp.vue

@@ -25,7 +25,7 @@
     },
 
     computed: {
-      dhcpSettings: ({ $store }) => $store.getters['settings/networkSetting'],
+      dhcpSettings: ({ $store }) => $store.getters['config/networkSetting'],
     },
 
     created() {
@@ -40,7 +40,7 @@
        * @param {boolean} refetch - Whether to force a re-fetch of the settings.
        */
       async fetchSettings(refetch) {
-        await this.$store.dispatch('settings/getNetworkSettings', refetch)
+        await this.$store.dispatch('config/getNetworkSettings', refetch)
       },
 
       /**
@@ -92,7 +92,7 @@
         const isValid = await validate()
         if (!isValid) return
         this.$store.commit('SET_LOADER', true)
-        await Promise.all([this.$store.dispatch('settings/setNetworkSettingV2', newDhcpSettings)]).finally(() => {
+        await Promise.all([this.$store.dispatch('config/setNetworkSettingV2', newDhcpSettings)]).finally(() => {
           this.$store.commit('SET_LOADER', false)
         })
       },

untangle-vue-ui/source/src/components/settings/network/Dns.vue

@@ -28,9 +28,9 @@
        * @property {Array} dnsSettings.localServers - List of local DNS servers.
        * @property {Array} dnsSettings.staticEntries - List of static DNS entries.
        */
-      dnsSettings: ({ $store }) => $store.getters['settings/dnsSettings'],
+      dnsSettings: ({ $store }) => $store.getters['config/dnsSettings'],
       // the network settings from the store
-      networkSettings: ({ $store }) => $store.getters['settings/networkSetting'],
+      networkSettings: ({ $store }) => $store.getters['config/networkSetting'],
     },
 
     created() {
@@ -43,14 +43,14 @@
        * @param {boolean} refetch - Whether to force a re-fetch of the settings.
        */
       async fetchSettings(refetch) {
-        await this.$store.dispatch('settings/getNetworkSettings', refetch)
+        await this.$store.dispatch('config/getNetworkSettings', refetch)
       },
 
       async onSaveSettings(newDnsSettings) {
         this.$store.commit('SET_LOADER', true)
         const networkSettingsCopy = cloneDeep(this.networkSettings)
         networkSettingsCopy.dnsSettings = newDnsSettings
-        await Promise.all([this.$store.dispatch('settings/setNetworkSettingV2', networkSettingsCopy)]).finally(() => {
+        await Promise.all([this.$store.dispatch('config/setNetworkSettingV2', networkSettingsCopy)]).finally(() => {
           this.$store.commit('SET_LOADER', false)
         })
       },

untangle-vue-ui/source/src/components/settings/network/Interface.vue

@@ -39,12 +39,12 @@
     computed: {
       // interfaces filered and grouped (by category)
       interfaces({ $store }) {
-        return $store.getters['settings/networkSetting'].interfaces || []
+        return $store.getters['config/networkSetting'].interfaces || []
       },
     },
 
     created() {
-      this.$store.dispatch('settings/getNetworkSettings')
+      this.$store.dispatch('config/getNetworkSettings')
     },
 
     mounted() {
@@ -132,7 +132,7 @@
       async setRemappedInterfaces(interfaces) {
         this.$store.commit('SET_LOADER', true)
         const response = await this.$store
-          .dispatch('settings/setInterfaces', interfaces)
+          .dispatch('config/setInterfaces', interfaces)
           .finally(() => this.$store.commit('SET_LOADER', false))
         if (response?.success) {
           this.$vuntangle.toast.add(this.$t('interfaces_remapped_successfully'))
@@ -144,7 +144,7 @@
 
       async onRefresh() {
         this.$store.commit('SET_LOADER', true)
-        await this.$store.dispatch('settings/getInterfaces').finally(() => this.$store.commit('SET_LOADER', false))
+        await this.$store.dispatch('config/getInterfaces').finally(() => this.$store.commit('SET_LOADER', false))
         this.getInterfacesStatus()
       },
 
@@ -197,7 +197,7 @@
        * Fetches updated network settings and updates the store.
        */
       onBrowserRefresh() {
-        this.$store.dispatch('settings/getNetworkSettings', true)
+        this.$store.dispatch('config/getNetworkSettings', true)
       },
     },
   }

untangle-vue-ui/source/src/components/settings/network/InterfaceEdit.vue

@@ -48,7 +48,7 @@
     computed: {
       device: ({ $route }) => $route.params.device,
       type: ({ $route }) => $route.params.type,
-      interfaces: ({ $store }) => $store.getters['settings/interfaces'],
+      interfaces: ({ $store }) => $store.getters['config/interfaces'],
       intfSetting: ({ interfaces, device }) => interfaces.find(intf => intf.device === device),
     },
     async mounted() {
@@ -141,7 +141,7 @@
           this.$store.commit('SET_LOADER', true)
           this.isSaving = true
           // Save interface settings by updating the current/new interface- newSettings
-          const resultIntf = await this.$store.dispatch('settings/setInterfaces', [newSettings])
+          const resultIntf = await this.$store.dispatch('config/setInterfaces', [newSettings])
           if (resultIntf?.success) {
             this.$vuntangle.toast.add(this.$t('network_settings_saved_successfully'))
           } else {

untangle-vue-ui/source/src/components/settings/network/SettingsInterface/index.vue

@@ -60,7 +60,7 @@
     },
     computed: {
       device: ({ $route }) => $route.params.device,
-      // interfaceStatuses: ({ $store }) => $store.getters['settings/interfaceStatuses'],
+      // interfaceStatuses: ({ $store }) => $store.getters['config/interfaceStatuses'],
       title() {
         if (!this.device && this.type === 'VLAN') {
           return this.$t('add_x_interface', [this.$t('vlan')])

untangle-vue-ui/source/src/components/settings/network/Troubleshooting.vue

@@ -23,10 +23,10 @@
 
     computed: {
       // uri settings from store
-      uriSettings: ({ $store }) => $store.getters['settings/uriSettings'],
+      uriSettings: ({ $store }) => $store.getters['config/uriSettings'],
 
       // network settings from the store
-      networkSettings: ({ $store }) => $store.getters['settings/networkSetting'],
+      networkSettings: ({ $store }) => $store.getters['config/networkSetting'],
 
       // dns test host from uri settings for Connectivity test
       dnsTestHost: ({ uriSettings }) => uriSettings?.dnsTestHost,
@@ -46,8 +46,8 @@
     },
 
     created() {
-      this.$store.dispatch('settings/getUriSettings', false)
-      this.$store.dispatch('settings/getNetworkSettings', false)
+      this.$store.dispatch('config/getUriSettings', false)
+      this.$store.dispatch('config/getNetworkSettings', false)
     },
 
     methods: {
@@ -144,7 +144,7 @@
        * Optional hook triggered on browser refresh. refetches the settings.
        */
       onBrowserRefresh() {
-        this.$store.dispatch('settings/getNetworkSettings', true)
+        this.$store.dispatch('config/getNetworkSettings', true)
       },
     },
   }

untangle-vue-ui/source/src/components/settings/network/interfaceMixin.js

@@ -16,7 +16,7 @@ export default {
       // Still added this check to prevent accidental deletion
       if (intf.type === 'NIC' || intf.type === 'WIFI') return
 
-      const interfacesCopy = cloneDeep(this.$store.getters['settings/interfaces'])
+      const interfacesCopy = cloneDeep(this.$store.getters['config/interfaces'])
       const affectedInterfaces = this.getAffectedBridgedInterfaces(intf, interfacesCopy)
       if (affectedInterfaces.length) {
         this.$vuntangle.dialog.show({

untangle-vue-ui/source/src/components/settings/routing/DynamicRoutes.vue

@@ -34,8 +34,8 @@
     },
 
     computed: {
-      networkSettings: ({ $store }) => $store.getters['settings/networkSetting'],
-      dynamicRoutingSettings: ({ $store }) => $store.getters['settings/dynamicRoutingSettings'],
+      networkSettings: ({ $store }) => $store.getters['config/networkSetting'],
+      dynamicRoutingSettings: ({ $store }) => $store.getters['config/dynamicRoutingSettings'],
     },
 
     created() {
@@ -45,7 +45,7 @@
 
     methods: {
       async fetchNetworkSettings(refetch) {
-        await this.$store.dispatch('settings/getNetworkSettings', refetch)
+        await this.$store.dispatch('config/getNetworkSettings', refetch)
       },
 
       /** fetch Dynamic Routing Status */
@@ -238,7 +238,7 @@
         try {
           const networkdynamicRoutingSettings = cloneDeep(this.networkSettings)
           networkdynamicRoutingSettings.dynamicRoutingSettings = updatedSettings
-          await this.$store.dispatch('settings/setNetworkSettingV2', networkdynamicRoutingSettings)
+          await this.$store.dispatch('config/setNetworkSettingV2', networkdynamicRoutingSettings)
           await this.getDynamicRoutingOverview()
         } catch (ex) {
           Util.handleException(ex)