Merge branch 'feat/update-settings-sidebar' into staging

weni-ai · Aug 30, 2024 · fc6e777 · fc6e777
2 parents 8f2c44d + 106579a
commit fc6e777
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -18,10 +18,10 @@ export JSON_STRING='window.configs = { \
   "NEXUS_API":"'${NEXUS_API}'", \
   "VITE_HOTJAR_ID":"'${VITE_HOTJAR_ID}'", \
   "VITE_BILLING_API_URL":"'${VITE_BILLING_API_URL}'", \
+  "VITE_CHATS_API_URL":"'${VITE_CHATS_API_URL}'", \
   "GITHUB_API":"'${GITHUB_API}'", \
   "GITHUB_CONTENT_API":"'${GITHUB_CONTENT_API}'", \
   "GITHUB_PLATFORM_UPDATES_REPOSITORY":"'${GITHUB_PLATFORM_UPDATES_REPOSITORY}'", \
-  "VITE_CHATS_API_URL":"'${VITE_CHATS_API_URL}'", \
 }'
 sed "s|\/\/CONFIGURATIONS_PLACEHOLDER|${JSON_STRING}|" /usr/share/nginx/html/connect/index.html.tmpl > /tmp/index.html
 

diff --git a/src/locales/translations.json b/src/locales/translations.json
@@ -6230,6 +6230,11 @@
     }
   },
   "settings": {
+    "sector": {
+      "pt-br": "Setor",
+      "en": "Sector",
+      "es": "Sector"
+    },
     "project": {
       "title": {
         "pt-br": "Projeto",

diff --git a/src/utils/array.js b/src/utils/array.js
@@ -0,0 +1,7 @@
+export function sortByKey(arr, key, order = 'asc') {
+  const compareString = arr.every((item) => typeof item[key] === 'string');
+  const ordenedArr = compareString
+    ? arr.sort((a, b) => a[key].localeCompare(b[key]))
+    : arr.toSorted((a, b) => a[key] - b[key]);
+  return order === 'desc' ? ordenedArr.reverse() : ordenedArr;
+}
diff --git a/src/views/settings.vue b/src/views/settings.vue
@@ -32,6 +32,7 @@ import ExternalSystem from '../components/ExternalSystem.vue';
 import getEnv from '@/utils/env';
 import { PROJECT_ROLE_CHATUSER } from '../components/users/permissionsObjects';
 import chats from '../api/chats';
+import { sortByKey } from '@/utils/array';
 
 export default {
   name: 'SettingsView',
@@ -168,14 +169,18 @@ export default {
   methods: {
     async getChatsSectors() {
       const sectors = (await chats.listAllSectors()).results;
-      this.chatsSectorRoutes = sectors.map((sector) => ({
+
+      const sectorRoutes = sectors.map((sector) => ({
         key: sector.uuid,
-        label: `Setor ${sector.name}`,
+        label: `${this.$t('settings.sector')} ${sector.name}`,
         hrefForceReload: {
           name: 'settingsChats',
           params: { internal: ['r', 'settings', 'sectors', sector.uuid] },
         },
       }));
+
+      this.chatsSectorRoutes = sortByKey(sectorRoutes, 'label');
+
       this.initialLoaded = true;
     },
 
@@ -201,6 +206,19 @@ export default {
 
   display: flex;
 
+  :deep(.unnnic-sidebar-items) {
+    position: relative;
+    margin-right: -$unnnic-spacing-sm;
+  }
+
+  :deep(.unnnic-sidebar-item) {
+    margin-right: $unnnic-spacing-sm;
+  }
+
+  :deep(.unnnic-sidebar-item-child) {
+    margin-right: $unnnic-spacing-sm;
+  }
+
   .options {
     width: 200px;
     height: fit-content;