From f305cee3ce7d96fc6597cbf8a5f6b186b0d741a2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 6 Jun 2024 14:07:40 -0300
Subject: [PATCH 1/9] Account view forms

---
 src/pages/Account/AccountAccounts.vue | 111 ++++++++++++++++
 src/pages/Account/AccountLdap.vue     | 167 +++++++++++++++++++++++
 src/pages/Account/AccountSamba.vue    | 182 ++++++++++++++++++++++++++
 src/pages/Account/locale/en.yml       |  10 ++
 src/pages/Account/locale/es.yml       |  10 ++
 src/router/modules/account.js         |   5 +-
 6 files changed, 484 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Account/AccountAccounts.vue
 create mode 100644 src/pages/Account/AccountLdap.vue
 create mode 100644 src/pages/Account/AccountSamba.vue

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
new file mode 100644
index 000000000..236790f8d
--- /dev/null
+++ b/src/pages/Account/AccountAccounts.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const onSynchronizeAll = async () => {
+    try {
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
+};
+
+const onSynchronizeRoles = async () => {
+    try {
+        await axios.patch(`RoleInherits/sync`);
+        notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
+};
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :url="`AccountConfigs/${1}`"
+            :url-update="`AccountConfigs/${1}`"
+            model="AccountAccounts"
+            auto-load
+        >
+            <template #moreActions>
+                <QBtn
+                    round
+                    flat
+                    color="primary"
+                    :label="t('accounts.syncAll')"
+                    @click="onSynchronizeAll()"
+                />
+                <QBtn
+                    round
+                    flat
+                    color="primary"
+                    :label="t('accounts.syncRoles')"
+                    @click="onSynchronizeRoles()"
+                />
+            </template>
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput :label="t('accounts.shell')" v-model="data.shell" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.idBase')"
+                        v-model="data.idBase"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.min')"
+                        v-model="data.min"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        :label="t('accounts.max')"
+                        v-model="data.max"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.warn')"
+                        v-model="data.warn"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        :label="t('accounts.inact')"
+                        v-model="data.inact"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Roles synchronized!: ¡Roles sincronizados!
+    Synchronizing in the background: Sincronizando en segundo plano
+</i18n>
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
new file mode 100644
index 000000000..13356cee3
--- /dev/null
+++ b/src/pages/Account/AccountLdap.vue
@@ -0,0 +1,167 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    groupDn: null,
+    password: null,
+    rdn: null,
+    server: null,
+    userDn: null,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) customFn.value = deleteMailForward;
+        else customFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const urlCreate = ref(null);
+const urlUpdate = ref(null);
+const customFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`LdapConfigs/test`);
+        notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(`LdapConfigs/${1}`);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            urlUpdate.value = `LdapConfigs/${1}`;
+            urlCreate.value = null;
+        } else {
+            urlUpdate.value = null;
+            urlCreate.value = `LdapConfigs`;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(`LdapConfigs/${1}`);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar></VnSubToolbar>
+        <FormModel
+            :key="initialDataLoaded"
+            model="AccountLdap"
+            :form-initial-data="initialData"
+            :url-create="urlCreate"
+            :url-update="urlUpdate"
+            :save-fn="customFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtnGroup push class="q-gutter-x-sm">
+                    <QBtn
+                        round
+                        flat
+                        color="primary"
+                        :label="t('ldap.testConnection')"
+                        @click="onTestConection()"
+                    >
+                        <QTooltip>
+                            {{ t('ldap.testConnection') }}
+                        </QTooltip>
+                    </QBtn>
+                </QBtnGroup>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('ldap.server')"
+                        clearable
+                        v-model="data.server"
+                        :required="true"
+                        :rules="validate('LdapConfig.server')"
+                    />
+                    <VnInput
+                        :label="t('ldap.rdn')"
+                        clearable
+                        v-model="data.rdn"
+                        :required="true"
+                        :rules="validate('LdapConfig.rdn')"
+                    />
+                    <VnInput
+                        :label="t('ldap.password')"
+                        clearable
+                        type="password"
+                        v-model="data.password"
+                        :required="true"
+                        :rules="validate('LdapConfig.password')"
+                    />
+                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
+                    <VnInput
+                        :label="t('ldap.groupDN')"
+                        clearable
+                        v-model="data.groupDn"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    LDAP connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
new file mode 100644
index 000000000..0a6bd2e10
--- /dev/null
+++ b/src/pages/Account/AccountSamba.vue
@@ -0,0 +1,182 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const formModel = ref(null);
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    adDomain: null,
+    adController: null,
+    adUser: null,
+    adPassword: null,
+    userDn: null,
+    verifyCert: false,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) customFn.value = deleteMailForward;
+        else customFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const urlCreate = ref(null);
+const urlUpdate = ref(null);
+const customFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`SambaConfigs/test`);
+        notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(`SambaConfigs/${1}`);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            urlUpdate.value = `SambaConfigs/${1}`;
+            urlCreate.value = null;
+        } else {
+            urlUpdate.value = null;
+            urlCreate.value = `SambaConfigs`;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(`SambaConfigs/${1}`);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar></VnSubToolbar>
+        <FormModel
+            ref="formModel"
+            :key="initialDataLoaded"
+            model="AccountSamba"
+            :form-initial-data="initialData"
+            :url-create="urlCreate"
+            :url-update="urlUpdate"
+            :save-fn="customFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtnGroup push class="q-gutter-x-sm">
+                    <QBtn
+                        round
+                        flat
+                        color="primary"
+                        :label="t('ldap.testConnection')"
+                        :disable="formModel.hasChanges"
+                        @click="onTestConection()"
+                    >
+                        <QTooltip>
+                            {{ t('ldap.testConnection') }}
+                        </QTooltip>
+                    </QBtn>
+                </QBtnGroup>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('samba.domainAD')"
+                        clearable
+                        v-model="data.adDomain"
+                        :required="true"
+                        :rules="validate('SambaConfigs.server')"
+                    />
+                    <VnInput
+                        :label="t('samba.domainController')"
+                        clearable
+                        v-model="data.adController"
+                        :required="true"
+                        :rules="validate('SambaConfigs.adController')"
+                    />
+                    <VnInput
+                        :label="t('samba.userAD')"
+                        clearable
+                        v-model="data.adUser"
+                        :rules="validate('SambaConfigs.adUser')"
+                    />
+                    <VnInput
+                        :label="t('samba.passwordAD')"
+                        clearable
+                        type="password"
+                        v-model="data.adPassword"
+                    />
+                    <VnInput
+                        :label="t('samba.domainPart')"
+                        clearable
+                        v-model="data.userDn"
+                        :required="true"
+                        :rules="validate('SambaConfigs.userDn')"
+                    />
+                    <QCheckbox
+                        :label="t('samba.verifyCertificate')"
+                        v-model="data.verifyCert"
+                        :rules="validate('SambaConfigs.groupDn')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Samba connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 0a511888b..83b98b528 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -65,3 +65,13 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+accounts:
+    homedir: Homedir base
+    shell: Shell
+    idBase: User and role base id
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Synchronize all
+    syncRoles: Synchronize roles
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index f339f71ca..ff572b2cc 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -76,3 +76,13 @@ samba:
     Verify certificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+accounts:
+    homedir: Directorio base para carpetas de usuario
+    shell: Intérprete de línea de comandos
+    idBase: Id base usuarios y roles
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Sincronizar todo
+    syncRoles: Sincronizar roles
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 4bcf33d85..8020f0865 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountRoles'],
+        main: ['AccountRoles', 'AccountAccounts', 'AccountLdap', 'AccountSamba'],
         card: [],
     },
     children: [
@@ -54,6 +54,7 @@ export default {
                     meta: {
                         title: 'accounts',
                         icon: 'accessibility',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountAccounts.vue'),
                 },
@@ -63,6 +64,7 @@ export default {
                     meta: {
                         title: 'ldap',
                         icon: 'account_tree',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountLdap.vue'),
                 },
@@ -72,6 +74,7 @@ export default {
                     meta: {
                         title: 'samba',
                         icon: 'preview',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },

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 2/9] 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 236790f8d..ebca1c3db 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 13356cee3..f41d040b8 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 0a6bd2e10..f76d2fbc5 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 83b98b528..045eec3b1 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 ff572b2cc..5c53b841c 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:

From fe3ad9dc081c7722763ce2e5077e4f91a523077a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:40:52 +0200
Subject: [PATCH 3/9] fix: styles and i18n

---
 src/pages/Account/AccountLdap.vue  | 2 +-
 src/pages/Account/AccountSamba.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index f41d040b8..d64bb90ba 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 </QBtnGroup>
             </template>
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
                             :label="t('ldap.enableSync')"
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index f76d2fbc5..20234f468 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -118,7 +118,7 @@ onMounted(async () => await getInitialLdapConfig());
                 </QBtnGroup>
             </template>
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
                             :label="t('ldap.enableSync')"

From e178778264dc3704ccdc709b0b51e0da3c0482d1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:46:26 +0200
Subject: [PATCH 4/9] fix: styles

---
 src/pages/Account/AccountAccounts.vue       |  2 +-
 src/pages/Account/AccountLdap.vue           | 23 +++++++++----------
 src/pages/Account/AccountSamba.vue          | 25 +++++++++------------
 src/pages/Worker/Card/WorkerTimeControl.vue |  2 +-
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index ebca1c3db..65d5d5a9d 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -42,7 +42,7 @@ const onSynchronizeRoles = async () => {
         >
             <template #moreActions>
                 <QBtn
-                    style="margin-left: 0"
+                    class="q-ml-none"
                     color="primary"
                     :label="t('accounts.syncAll')"
                     @click="onSynchronizeAll()"
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index d64bb90ba..637788314 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -99,19 +99,16 @@ onMounted(async () => await getInitialLdapConfig());
             @on-data-saved="getInitialLdapConfig()"
         >
             <template #moreActions>
-                <QBtnGroup push class="q-gutter-x-sm">
-                    <QBtn
-                        round
-                        flat
-                        color="primary"
-                        :label="t('ldap.testConnection')"
-                        @click="onTestConection()"
-                    >
-                        <QTooltip>
-                            {{ t('ldap.testConnection') }}
-                        </QTooltip>
-                    </QBtn>
-                </QBtnGroup>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
             </template>
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md">
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 20234f468..53ace6029 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -102,20 +102,17 @@ onMounted(async () => await getInitialLdapConfig());
             @on-data-saved="getInitialLdapConfig()"
         >
             <template #moreActions>
-                <QBtnGroup push class="q-gutter-x-sm">
-                    <QBtn
-                        round
-                        flat
-                        color="primary"
-                        :label="t('ldap.testConnection')"
-                        :disable="formModel.hasChanges"
-                        @click="onTestConection()"
-                    >
-                        <QTooltip>
-                            {{ t('ldap.testConnection') }}
-                        </QTooltip>
-                    </QBtn>
-                </QBtnGroup>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    :disable="formModel.hasChanges"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
             </template>
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md">
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d9a650d9a..f466c4f9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -460,7 +460,7 @@ onMounted(async () => {
                     style="margin-left: 1px"
                 />
             </QBtnGroup>
-            <QBtnGroup push class="q-gutter-x-sm" flat style="margin-left: 0px">
+            <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
                     v-if="reason && state && (isHimSelf || isHr)"
                     :label="t('Reason')"

From 1e67a0feca408375ecf591a734ff33912971c88f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 7 Jun 2024 09:35:36 -0300
Subject: [PATCH 5/9] Make AccountLdap work again

---
 src/pages/Account/AccountLdap.vue | 37 +++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 637788314..411c1e702 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -7,12 +7,17 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
+import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
+const arrayData = useArrayData('AccountLdap');
+
+const URL_UPDATE = `LdapConfigs/${1}`;
+const URL_CREATE = `LdapConfigs`;
 const DEFAULT_DATA = {
     id: 1,
     hasData: false,
@@ -31,15 +36,15 @@ const hasData = computed({
     get: () => initialData.value.hasData,
     set: (val) => {
         initialData.value.hasData = val;
-        if (!val) customFn.value = deleteMailForward;
-        else customFn.value = null;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
     },
 });
 
 const initialDataLoaded = ref(false);
-const urlCreate = ref(null);
-const urlUpdate = ref(`LdapConfigs/${1}`);
-const customFn = ref(null);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(`LdapConfigs/${1}`);
+const formCustomFn = ref(null);
 
 const onTestConection = async () => {
     try {
@@ -53,19 +58,23 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(urlUpdate.value);
+        const { data } = await axios.get(URL_UPDATE);
         initialData.value = data;
         hasData.value = true;
         return data;
     } catch (error) {
         hasData.value = false;
+        arrayData.destroy();
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) urlCreate.value = null;
-        else {
-            urlUpdate.value = null;
-            urlCreate.value = `LdapConfigs`;
+        // Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
         }
         initialDataLoaded.value = true;
     }
@@ -73,7 +82,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(urlUpdate.value);
+        await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -92,9 +101,9 @@ onMounted(async () => await getInitialLdapConfig());
             :key="initialDataLoaded"
             model="AccountLdap"
             :form-initial-data="initialData"
-            :url-create="urlCreate"
-            :url-update="urlUpdate"
-            :save-fn="customFn"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
             auto-load
             @on-data-saved="getInitialLdapConfig()"
         >

From fa4a18fbbb34d7f9b8d241d8736bd9f3176e59f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 7 Jun 2024 09:46:04 -0300
Subject: [PATCH 6/9] make account samba work again

---
 src/pages/Account/AccountLdap.vue  |  2 +-
 src/pages/Account/AccountSamba.vue | 52 ++++++++++++++++++------------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 411c1e702..77c4d89f8 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -43,7 +43,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const formUrlCreate = ref(null);
-const formUrlUpdate = ref(`LdapConfigs/${1}`);
+const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 53ace6029..25428a674 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -7,13 +7,20 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
+import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
+const arrayData = useArrayData('AccountSamba');
+
 const formModel = ref(null);
+
+const URL_UPDATE = `SambaConfigs/${1}`;
+const URL_CREATE = `SambaConfigs`;
+
 const DEFAULT_DATA = {
     id: 1,
     hasData: false,
@@ -33,15 +40,15 @@ const hasData = computed({
     get: () => initialData.value.hasData,
     set: (val) => {
         initialData.value.hasData = val;
-        if (!val) customFn.value = deleteMailForward;
-        else customFn.value = null;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
     },
 });
 
 const initialDataLoaded = ref(false);
-const urlCreate = ref(null);
-const urlUpdate = ref(`SambaConfigs/${1}`);
-const customFn = ref(null);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
 
 const onTestConection = async () => {
     try {
@@ -52,22 +59,25 @@ const onTestConection = async () => {
     }
 };
 
-const getInitialLdapConfig = async () => {
+const getInitialSambaConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(urlUpdate.value);
+        const { data } = await axios.get(URL_UPDATE);
         initialData.value = data;
         hasData.value = true;
         return data;
     } catch (error) {
         hasData.value = false;
-        console.error('Error fetching initial LDAP config', error);
+        arrayData.destroy();
+        console.error('Error fetching initial Samba config', error);
         return null;
     } finally {
-        if (hasData.value) urlCreate.value = null;
-        else {
-            urlUpdate.value = null;
-            urlCreate.value = `SambaConfigs`;
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
         }
         initialDataLoaded.value = true;
     }
@@ -75,7 +85,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(urlUpdate.value);
+        await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -84,7 +94,7 @@ const deleteMailForward = async () => {
     }
 };
 
-onMounted(async () => await getInitialLdapConfig());
+onMounted(async () => await getInitialSambaConfig());
 </script>
 
 <template>
@@ -95,22 +105,22 @@ onMounted(async () => await getInitialLdapConfig());
             :key="initialDataLoaded"
             model="AccountSamba"
             :form-initial-data="initialData"
-            :url-create="urlCreate"
-            :url-update="urlUpdate"
-            :save-fn="customFn"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
             auto-load
-            @on-data-saved="getInitialLdapConfig()"
+            @on-data-saved="getInitialSambaConfig()"
         >
             <template #moreActions>
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('ldap.testConnection')"
+                    :label="t('samba.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('ldap.testConnection') }}
+                        {{ t('samba.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -118,7 +128,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('ldap.enableSync')"
+                            :label="t('samba.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"

From 5e7ef68439ad0c8ff9e8f01f0700f9011c53539c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 08:22:26 +0200
Subject: [PATCH 7/9] feat: simplify html

---
 src/pages/Account/AccountAccounts.vue | 64 +++++++++++++--------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index 65d5d5a9d..3d7dda899 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -54,48 +54,44 @@ const onSynchronizeRoles = async () => {
                 />
             </template>
             <template #form="{ data }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <div class="q-gutter-y-sm">
                     <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput :label="t('accounts.shell')" v-model="data.shell" />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput
                         :label="t('accounts.idBase')"
                         v-model="data.idBase"
                         type="number"
                         min="0"
                     />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        :label="t('accounts.min')"
-                        v-model="data.min"
-                        type="number"
-                        min="0"
-                    />
-                    <VnInput
-                        :label="t('accounts.max')"
-                        v-model="data.max"
-                        type="number"
-                        min="0"
-                    />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        :label="t('accounts.warn')"
-                        v-model="data.warn"
-                        type="number"
-                        min="0"
-                    />
-                    <VnInput
-                        :label="t('accounts.inact')"
-                        v-model="data.inact"
-                        type="number"
-                        min="0"
-                    />
-                </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.min')"
+                            v-model="data.min"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.max')"
+                            v-model="data.max"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.warn')"
+                            v-model="data.warn"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.inact')"
+                            v-model="data.inact"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                </div>
             </template>
         </FormModel>
     </QPage>

From e5a590a9f93b891202baa127a66877103525bb02 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 11 Jun 2024 13:48:15 +0200
Subject: [PATCH 8/9] feat: refs #7154 new item descriptor field

---
 src/i18n/locale/en.yml                 | 1 +
 src/i18n/locale/es.yml                 | 1 +
 src/pages/Item/Card/ItemDescriptor.vue | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 8ccdf640f..23c323653 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1177,6 +1177,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+        subName: Grower
     list:
         id: Identifier
         grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 452421343..481f043f4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1166,6 +1166,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
+        subName: Productor
     list:
         id: Identificador
         grouping: Grouping
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 305d29b8b..3b57aae8d 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -16,6 +16,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import { dashIfEmpty } from 'src/filters';
 
 const $props = defineProps({
     id: {
@@ -182,6 +183,10 @@ const openCloneDialog = async () => {
                     </span>
                 </template>
             </VnLv>
+            <VnLv
+                :label="t('item.descriptor.subName')"
+                :value="dashIfEmpty(entity.subName)"
+            />
             <VnLv
                 v-if="entity.value5"
                 :label="t('item.descriptor.color')"

From de18b670eaf064197280cc87e0dc7b7aaa66f921 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 11 Jun 2024 14:29:42 +0200
Subject: [PATCH 9/9] feat: refs #7154 changed label

---
 src/i18n/locale/en.yml                 | 2 +-
 src/i18n/locale/es.yml                 | 2 +-
 src/pages/Item/Card/ItemDescriptor.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 23c323653..e672a16e9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1177,7 +1177,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
-        subName: Grower
+        producer: Producer
     list:
         id: Identifier
         grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 481f043f4..a7f599edb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1166,7 +1166,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
-        subName: Productor
+        producer: Productor
     list:
         id: Identificador
         grouping: Grouping
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 3b57aae8d..155c9eb4c 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -184,7 +184,7 @@ const openCloneDialog = async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('item.descriptor.subName')"
+                :label="t('item.descriptor.producer')"
                 :value="dashIfEmpty(entity.subName)"
             />
             <VnLv