From 17924dfeb376077886a883af5fc7a272e9cd5b9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:39:38 +0200
Subject: [PATCH] fix: styles and i18n

---
 src/pages/Account/AccountAccounts.vue |  5 +----
 src/pages/Account/AccountLdap.vue     | 14 ++++++--------
 src/pages/Account/AccountSamba.vue    | 14 ++++++--------
 src/pages/Account/locale/en.yml       |  1 +
 src/pages/Account/locale/es.yml       |  3 ++-
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index 236790f8d3..ebca1c3db8 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -42,15 +42,12 @@ const onSynchronizeRoles = async () => {
         >
             <template #moreActions>
                 <QBtn
-                    round
-                    flat
+                    style="margin-left: 0"
                     color="primary"
                     :label="t('accounts.syncAll')"
                     @click="onSynchronizeAll()"
                 />
                 <QBtn
-                    round
-                    flat
                     color="primary"
                     :label="t('accounts.syncRoles')"
                     @click="onSynchronizeRoles()"
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 13356cee39..f41d040b8c 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -38,7 +38,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const urlCreate = ref(null);
-const urlUpdate = ref(null);
+const urlUpdate = ref(`LdapConfigs/${1}`);
 const customFn = ref(null);
 
 const onTestConection = async () => {
@@ -53,7 +53,7 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(`LdapConfigs/${1}`);
+        const { data } = await axios.get(urlUpdate.value);
         initialData.value = data;
         hasData.value = true;
         return data;
@@ -62,10 +62,8 @@ const getInitialLdapConfig = async () => {
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) {
-            urlUpdate.value = `LdapConfigs/${1}`;
-            urlCreate.value = null;
-        } else {
+        if (hasData.value) urlCreate.value = null;
+        else {
             urlUpdate.value = null;
             urlCreate.value = `LdapConfigs`;
         }
@@ -75,7 +73,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(`LdapConfigs/${1}`);
+        await axios.delete(urlUpdate.value);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -89,7 +87,7 @@ onMounted(async () => await getInitialLdapConfig());
 
 <template>
     <QPage>
-        <VnSubToolbar></VnSubToolbar>
+        <VnSubToolbar />
         <FormModel
             :key="initialDataLoaded"
             model="AccountLdap"
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 0a6bd2e10d..f76d2fbc54 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -40,7 +40,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const urlCreate = ref(null);
-const urlUpdate = ref(null);
+const urlUpdate = ref(`SambaConfigs/${1}`);
 const customFn = ref(null);
 
 const onTestConection = async () => {
@@ -55,7 +55,7 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(`SambaConfigs/${1}`);
+        const { data } = await axios.get(urlUpdate.value);
         initialData.value = data;
         hasData.value = true;
         return data;
@@ -64,10 +64,8 @@ const getInitialLdapConfig = async () => {
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) {
-            urlUpdate.value = `SambaConfigs/${1}`;
-            urlCreate.value = null;
-        } else {
+        if (hasData.value) urlCreate.value = null;
+        else {
             urlUpdate.value = null;
             urlCreate.value = `SambaConfigs`;
         }
@@ -77,7 +75,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(`SambaConfigs/${1}`);
+        await axios.delete(urlUpdate.value);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -91,7 +89,7 @@ onMounted(async () => await getInitialLdapConfig());
 
 <template>
     <QPage>
-        <VnSubToolbar></VnSubToolbar>
+        <VnSubToolbar />
         <FormModel
             ref="formModel"
             :key="initialDataLoaded"
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 83b98b5286..045eec3b18 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -54,6 +54,7 @@ ldap:
     groupDN: Group DN
     testConnection: Test connection
     success: LDAP connection established!
+    password: Password
 samba:
     enableSync: Enable synchronization
     domainController: Domain controller
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index ff572b2cc4..5c53b841c3 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -57,6 +57,7 @@ role:
     name: Nombre
     description: Descripción
 ldap:
+    password: Contraseña
     enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
@@ -73,7 +74,7 @@ samba:
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
-    Verify certificate: Verificar certificado
+    verifyCertificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts: