ui: remove snackbar_bar in instructions load

shellhub-io · Jan 22, 2021 · 9ea8eb6 · 9ea8eb6
1 parent 3e08402
commit 9ea8eb6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -60,7 +60,9 @@
         </v-icon>
       </v-chip>
 
-      <Notification />
+      <Notification
+        :in-a-namespace="hasNamespaces"
+      />
 
       <v-menu
         offset-y

diff --git a/ui/src/components/app_bar/namespace/NamespaceMenu.vue b/ui/src/components/app_bar/namespace/NamespaceMenu.vue
@@ -254,7 +254,7 @@ export default {
         await this.$store.dispatch('namespaces/fetch');
       } catch (e) {
         switch (true) {
-        case (!this.inANamespace): { // dialog pops
+        case (!this.inANamespace && e.response.status === 403): { // dialog pops
           break;
         }
         case (e.response.status === 403): {

diff --git a/ui/src/components/app_bar/notification/Notification.vue b/ui/src/components/app_bar/notification/Notification.vue
@@ -95,6 +95,13 @@ export default {
     DeviceActionButton,
   },
 
+  props: {
+    inANamespace: {
+      type: Boolean,
+      required: true,
+    },
+  },
+
   data() {
     return {
       listNotifications: [],
@@ -128,6 +135,9 @@ export default {
         await this.$store.dispatch('notifications/fetch');
       } catch (e) {
         switch (true) {
+        case (!this.inANamespace && e.response.status === 403): { // dialog pops
+          break;
+        }
         case (e.response.status === 403): {
           this.$store.dispatch('snackbar/showSnackbarErrorAssociation');
           break;

diff --git a/ui/tests/unit/components/app_bar/notification/Notification.spec.js b/ui/tests/unit/components/app_bar/notification/Notification.spec.js
@@ -7,6 +7,7 @@ describe('Notification', () => {
   localVue.use(Vuex);
 
   let wrapper;
+  const inANamespace = false;
 
   const numberNotifications = 2;
   const noNotifications = Array(0);
@@ -86,6 +87,7 @@ describe('Notification', () => {
       store,
       localVue,
       stubs: ['fragment', 'router-link'],
+      propsData: { inANamespace },
     });
   });
 
@@ -106,8 +108,12 @@ describe('Notification', () => {
       store: storeNoNotifications,
       localVue,
       stubs: ['fragment', 'router-link'],
+      propsData: { inANamespace },
     });
     expect(wrapper.find('[data-test="noNotifications"]').exists()).toEqual(true);
     expect(wrapper.find('[data-test="noNotifications"]').text()).toEqual('You don\'t have notifications');
   });
+  it('Receives data in props', () => {
+    expect(wrapper.vm.inANamespace).toEqual(inANamespace);
+  });
 });