Remove banner related changes

Author: vishesh92

ui/public/config.json

@@ -8,8 +8,6 @@
     }
   ],
   "docBase": "http://docs.cloudstack.apache.org/en/latest",
-  "alertMessage": "",
-  "alertMessageType": "info",
   "appTitle": "CloudStack",
   "footer": "Licensed under the <a href='http://www.apache.org/licenses/' target='_blank'>Apache License</a>, Version 2.0.",
   "loginTitle": "CloudStack",

ui/src/components/page/GlobalLayout.vue

@@ -17,31 +17,11 @@
 
 <template>
   <div>
-    <a-affix v-if="alertCount > 0" >
-      <a-alert
-        v-if="this.$config.alertMessage && this.$config.alertMessage !== ''"
-        :type="this.$config.alertMessageType ? this.$config.alertMessageType : 'info'"
-        :showIcon="false"
-        banner
-        class="alertHeader"
-        closable
-        @close="closeCustomAlert()">
-        <template #message>
-          <span v-html="$config.alertMessage"></span>
-        </template>
-        </a-alert>
-
-      <a-alert
-        v-if="this.$store.getters.shutdownTriggered"
-        :message="$t('message.shutdown.triggered')"
-        type="error"
-        banner
-        :showIcon="false"
-        class="alertHeader" />
-
+    <a-affix v-if="this.$store.getters.shutdownTriggered" >
+      <a-alert :message="$t('message.shutdown.triggered')" type="error" banner :showIcon="false" class="shutdownHeader" />
     </a-affix>
     <a-layout class="layout" :class="[device]">
-      <a-affix style="z-index: 200" :offsetTop="alertCount * 25">
+      <a-affix style="z-index: 200" :offsetTop="this.$store.getters.shutdownTriggered ? 25 : 0">
         <template v-if="isSideMenu()">
           <a-drawer
             v-if="isMobile()"
@@ -104,7 +84,7 @@
         <!-- layout header -->
         <a-affix style="z-index: 100">
           <global-header
-            :style="'margin-top: ' + alertCount * 25 + 'px;'"
+            :style="this.$store.getters.shutdownTriggered ? 'margin-top: 25px;' : null"
             :mode="layoutMode"
             :menus="menus"
             :theme="navTheme"
@@ -164,8 +144,7 @@ export default {
       collapsed: false,
       menus: [],
       showSetting: false,
-      showClear: false,
-      alertCount: 0
+      showClear: false
     }
   },
   computed: {
@@ -224,7 +203,6 @@ export default {
       const readyForShutdownPollingJob = setInterval(this.checkShutdown, 5000)
       this.$store.commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', readyForShutdownPollingJob)
     }
-    this.getNumberOfAlerts()
   },
   mounted () {
     const layoutMode = this.$config.theme['@layout-mode'] || 'light'
@@ -282,20 +260,6 @@ export default {
       api('readyForShutdown', {}).then(json => {
         this.$store.dispatch('SetShutdownTriggered', json.readyforshutdownresponse.readyforshutdown.shutdowntriggered || false)
       })
-    },
-    getNumberOfAlerts () {
-      this.alertCount = 0
-      if (this.$store.getters.shutdownTriggered) {
-        this.alertCount++
-      }
-      if (this.$config.alertMessage && this.$config.alertMessage !== '') {
-        this.alertCount++
-      }
-      return this.alertCount
-    },
-    closeCustomAlert () {
-      this.$config.alertMessage = ''
-      this.alertCount--
     }
   }
 }
@@ -343,7 +307,7 @@ export default {
   }
 }
 
-.alertHeader {
+.shutdownHeader {
   font-weight: bold;
   height: 25px;
   text-align: center;

ui/src/store/getters.js

@@ -32,6 +32,8 @@ const getters = {
   addRouters: state => state.permission.addRouters,
   multiTab: state => state.app.multiTab,
   listAllProjects: state => state.app.listAllProjects,
+  bannerCount: state => state.user.bannerCount,
+  customBanner: state => state.user.customBanner,
   headerNotices: state => state.user.headerNotices,
   isLdapEnabled: state => state.user.isLdapEnabled,
   cloudian: state => state.user.cloudian,

ui/src/store/modules/user.js

@@ -72,7 +72,12 @@ const user = {
     twoFaProvider: '',
     twoFaIssuer: '',
     customHypervisorName: 'Custom',
-    readyForShutdownPollingJob: ''
+    readyForShutdownPollingJob: '',
+    customBanner: {
+      message: '',
+      type: 'info',
+      closed: false
+    }
   },
 
   mutations: {
@@ -224,6 +229,7 @@ const user = {
           commit('SET_LOGIN_FLAG', false)
           const latestVersion = vueProps.$localStorage.get(LATEST_CS_VERSION, { version: '', fetchedTs: 0 })
           commit('SET_LATEST_VERSION', latestVersion)
+          console.log(vueProps.$config.alertMessage)
           notification.destroy()
 
           resolve()
@@ -271,6 +277,8 @@ const user = {
           commit('SET_2FA_PROVIDER', result.providerfor2fa)
           commit('SET_2FA_ISSUER', result.issuerfor2fa)
           commit('SET_LOGIN_FLAG', false)
+          const latestVersion = vueProps.$localStorage.get(LATEST_CS_VERSION, { version: '', fetchedTs: 0 })
+          commit('SET_LATEST_VERSION', latestVersion)
           notification.destroy()
 
           resolve()
@@ -411,6 +419,8 @@ const user = {
           commit('SET_CLOUDIAN', cloudian)
         }).catch(ignored => {
         })
+      }).catch(error => {
+        console.error(error)
       })
     },
 

ui/src/views/AutogenView.vue

@@ -17,7 +17,7 @@
 
 <template>
   <div>
-    <a-affix :offsetTop="78 + (getNumberOfAlerts() * 25)">
+    <a-affix :offsetTop="this.$store.getters.shutdownTriggered ? 103 : 78">
       <a-card class="breadcrumb-card" style="z-index: 10">
         <a-row>
           <a-col :span="device === 'mobile' ? 24 : 12" style="padding-left: 12px; margin-top: 10px">
@@ -396,7 +396,8 @@
         <br />
       </a-modal>
     </div>
-    <div :style="getNumberOfAlerts() > 0 ? 'margin-top: ' + getNumberOfAlerts() * 25 + 'px; margin-bottom: 12px' : null">
+
+    <div :style="this.$store.getters.shutdownTriggered ? 'margin-top: 24px; margin-bottom: 12px' : null">
       <div v-if="dataView">
         <slot name="resource" v-if="$route.path.startsWith('/quotasummary') || $route.path.startsWith('/publicip')"></slot>
         <resource-view
@@ -700,16 +701,6 @@ export default {
     }
   },
   methods: {
-    getNumberOfAlerts () {
-      let count = 0
-      if (this.$store.getters.shutdownTriggered) {
-        count++
-      }
-      if (this.$config.alertMessage && this.$config.alertMessage !== '') {
-        count++
-      }
-      return count
-    },
     getStyle () {
       if (['snapshot', 'vmsnapshot', 'publicip'].includes(this.$route.name)) {
         return 'table-cell'