From d3dcb671e85af2c3f290531d31deae16a30c046a Mon Sep 17 00:00:00 2001
From: Hans-Peter Herzog <hherzog@sipwise.com>
Date: Mon, 29 Jul 2019 10:44:51 +0200
Subject: [PATCH] TT#56394 Show proper message if entity list is empty

Change-Id: I4b8531797414cce6ab865e80443c1ec985212adf
---
 .../pages/PbxConfiguration/CscPbxCallQueues.vue   |  7 +++++++
 .../pages/PbxConfiguration/CscPbxDevices.vue      | 15 ++++++++++++++-
 .../pages/PbxConfiguration/CscPbxGroups.vue       |  4 ++--
 .../pages/PbxConfiguration/CscPbxMsConfigs.vue    |  7 +++++++
 .../pages/PbxConfiguration/CscPbxSoundSets.vue    |  7 +++++++
 src/locales/en.json                               |  3 ++-
 src/store/pbx-callqueues.js                       |  3 +++
 src/store/pbx-devices.js                          |  2 +-
 src/store/pbx-groups.js                           |  2 +-
 src/store/pbx-ms-configs.js                       |  3 +++
 src/store/pbx-soundsets.js                        |  2 +-
 11 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/components/pages/PbxConfiguration/CscPbxCallQueues.vue b/src/components/pages/PbxConfiguration/CscPbxCallQueues.vue
index 33a149ab..32ef0ed3 100644
--- a/src/components/pages/PbxConfiguration/CscPbxCallQueues.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxCallQueues.vue
@@ -57,6 +57,12 @@
                 />
             </csc-fade>
         </csc-list>
+        <div
+            v-if="isCallQueueListEmpty && !isCallQueueListRequesting"
+            class="row justify-center csc-no-entities"
+        >
+            {{ $t('pbxConfig.noCallQueues') }}
+        </div>
         <csc-remove-dialog
             ref="removeDialog"
             :title="$t('pbxConfig.callQueueRemovalDialogTitle')"
@@ -159,6 +165,7 @@
                 'callQueueRemovalError'
             ]),
             ...mapGetters('pbxCallQueues', [
+                'isCallQueueListEmpty',
                 'isCallQueueListRequesting',
                 'isCallQueueAddFormEnabled',
                 'isCallQueueCreating',
diff --git a/src/components/pages/PbxConfiguration/CscPbxDevices.vue b/src/components/pages/PbxConfiguration/CscPbxDevices.vue
index ecb92f5b..b74127f0 100644
--- a/src/components/pages/PbxConfiguration/CscPbxDevices.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxDevices.vue
@@ -74,7 +74,7 @@
             v-if="isDeviceListRequesting && !(isDeviceCreating || isDeviceRemoving || isDeviceUpdating)"
         />
         <csc-list
-            v-if="deviceListVisibility === 'visible'"
+            v-if="!isDeviceListEmpty && deviceListVisibility === 'visible'"
         >
             <csc-fade
                 v-for="(device, index) in deviceListItems"
@@ -109,6 +109,18 @@
                 />
             </csc-fade>
         </csc-list>
+        <div
+            v-if="isDeviceListEmpty && !isDeviceListRequesting && hasFilters"
+            class="row justify-center csc-no-entities"
+        >
+            {{ $t('pbxConfig.noDevicesFound') }}
+        </div>
+        <div
+            v-else-if="isDeviceListEmpty && !isDeviceListRequesting"
+            class="row justify-center csc-no-entities"
+        >
+            {{ $t('pbxConfig.noDevicesCreated') }}
+        </div>
         <csc-remove-dialog
             ref="removeDialog"
             :title="$t('pbxConfig.removeDeviceTitle')"
@@ -205,6 +217,7 @@
                 'deviceRemovalState'
             ]),
             ...mapGetters('pbxDevices', [
+                'isDeviceListEmpty',
                 'isDeviceListRequesting',
                 'isDeviceExpanded',
                 'isDeviceListPaginationActive',
diff --git a/src/components/pages/PbxConfiguration/CscPbxGroups.vue b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
index 297fafc1..4447e725 100644
--- a/src/components/pages/PbxConfiguration/CscPbxGroups.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
@@ -80,10 +80,10 @@
             </csc-fade>
         </csc-list>
         <div
-            v-if="!isGroupListRequesting && isGroupListEmpty"
+            v-if="isGroupListEmpty && !isGroupListRequesting"
             class="row justify-center csc-no-entities"
         >
-            {{ $t('pbxConfig.noSeats') }}
+            {{ $t('pbxConfig.noGroups') }}
         </div>
         <csc-remove-dialog
             ref="removeDialog"
diff --git a/src/components/pages/PbxConfiguration/CscPbxMsConfigs.vue b/src/components/pages/PbxConfiguration/CscPbxMsConfigs.vue
index c17593ed..9aa4b046 100644
--- a/src/components/pages/PbxConfiguration/CscPbxMsConfigs.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxMsConfigs.vue
@@ -57,6 +57,12 @@
                 />
             </csc-fade>
         </csc-list>
+        <div
+            v-if="isMsConfigListEmpty && !isMsConfigListRequesting"
+            class="row justify-center csc-no-entities"
+        >
+            {{ $t('pbxConfig.noMsConfigs') }}
+        </div>
         <csc-remove-dialog
             ref="removeDialog"
             :title="$t('pbxConfig.msConfigRemovalDialogTitle')"
@@ -159,6 +165,7 @@
                 'msConfigRemovalError'
             ]),
             ...mapGetters('pbxMsConfigs', [
+                'isMsConfigListEmpty',
                 'isMsConfigListRequesting',
                 'isMsConfigAddFormEnabled',
                 'isMsConfigCreating',
diff --git a/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue b/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
index 2953ac94..7f0172dc 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSoundSets.vue
@@ -72,6 +72,12 @@
                 />
             </csc-fade>
         </csc-list>
+        <div
+            v-if="isSoundSetListEmpty && !isSoundSetListRequesting"
+            class="row justify-center csc-no-entities"
+        >
+            {{ $t('pbxConfig.noSoundSets') }}
+        </div>
         <csc-remove-dialog
             ref="removeDialog"
             :title="$t('pbxConfig.soundSetRemovalDialogTitle')"
@@ -151,6 +157,7 @@
                 'soundSetRemovalError'
             ]),
             ...mapGetters('pbxSoundSets', [
+                'isSoundSetListEmpty',
                 'isSoundSetListRequesting',
                 'isSoundSetAddFormEnabled',
                 'isSoundSetListPaginationActive',
diff --git a/src/locales/en.json b/src/locales/en.json
index 13da0563..06e252d4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -504,7 +504,8 @@
         "msConfigRemovalDialogText": "You are about to remove config for {msConfig}",
         "msConfigCreationToast": "Created manager secretary config for {msConfig} successfully",
         "msConfigUpdateToast": "Updated {field} for manager secretary config {msConfig} successfully",
-        "msConfigRemovalToast": "Removed manager secretary config for {msConfig} successfully"
+        "msConfigRemovalToast": "Removed manager secretary config for {msConfig} successfully",
+        "noMsConfigs": "No manager secretary configuration created yet"
     },
     "callBlocking": {
         "privacyEnabledToast": "Your number is hidden to the callee",
diff --git a/src/store/pbx-callqueues.js b/src/store/pbx-callqueues.js
index c09f466e..9dbd1638 100644
--- a/src/store/pbx-callqueues.js
+++ b/src/store/pbx-callqueues.js
@@ -41,6 +41,9 @@ export default {
         defaultQueueWrapUpTime: 10
     },
     getters: {
+        isCallQueueListEmpty(state) {
+            return Array.isArray(state.callQueueList) && state.callQueueList.length === 0;
+        },
         isCallQueueListRequesting(state) {
             return state.callQueueListState === RequestState.requesting;
         },
diff --git a/src/store/pbx-devices.js b/src/store/pbx-devices.js
index 1775a853..2f02e940 100644
--- a/src/store/pbx-devices.js
+++ b/src/store/pbx-devices.js
@@ -42,7 +42,7 @@ export default {
     },
     getters: {
         isDeviceListEmpty(state) {
-            return state.deviceListItems.length && state.deviceListItems.length === 0;
+            return Array.isArray(state.deviceListItems) && state.deviceListItems.length === 0;
         },
         isDeviceListRequesting(state) {
             return state.deviceListState === RequestState.requesting;
diff --git a/src/store/pbx-groups.js b/src/store/pbx-groups.js
index 99fc4939..fe9da531 100644
--- a/src/store/pbx-groups.js
+++ b/src/store/pbx-groups.js
@@ -46,7 +46,7 @@ export default {
     },
     getters: {
         isGroupListEmpty(state) {
-            return state.groupListItems.length && state.groupListItems.length === 0;
+            return Array.isArray(state.groupListItems) && state.groupListItems.length === 0;
         },
         isGroupListRequesting(state) {
             return state.groupListState === RequestState.requesting;
diff --git a/src/store/pbx-ms-configs.js b/src/store/pbx-ms-configs.js
index baf7d23b..a7be6a0c 100644
--- a/src/store/pbx-ms-configs.js
+++ b/src/store/pbx-ms-configs.js
@@ -40,6 +40,9 @@ export default {
         subscriberMap: {}
     },
     getters: {
+        isMsConfigListEmpty(state) {
+            return Array.isArray(state.msConfigList) && state.msConfigList.length === 0;
+        },
         isMsConfigListRequesting(state) {
             return state.msConfigListState === RequestState.requesting;
         },
diff --git a/src/store/pbx-soundsets.js b/src/store/pbx-soundsets.js
index 300d84db..8614c8d3 100644
--- a/src/store/pbx-soundsets.js
+++ b/src/store/pbx-soundsets.js
@@ -64,7 +64,7 @@ export default {
     },
     getters: {
         isSoundSetListEmpty(state) {
-            return state.soundSetList.length && state.soundSetList.length === 0;
+            return Array.isArray(state.soundSetList) && state.soundSetList.length === 0;
         },
         isSoundSetListRequesting(state) {
             return state.soundSetListState === RequestState.requesting;