Merge branch 'master' into new_deployment_stage2

admin/src/plugins/apolloProvider.js

@@ -2,7 +2,6 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
 import VueApollo from 'vue-apollo'
 import CONFIG from '../config'
 import store from '../store/store'
-import router from '../router/router'
 import i18n from '../i18n'
 
 const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
@@ -18,7 +17,7 @@ const authLink = new ApolloLink((operation, forward) => {
     if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
       response.errors[0].message = i18n.t('error.session-expired')
       store.dispatch('logout', null)
-      if (router.currentRoute.path !== '/logout') router.push('/logout')
+      window.location.assign(CONFIG.WALLET_URL)
       return response
     }
     const newToken = operation.getContext().response.headers.get('token')

admin/src/plugins/apolloProvider.test.js

@@ -4,12 +4,10 @@ import CONFIG from '../config'
 
 import VueApollo from 'vue-apollo'
 import store from '../store/store'
-import router from '../router/router'
 import i18n from '../i18n'
 
 jest.mock('vue-apollo')
 jest.mock('../store/store')
-jest.mock('../router/router')
 jest.mock('../i18n')
 
 jest.mock('apollo-boost', () => {
@@ -59,13 +57,11 @@ describe('apolloProvider', () => {
       errors: [{ message: '403.13 - Client certificate revoked' }],
     }
 
-    // mock router
-    const routerPushMock = jest.fn()
-    router.push = routerPushMock
-    router.currentRoute = {
-      path: '/overview',
+    const windowLocationMock = jest.fn()
+    delete window.location
+    window.location = {
+      assign: windowLocationMock,
     }
-
     // mock context
     const setContextMock = jest.fn()
     const getContextMock = jest.fn(() => {
@@ -128,21 +124,8 @@ describe('apolloProvider', () => {
         expect(storeDispatchMock).toBeCalledWith('logout', null)
       })
 
-      describe('current route is not logout', () => {
-        it('redirects to logout', () => {
-          expect(routerPushMock).toBeCalledWith('/logout')
-        })
-      })
-
-      describe('current route is logout', () => {
-        beforeEach(() => {
-          jest.clearAllMocks()
-          router.currentRoute.path = '/logout'
-        })
-
-        it('does not redirect to logout', () => {
-          expect(routerPushMock).not.toBeCalled()
-        })
+      it('redirects to logout', () => {
+        expect(windowLocationMock).toBeCalledWith('http://localhost/login')
       })
     })
 

frontend/src/views/Layout/DashboardLayout_gdd.vue

@@ -100,6 +100,7 @@ export default {
         })
         .catch((error) => {
           this.pending = true
+          this.transactionCount = -1
           this.$toasted.global.error(error.message)
           // what to do when loading balance fails?
         })

frontend/src/views/Pages/AccountOverview.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="container-fluid">
       <b-row>
         <b-col class="col-6">
           <b-row>

frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js

@@ -56,16 +56,20 @@ describe('GddTransactionList', () => {
         })
       })
       it('Transactions Array is empty, 0 transactions', () => {
-        expect(wrapper.find('div.test-empty-transactionlist').text()).toContain(
-          'error.empty-transactionlist',
-        )
+        expect(wrapper.find('div.test-empty-transactionlist').exists()).toBe(false)
       })
     })
 
     describe('without any properties', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          transactions: [],
+          transactionCount: -1,
+        })
+      })
       it('renders text saying that there are error.empty-transactionlist ', () => {
         expect(wrapper.find('div.gdd-transaction-list').text()).toContain(
-          'error.empty-transactionlist',
+          'transaction.nullTransactions',
         )
       })
       it('renders text saying that there are no transaction.nullTransactions', () => {

frontend/src/views/Pages/AccountOverview/GddTransactionList.vue

@@ -7,7 +7,7 @@
           {{ $t('error.no-transactionlist') }}
         </small>
       </div>
-      <div v-if="!transactionCount" class="test-empty-transactionlist text-right">
+      <div v-if="transactionCount < 0" class="test-empty-transactionlist text-right">
         <b-icon icon="exclamation-triangle" class="mr-2" style="color: red"></b-icon>
         <small>{{ $t('error.empty-transactionlist') }}</small>
       </div>
@@ -134,7 +134,7 @@
         :per-page="pageSize"
         :total-rows="transactionCount"
       ></pagination-buttons>
-      <div v-if="transactionCount === 0" class="mt-4 text-center">
+      <div v-if="transactionCount < 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </div>

frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue

@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showUserData ? (showUserData = !showUserData) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showUserData ? (showUserData = !showUserData) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.name.change-name') }}</span>
             <b-icon v-if="showUserData" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -130,4 +133,8 @@ export default {
   },
 }
 </script>
-<style></style>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>

frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue

@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showPassword ? (showPassword = !showPassword) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showPassword ? (showPassword = !showPassword) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.password.change-password') }}</span>
             <b-icon v-if="showPassword" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -91,3 +94,8 @@ export default {
   },
 }
 </script>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>

frontend/src/views/Pages/UserProfile/UserCard_Language.vue

@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.language.changeLanguage') }}</span>
             <b-icon v-if="showLanguage" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -110,3 +113,8 @@ export default {
   },
 }
 </script>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>