From f05eff0ec314012e667b413d0299068c6ebea4c8 Mon Sep 17 00:00:00 2001
From: DhirajM09 <dhirajkumar.mahajan@arista.com>
Date: Tue, 25 Nov 2025 21:35:37 +0530
Subject: [PATCH 1/6] ngfw-15453 Added Google.vue component with get settings
 api integration

---
 .../settings/administration/Google.vue        | 164 ++++++++++++++++++
 .../source/src/layouts/AppDrawer.vue          |   2 +-
 untangle-vue-ui/source/src/router/setting.js  |   9 +
 untangle-vue-ui/source/src/store/settings.js  |  35 ++++
 4 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 untangle-vue-ui/source/src/components/settings/administration/Google.vue

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Google.vue b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
new file mode 100644
index 000000000..69c515a17
--- /dev/null
+++ b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
@@ -0,0 +1,164 @@
+<template>
+  <settings-google
+    :settings="settings"
+    @google-drive-configure="googleDriveConfigure"
+    @google-drive-disconnect="googleDriveDisconnect"
+  >
+    <template #actions="{ newSettings, isDirty, validate }">
+      <u-btn :min-width="null" :disabled="!isDirty" @click="onSaveSettings(newSettings, validate)">{{
+        $t('save')
+      }}</u-btn>
+    </template>
+  </settings-google>
+</template>
+
+<script>
+  import { SettingsGoogle } from 'vuntangle'
+  import Rpc from '@/util/Rpc'
+  export default {
+    components: { SettingsGoogle },
+
+    data() {
+      return {
+        refreshGoogleTask: null,
+      }
+    },
+
+    computed: {
+      /**
+       * Retrieves Google settings from the Vuex store.
+       * @returns {Object} Google settings object.
+       */
+      googleSettings: ({ $store }) => $store.getters['settings/googleSettings'],
+
+      /* Checks if Google Drive is connected from the Vuex store */
+      isGoogleDriveConnected: ({ $store }) => $store.getters['settings/isGoogleDriveConnected'],
+
+      /**
+       * Returns the current Google settings.
+       * @returns {Object} Current Google settings object.
+       */
+      settings({ googleSettings, isGoogleDriveConnected }) {
+        console.log('Google Settings Computed:', isGoogleDriveConnected)
+        return {
+          ...googleSettings,
+          googleDriveIsConfigured: isGoogleDriveConnected,
+        }
+      },
+    },
+
+    /** Fetches initial admin and system settings. */
+    created() {
+      this.$store.dispatch('settings/getGoogleSettings', false)
+      this.$store.dispatch('settings/getIsGoogleDriveConnected')
+      this.buildGoogleRefreshTask()
+    },
+
+    methods: {
+      /**
+       * Retrieves the root directory for Google Drive via the Rpc api call.
+       * @returns {string} Root directory path.
+       */
+      getRootDirectory() {
+        const googleManager = Rpc.directData('rpc.UvmContext.googleManager')
+        const rootDirectory = googleManager.getAppSpecificGoogleDrivePath(null)
+        return rootDirectory
+      },
+
+      /**
+       * Handles Google Drive configuration event.
+       */
+      googleDriveConfigure() {
+        this.refreshGoogleTask.start()
+        window.open(
+          Rpc.directData(
+            'rpc.UvmContext.googleManager.getAuthorizationUrl',
+            window.location.protocol,
+            window.location.host,
+          ),
+        )
+      },
+
+      /**
+       * Handles Google Drive disconnection event.
+       */
+      googleDriveDisconnect() {
+        Rpc.directData('rpc.UvmContext.googleManager.disconnectGoogleDrive')
+        this.refreshGoogleTask.run()
+      },
+
+      /**
+       * Handles saving of new Google settings.
+       * Validates settings and logs the new settings to the console.
+       * @param {Object} newSettings - The new Google settings object.
+       * @param {Function} validate - Validation function for the settings form.
+       */
+      onSaveSettings(newSettings, validate) {
+        console.log('Saving Google Settings:', newSettings, validate)
+      },
+
+      buildGoogleRefreshTask() {
+        if (this.refreshGoogleTask) return
+
+        const me = this
+
+        this.refreshGoogleTask = {
+          updateFrequency: 3000,
+          count: 0,
+          // TODO Max attempts should be 40
+          maxTries: 10,
+          started: false,
+          intervalId: null,
+
+          start() {
+            console.log('Starting Google Refresh Task')
+            this.stop()
+            this.count = 0
+            this.intervalId = setInterval(() => this.run(), this.updateFrequency)
+            this.started = true
+          },
+
+          stop() {
+            console.log('Stopping Google Refresh Task')
+            if (this.intervalId) {
+              clearInterval(this.intervalId)
+              this.intervalId = null
+            }
+            this.started = false
+          },
+
+          run() {
+            this.count++
+            console.log('Running Google Refresh Task, attempt:', this.count)
+            if (this.count > this.maxTries) {
+              this.stop()
+              return
+            }
+
+            try {
+              // Run async RPC calls (native Promise)
+              me.$store.dispatch('settings/getIsGoogleDriveConnected')
+              me.$store.dispatch('settings/getGoogleSettings', true)
+
+              // Stop task when connected
+              const isGoogleDriveConnected = me.$store.getters['settings/isGoogleDriveConnected']
+              if (isGoogleDriveConnected) {
+                this.stop()
+              }
+            } catch (ex) {
+              console.error(ex)
+            }
+          },
+        }
+      },
+
+      /**
+       * Optional hook triggered on browser refresh.
+       * Fetches updated Admin settings and updates the store.
+       */
+      onBrowserRefresh() {
+        console.log('Google Settings Page Refreshed')
+      },
+    },
+  }
+</script>
diff --git a/untangle-vue-ui/source/src/layouts/AppDrawer.vue b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
index a3d297ae8..740450ba6 100644
--- a/untangle-vue-ui/source/src/layouts/AppDrawer.vue
+++ b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
@@ -138,7 +138,7 @@
               { name: 'admin', to: '/settings/administration/admin' },
               { name: 'certificates', to: '' },
               { name: 'snmp', to: '' },
-              { name: 'google', to: '' },
+              { name: 'google', to: '/settings/administration/google' },
             ],
           },
           {
diff --git a/untangle-vue-ui/source/src/router/setting.js b/untangle-vue-ui/source/src/router/setting.js
index 578ca932a..df27ae3c9 100644
--- a/untangle-vue-ui/source/src/router/setting.js
+++ b/untangle-vue-ui/source/src/router/setting.js
@@ -26,6 +26,7 @@ import DenialOfService from '@/components/settings/firewall/DenialOfService.vue'
 // Administration
 import Admin from '@/components/settings/administration/Admin.vue'
 import Logging from '@/components/settings/system/Logging.vue'
+import Google from '@/components/settings/administration/Google.vue'
 export default [
   {
     name: 'settings',
@@ -36,6 +37,10 @@ export default [
         path: 'network',
         redirect: 'network/interfaces',
       },
+      {
+        path: 'administration',
+        redirect: 'administration/admin',
+      },
       {
         path: 'system',
         redirect: 'system/settings',
@@ -116,6 +121,10 @@ export default [
         component: Admin,
         meta: { helpContext: 'administration' },
       },
+      {
+        path: 'administration/google',
+        component: Google,
+      },
       {
         path: 'system/upgrade',
         component: Upgrade,
diff --git a/untangle-vue-ui/source/src/store/settings.js b/untangle-vue-ui/source/src/store/settings.js
index 127eaeb62..c255ca53a 100644
--- a/untangle-vue-ui/source/src/store/settings.js
+++ b/untangle-vue-ui/source/src/store/settings.js
@@ -2,6 +2,7 @@ import { set } from 'vue'
 import { cloneDeep } from 'lodash'
 import Util from '@/util/setupUtil'
 import util from '@/util/util'
+import Rpc from '@/util/Rpc'
 
 const getDefaultState = () => ({
   editCallback: null,
@@ -15,6 +16,8 @@ const getDefaultState = () => ({
   languageSettings: null,
   accessRuleSshEnabled: false,
   adminSetting: null,
+  googleSettings: null,
+  isGoogleDriveConnected: false,
   systemLogs: {}, // system logs stored by logName
 })
 
@@ -41,6 +44,8 @@ const getters = {
   shieldSettings: state => state?.shieldSettings || {},
   accessRuleSshEnabled: state => state.accessRuleSshEnabled,
   adminSetting: state => state.adminSetting || {},
+  googleSettings: state => state.googleSettings || {},
+  isGoogleDriveConnected: state => state.isGoogleDriveConnected || false,
   /**
    * Get logs for a given log.
    * Usage: getters.getLogs('uvm')
@@ -63,6 +68,8 @@ const mutations = {
   SET_LANGUAGE_SETTINGS: (state, value) => set(state, 'languageSettings', value),
   SET_ACCESS_RULE_SSH_ENABLED: (state, value) => set(state, 'accessRuleSshEnabled', value),
   SET_ADMIN_SETTINGS: (state, value) => set(state, 'adminSetting', value),
+  SET_GOOGLE_SETTINGS: (state, value) => set(state, 'googleSettings', value),
+  SET_IS_GOOGLE_DRIVE_CONNECTED: (state, value) => set(state, 'isGoogleDriveConnected', value),
   /**
    * Dynamically set logs for an app
    * Usage: commit('SET_LOGS', { logName: 'uvm', value: data })
@@ -198,6 +205,34 @@ const actions = {
     }
   },
 
+  /* get Google Settings configuration */
+  async getGoogleSettings({ state, commit }, refetch) {
+    try {
+      console.log(state, refetch)
+      if (state.googleSettings && !refetch) {
+        return
+      }
+      const result = Rpc.asyncPromise('rpc.UvmContext.googleManager.getSettings')
+      const data = await result()
+      commit('SET_GOOGLE_SETTINGS', data)
+      return { success: true, message: null, data }
+    } catch (err) {
+      Util.handleException(err)
+    }
+  },
+
+  /* check google drive connection status */
+  async getIsGoogleDriveConnected({ commit }) {
+    try {
+      const result = Rpc.asyncPromise('rpc.UvmContext.googleManager.isGoogleDriveConnected')
+      const isConnected = await result()
+      commit('SET_IS_GOOGLE_DRIVE_CONNECTED', isConnected)
+      return { success: true, message: null, isConnected }
+    } catch (err) {
+      Util.handleException(err)
+    }
+  },
+
   /* setSystemSettings will update system regarding configurations */
   setSystemSettings({ dispatch }, systemSettings) {
     try {

From 6a76bdf0fb5e824b90e15bb863975a1064e53158 Mon Sep 17 00:00:00 2001
From: ShubhamJambhale-arista <shubham.jambhale@arista.com>
Date: Thu, 27 Nov 2025 11:09:15 +0530
Subject: [PATCH 2/6] ngfw-15426 upgrade yarn.lock with 1.60.13 (#292)

---
 untangle-vue-ui/source/yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/untangle-vue-ui/source/yarn.lock b/untangle-vue-ui/source/yarn.lock
index 1571a6d3a..9467a286a 100644
--- a/untangle-vue-ui/source/yarn.lock
+++ b/untangle-vue-ui/source/yarn.lock
@@ -7996,8 +7996,8 @@ vuex@^3.6.2:
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
 vuntangle@untangle/vuntangle:
-  version "1.60.10"
-  resolved "git+ssh://git@github.com/untangle/vuntangle.git#2108d2b8e83949cf05f1f2ac2c7b41648fd694e1"
+  version "1.60.13"
+  resolved "git+ssh://git@github.com/untangle/vuntangle.git#f4d777c62108d010135063773f0d12cf81cfec93"
   dependencies:
     "@ag-grid-community/client-side-row-model" "^25.3.0"
     "@ag-grid-community/core" "^25.3.0"

From 35ad9be2d03116eb451fa0e89147b63501281259 Mon Sep 17 00:00:00 2001
From: DhirajM09 <dhirajkumar.mahajan@arista.com>
Date: Thu, 27 Nov 2025 19:30:17 +0530
Subject: [PATCH 3/6] ngfw-15453 setSettings and Google Picker Integration

---
 .../settings/administration/Google.vue        | 59 +++++++++++--------
 .../source/src/layouts/AppDrawer.vue          | 24 ++++----
 untangle-vue-ui/source/src/store/settings.js  | 25 +++++++-
 3 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Google.vue b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
index 69c515a17..e3ceaa116 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Google.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
@@ -3,11 +3,10 @@
     :settings="settings"
     @google-drive-configure="googleDriveConfigure"
     @google-drive-disconnect="googleDriveDisconnect"
+    @select-directory="selectRootDirectory"
   >
-    <template #actions="{ newSettings, isDirty, validate }">
-      <u-btn :min-width="null" :disabled="!isDirty" @click="onSaveSettings(newSettings, validate)">{{
-        $t('save')
-      }}</u-btn>
+    <template #actions="{ newSettings, isDirty }">
+      <u-btn :min-width="null" :disabled="!isDirty" @click="onSaveSettings(newSettings)">{{ $t('save') }}</u-btn>
     </template>
   </settings-google>
 </template>
@@ -15,6 +14,7 @@
 <script>
   import { SettingsGoogle } from 'vuntangle'
   import Rpc from '@/util/Rpc'
+
   export default {
     components: { SettingsGoogle },
 
@@ -39,7 +39,6 @@
        * @returns {Object} Current Google settings object.
        */
       settings({ googleSettings, isGoogleDriveConnected }) {
-        console.log('Google Settings Computed:', isGoogleDriveConnected)
         return {
           ...googleSettings,
           googleDriveIsConfigured: isGoogleDriveConnected,
@@ -73,8 +72,8 @@
         window.open(
           Rpc.directData(
             'rpc.UvmContext.googleManager.getAuthorizationUrl',
-            window.location.protocol,
-            window.location.host,
+            window.parent.location.protocol,
+            window.parent.location.host,
           ),
         )
       },
@@ -89,12 +88,36 @@
 
       /**
        * Handles saving of new Google settings.
-       * Validates settings and logs the new settings to the console.
        * @param {Object} newSettings - The new Google settings object.
-       * @param {Function} validate - Validation function for the settings form.
        */
-      onSaveSettings(newSettings, validate) {
-        console.log('Saving Google Settings:', newSettings, validate)
+      async onSaveSettings(newSettings) {
+        this.$store.commit('SET_LOADER', true)
+        await this.$store
+          .dispatch('settings/setGoogleSettings', newSettings)
+          .finally(() => this.$store.commit('SET_LOADER', false))
+      },
+
+      async selectRootDirectory(cb) {
+        try {
+          const result = await Rpc.asyncPromise('rpc.UvmContext.googleManager.getGoogleCloudApp')()
+          if (result && result.clientId) {
+            const googlePickerMessageData = {
+              action: 'openPicker',
+              clientId: result.clientId,
+              appId: result.appId,
+              scopes: result.scopes,
+              apiKey: result.apiKey,
+              relayServerUrl: result.relayServerUrl,
+              origin: window.location.protocol + '//' + window.location.host,
+            }
+
+            cb(googlePickerMessageData)
+          } else {
+            console.error('getGoogleCloudApp did not return a client ID')
+          }
+        } catch (ex) {
+          console.error('Error in selectRootDirectory:', ex)
+        }
       },
 
       buildGoogleRefreshTask() {
@@ -105,13 +128,11 @@
         this.refreshGoogleTask = {
           updateFrequency: 3000,
           count: 0,
-          // TODO Max attempts should be 40
-          maxTries: 10,
+          maxTries: 40,
           started: false,
           intervalId: null,
 
           start() {
-            console.log('Starting Google Refresh Task')
             this.stop()
             this.count = 0
             this.intervalId = setInterval(() => this.run(), this.updateFrequency)
@@ -119,7 +140,6 @@
           },
 
           stop() {
-            console.log('Stopping Google Refresh Task')
             if (this.intervalId) {
               clearInterval(this.intervalId)
               this.intervalId = null
@@ -129,7 +149,6 @@
 
           run() {
             this.count++
-            console.log('Running Google Refresh Task, attempt:', this.count)
             if (this.count > this.maxTries) {
               this.stop()
               return
@@ -151,14 +170,6 @@
           },
         }
       },
-
-      /**
-       * Optional hook triggered on browser refresh.
-       * Fetches updated Admin settings and updates the store.
-       */
-      onBrowserRefresh() {
-        console.log('Google Settings Page Refreshed')
-      },
     },
   }
 </script>
diff --git a/untangle-vue-ui/source/src/layouts/AppDrawer.vue b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
index 740450ba6..f1d1f2ccb 100644
--- a/untangle-vue-ui/source/src/layouts/AppDrawer.vue
+++ b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
@@ -129,18 +129,6 @@
               { name: 'troubleshooting', to: '/settings/network/troubleshooting' },
             ],
           },
-          {
-            name: 'administration',
-            icon: 'mdi-account-cog',
-            active: false,
-            match: '/settings/administration',
-            items: [
-              { name: 'admin', to: '/settings/administration/admin' },
-              { name: 'certificates', to: '' },
-              { name: 'snmp', to: '' },
-              { name: 'google', to: '/settings/administration/google' },
-            ],
-          },
           {
             name: 'routing',
             icon: 'mdi-call-split',
@@ -162,6 +150,18 @@
               { name: 'denial_of_service', to: '/settings/firewall/denial-of-service' },
             ],
           },
+          {
+            name: 'administration',
+            icon: 'mdi-account-cog',
+            active: false,
+            match: '/settings/administration',
+            items: [
+              { name: 'admin', to: '/settings/administration/admin' },
+              { name: 'certificates', to: '' },
+              { name: 'snmp', to: '' },
+              { name: 'google', to: '/settings/administration/google' },
+            ],
+          },
           {
             name: 'system',
             icon: 'mdi-cog',
diff --git a/untangle-vue-ui/source/src/store/settings.js b/untangle-vue-ui/source/src/store/settings.js
index c255ca53a..947647495 100644
--- a/untangle-vue-ui/source/src/store/settings.js
+++ b/untangle-vue-ui/source/src/store/settings.js
@@ -208,7 +208,6 @@ const actions = {
   /* get Google Settings configuration */
   async getGoogleSettings({ state, commit }, refetch) {
     try {
-      console.log(state, refetch)
       if (state.googleSettings && !refetch) {
         return
       }
@@ -325,6 +324,30 @@ const actions = {
     }
   },
 
+  /**
+   * Dispatches google settings to the backend via RPC.
+   * @param {object} { dispatch } - Vuex action context for dispatching other actions.
+   * @param {object} googleSettings - The googleSettings settings object to be saved.
+   * @returns {object} An object indicating success status with message
+   */
+  async setGoogleSettings({ dispatch }, googleSettings) {
+    try {
+      const apiMethod = Rpc.asyncPromise('rpc.UvmContext.googleManager.setSettings', googleSettings)
+      const result = await apiMethod()
+      if (result?.code && result?.message) {
+        Util.handleException(result.message)
+        return { success: false, message: result.message.slice(0, 100) }
+      }
+      // fetch updated settings after successful save
+      await dispatch('getGoogleSettings', true)
+      await dispatch('getIsGoogleDriveConnected')
+      return { success: true }
+    } catch (err) {
+      Util.handleException(err)
+      return { success: false, message: err?.toString()?.slice(0, 100) || 'Unknown error' }
+    }
+  },
+
   /**
    * Synchronize the system time using the NTP (Network Time Protocol) service
    */

From 99185d7afd377ba9e310aa5a9699b7683d029538 Mon Sep 17 00:00:00 2001
From: ShubhamJambhale-arista <shubham.jambhale@arista.com>
Date: Fri, 28 Nov 2025 17:07:20 +0530
Subject: [PATCH 4/6] ngfw-15448 ui implemmentation for authority management
 (#294)

* ngfw-15448 ui implemmentation for authority management

* ngfw-15448 settings mixin import changes

* rename settings with commansettings and upgrade with yarn.lock with 1.60.16
---
 .../settings/administration/Admin.vue         |  6 ++-
 .../settings/administration/Certificates.vue  | 39 +++++++++++++++++++
 .../source/src/layouts/AppDrawer.vue          |  2 +-
 untangle-vue-ui/source/src/router/setting.js  |  9 ++++-
 untangle-vue-ui/source/src/store/settings.js  | 21 ++++++++++
 untangle-vue-ui/source/yarn.lock              | 10 ++---
 6 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100644 untangle-vue-ui/source/src/components/settings/administration/Certificates.vue

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Admin.vue b/untangle-vue-ui/source/src/components/settings/administration/Admin.vue
index 0f5b88d0d..4fab25ccb 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Admin.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Admin.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- Main administration component wrapping AdministrationAdmin from vuntangle -->
-  <settings-admin :settings="settings">
+  <settings-admin :settings="commonSettings">
     <template #actions="{ newSettings, isDirty, validate }">
       <u-btn :min-width="null" :disabled="!isDirty" @click="onSaveSettings(newSettings, validate)">{{
         $t('save')
@@ -11,9 +11,11 @@
 
 <script>
   import { SettingsAdmin } from 'vuntangle'
+  import settingsMixin from '../settingsMixin'
 
   export default {
     components: { SettingsAdmin },
+    mixins: [settingsMixin],
 
     computed: {
       /**
@@ -30,7 +32,7 @@
        * Combines admin and system settings into a single object.
        * @returns {Object} Combined settings object.
        */
-      settings() {
+      commonSettings() {
         return { ...this.adminSettings, system: this.systemSettings }
       },
     },
diff --git a/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
new file mode 100644
index 000000000..695e1b2bb
--- /dev/null
+++ b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
@@ -0,0 +1,39 @@
+<template>
+  <settings-certificates :certificates-information="certificatesInformation" />
+</template>
+
+<script>
+  import { SettingsCertificates } from 'vuntangle'
+  import settingsMixin from '../settingsMixin'
+
+  export default {
+    components: { SettingsCertificates },
+    mixins: [settingsMixin],
+
+    computed: {
+      /**
+       * Retrieves certificates information from the Vuex store.
+       * @returns {Object} Certificates information object.
+       */
+      certificatesInformation: ({ $store }) => $store.getters['settings/certificatesInformation'],
+    },
+
+    created() {
+      this.loadCertificates(false)
+    },
+
+    methods: {
+      /**
+       * Loads certificate information from the store.
+       * @param {boolean} refetch - Whether to refetch the data from the server.
+       */
+      async loadCertificates(refetch) {
+        await this.$store.dispatch('settings/getCertificatesInformation', refetch)
+      },
+
+      onBrowserRefresh() {
+        this.loadCertificates(true)
+      },
+    },
+  }
+</script>
diff --git a/untangle-vue-ui/source/src/layouts/AppDrawer.vue b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
index a3d297ae8..f03426cf6 100644
--- a/untangle-vue-ui/source/src/layouts/AppDrawer.vue
+++ b/untangle-vue-ui/source/src/layouts/AppDrawer.vue
@@ -136,7 +136,7 @@
             match: '/settings/administration',
             items: [
               { name: 'admin', to: '/settings/administration/admin' },
-              { name: 'certificates', to: '' },
+              { name: 'certificates', to: '/settings/administration/certificates' },
               { name: 'snmp', to: '' },
               { name: 'google', to: '' },
             ],
diff --git a/untangle-vue-ui/source/src/router/setting.js b/untangle-vue-ui/source/src/router/setting.js
index 578ca932a..dc5ccab04 100644
--- a/untangle-vue-ui/source/src/router/setting.js
+++ b/untangle-vue-ui/source/src/router/setting.js
@@ -22,10 +22,12 @@ import Upgrade from '@/components/settings/system/Upgrade'
 import RulesList from '@/components/settings/rules/RulesList.vue'
 import Troubleshooting from '@/components/settings/network/Troubleshooting.vue'
 import DenialOfService from '@/components/settings/firewall/DenialOfService.vue'
+import Logging from '@/components/settings/system/Logging.vue'
 
 // Administration
 import Admin from '@/components/settings/administration/Admin.vue'
-import Logging from '@/components/settings/system/Logging.vue'
+import Certificates from '@/components/settings/administration/Certificates.vue'
+
 export default [
   {
     name: 'settings',
@@ -116,6 +118,11 @@ export default [
         component: Admin,
         meta: { helpContext: 'administration' },
       },
+      {
+        path: 'administration/certificates',
+        component: Certificates,
+        meta: { helpContext: 'certificates' },
+      },
       {
         path: 'system/upgrade',
         component: Upgrade,
diff --git a/untangle-vue-ui/source/src/store/settings.js b/untangle-vue-ui/source/src/store/settings.js
index 127eaeb62..04070d808 100644
--- a/untangle-vue-ui/source/src/store/settings.js
+++ b/untangle-vue-ui/source/src/store/settings.js
@@ -16,6 +16,7 @@ const getDefaultState = () => ({
   accessRuleSshEnabled: false,
   adminSetting: null,
   systemLogs: {}, // system logs stored by logName
+  certificatesInformation: null,
 })
 
 const getters = {
@@ -46,6 +47,9 @@ const getters = {
    * Usage: getters.getLogs('uvm')
    */
   getLogsByName: state => logName => state.systemLogs[logName] || null,
+
+  /* Retrieves the certificates information from the state. */
+  certificatesInformation: state => state.certificatesInformation || {},
 }
 
 const mutations = {
@@ -73,6 +77,7 @@ const mutations = {
     }
     set(state.systemLogs, logName, value)
   },
+  SET_CERTIFICATES_INFORMATION: (state, value) => set(state, 'certificatesInformation', value),
 }
 
 const actions = {
@@ -350,6 +355,22 @@ const actions = {
     }
   },
 
+  /* Get Certificate  */
+
+  async getCertificatesInformation({ state, commit }, refetch) {
+    if (state.certificatesInformation && !refetch) {
+      return
+    }
+    try {
+      const data = await window.rpc.UvmContext.certificateManager().getRootCertificateInformation()
+      commit('SET_CERTIFICATES_INFORMATION', data)
+      return { success: true, data }
+    } catch (err) {
+      Util.handleException(err)
+      return { success: false, message: err?.toString()?.slice(0, 100) || 'Unknown error' }
+    }
+  },
+
   /** update all interfaces */
   async setInterfaces({ state, dispatch }, interfaces) {
     const networkSettings = cloneDeep(state.networkSetting)
diff --git a/untangle-vue-ui/source/yarn.lock b/untangle-vue-ui/source/yarn.lock
index 9467a286a..e1d8b9014 100644
--- a/untangle-vue-ui/source/yarn.lock
+++ b/untangle-vue-ui/source/yarn.lock
@@ -3475,9 +3475,9 @@ electron-to-chromium@^1.5.173:
   integrity sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==
 
 electron-to-chromium@^1.5.249:
-  version "1.5.260"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.260.tgz#73f555d3e9b9fd16ff48fc406bbad84efa9b86c7"
-  integrity sha512-ov8rBoOBhVawpzdre+Cmz4FB+y66Eqrk6Gwqd8NGxuhv99GQ8XqMAr351KEkOt7gukXWDg6gJWEMKgL2RLMPtA==
+  version "1.5.262"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.262.tgz#c31eed591c6628908451c9ca0f0758ed514aa003"
+  integrity sha512-NlAsMteRHek05jRUxUR0a5jpjYq9ykk6+kO0yRaMi5moe7u0fVIOeQ3Y30A8dIiWFBNUoQGi1ljb1i5VtS9WQQ==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -7996,8 +7996,8 @@ vuex@^3.6.2:
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
 vuntangle@untangle/vuntangle:
-  version "1.60.13"
-  resolved "git+ssh://git@github.com/untangle/vuntangle.git#f4d777c62108d010135063773f0d12cf81cfec93"
+  version "1.60.16"
+  resolved "git+ssh://git@github.com/untangle/vuntangle.git#bbe885fadd5f958ed46d26bc5eddb3d1db01c3a1"
   dependencies:
     "@ag-grid-community/client-side-row-model" "^25.3.0"
     "@ag-grid-community/core" "^25.3.0"

From ecd9c53871144304a590f0ff2b6901c7ac0b8cdd Mon Sep 17 00:00:00 2001
From: DhirajM09 <dhirajkumar.mahajan@arista.com>
Date: Fri, 28 Nov 2025 18:59:46 +0530
Subject: [PATCH 5/6] ngfw-15453 Removed console logs

---
 .../settings/administration/Google.vue           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Google.vue b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
index e3ceaa116..fa1e23cd8 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Google.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
@@ -14,6 +14,7 @@
 <script>
   import { SettingsGoogle } from 'vuntangle'
   import Rpc from '@/util/Rpc'
+  import Util from '@/util/setupUtil'
 
   export default {
     components: { SettingsGoogle },
@@ -97,6 +98,11 @@
           .finally(() => this.$store.commit('SET_LOADER', false))
       },
 
+      /**
+       * handler for select root directory
+       * Gets google cloud app details from back-end
+       * opens google picker iframe in callback implementation
+       */
       async selectRootDirectory(cb) {
         try {
           const result = await Rpc.asyncPromise('rpc.UvmContext.googleManager.getGoogleCloudApp')()
@@ -113,13 +119,16 @@
 
             cb(googlePickerMessageData)
           } else {
-            console.error('getGoogleCloudApp did not return a client ID')
+            this.$vuntangle.toast.add(this.$t('an_error_occurred'), 'error')
           }
         } catch (ex) {
-          console.error('Error in selectRootDirectory:', ex)
+          Util.handleException(ex)
         }
       },
 
+      /**
+       * Builds a refresh task to get the google drive configuration status and google settings
+       */
       buildGoogleRefreshTask() {
         if (this.refreshGoogleTask) return
 
@@ -155,7 +164,6 @@
             }
 
             try {
-              // Run async RPC calls (native Promise)
               me.$store.dispatch('settings/getIsGoogleDriveConnected')
               me.$store.dispatch('settings/getGoogleSettings', true)
 
@@ -165,7 +173,7 @@
                 this.stop()
               }
             } catch (ex) {
-              console.error(ex)
+              this.$vuntangle.toast.add(this.$t('an_error_occurred') + ex.message, 'error')
             }
           },
         }

From 2398f59597923ab6b6a540f1bc5db749a41e828a Mon Sep 17 00:00:00 2001
From: DhirajM09 <dhirajkumar.mahajan@arista.com>
Date: Mon, 1 Dec 2025 14:52:51 +0530
Subject: [PATCH 6/6] ngfw-15453 updated yarn.lock file

---
 untangle-vue-ui/source/yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/untangle-vue-ui/source/yarn.lock b/untangle-vue-ui/source/yarn.lock
index e1d8b9014..3e142ebaa 100644
--- a/untangle-vue-ui/source/yarn.lock
+++ b/untangle-vue-ui/source/yarn.lock
@@ -2501,9 +2501,9 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 baseline-browser-mapping@^2.8.25:
-  version "2.8.31"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.31.tgz#16c0f1814638257932e0486dbfdbb3348d0a5710"
-  integrity sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==
+  version "2.8.32"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.32.tgz#5de72358cf363ac41e7d642af239f6ac5ed1270a"
+  integrity sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==
 
 batch-processor@1.0.0:
   version "1.0.0"
@@ -7996,8 +7996,8 @@ vuex@^3.6.2:
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
 vuntangle@untangle/vuntangle:
-  version "1.60.16"
-  resolved "git+ssh://git@github.com/untangle/vuntangle.git#bbe885fadd5f958ed46d26bc5eddb3d1db01c3a1"
+  version "1.60.17"
+  resolved "git+ssh://git@github.com/untangle/vuntangle.git#1292b74e4b1f88dfcd3860e483bcdaf5fb7f16d3"
   dependencies:
     "@ag-grid-community/client-side-row-model" "^25.3.0"
     "@ag-grid-community/core" "^25.3.0"