fix: refs #8247 fixed acls and added lost options
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2025-01-02 09:57:56 +01:00
parent fdc0a856ad
commit 5259b8200b
5 changed files with 92 additions and 11 deletions

View File

@ -346,6 +346,7 @@ globals:
countryFk: Country countryFk: Country
companyFk: Company companyFk: Company
changePass: Change password changePass: Change password
setPass: Set password
deleteConfirmTitle: Delete selected elements deleteConfirmTitle: Delete selected elements
changeState: Change state changeState: Change state
raid: 'Raid {daysInForward} days' raid: 'Raid {daysInForward} days'

View File

@ -348,6 +348,7 @@ globals:
countryFk: País countryFk: País
companyFk: Empresa companyFk: Empresa
changePass: Cambiar contraseña changePass: Cambiar contraseña
setPass: Establecer contraseña
deleteConfirmTitle: Eliminar los elementos seleccionados deleteConfirmTitle: Eliminar los elementos seleccionados
changeState: Cambiar estado changeState: Cambiar estado
raid: 'Redada {daysInForward} días' raid: 'Redada {daysInForward} días'

View File

@ -6,9 +6,11 @@ import { useVnConfirm } from 'composables/useVnConfirm';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useAcl } from 'src/composables/useAcl'; import { useAcl } from 'src/composables/useAcl';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import { useState } from 'src/composables/useState';
import VnConfirm from 'src/components/ui/VnConfirm.vue'; import VnConfirm from 'src/components/ui/VnConfirm.vue';
import VnChangePassword from 'src/components/common/VnChangePassword.vue'; import VnChangePassword from 'src/components/common/VnChangePassword.vue';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useRouter } from 'vue-router';
const $props = defineProps({ const $props = defineProps({
hasAccount: { hasAccount: {
@ -21,11 +23,13 @@ const { t } = useI18n();
const { hasAccount } = toRefs($props); const { hasAccount } = toRefs($props);
const { openConfirmationModal } = useVnConfirm(); const { openConfirmationModal } = useVnConfirm();
const route = useRoute(); const route = useRoute();
const router = useRouter();
const state = useState();
const user = state.getUser();
const { notify } = useQuasar(); const { notify } = useQuasar();
const account = computed(() => useArrayData('AccountId').store.data[0]); const account = computed(() => useArrayData('AccountId').store.data[0]);
account.value.hasAccount = hasAccount.value; account.value.hasAccount = hasAccount.value;
const entityId = computed(() => +route.params.id); const entityId = computed(() => +route.params.id);
async function updateStatusAccount(active) { async function updateStatusAccount(active) {
if (active) { if (active) {
await axios.post(`Accounts`, { id: entityId.value }); await axios.post(`Accounts`, { id: entityId.value });
@ -36,7 +40,7 @@ async function updateStatusAccount(active) {
account.value.hasAccount = active; account.value.hasAccount = active;
const status = active ? 'enable' : 'disable'; const status = active ? 'enable' : 'disable';
notify({ notify({
message: t(`account.card.${status}Account.success`), message: t(`account.card.actions.${status}Account.success`),
type: 'positive', type: 'positive',
}); });
} }
@ -49,6 +53,17 @@ async function updateStatusUser(active) {
type: 'positive', type: 'positive',
}); });
} }
async function deleteAccount() {
const { data } = await axios.delete(`VnUsers/${entityId.value}`);
if (data) {
notify({
message: t('account.card.actions.delete.success'),
type: 'positive',
});
router.push({ name: 'AccountList' });
}
}
const showSyncDialog = ref(false); const showSyncDialog = ref(false);
const syncPassword = ref(null); const syncPassword = ref(null);
const shouldSyncPassword = ref(false); const shouldSyncPassword = ref(false);
@ -63,11 +78,18 @@ async function sync() {
type: 'positive', type: 'positive',
}); });
} }
const askOldPass = ref(false);
const changePassRef = ref();
const onChangePass = (oldPass) => {
askOldPass.value = oldPass;
changePassRef.value.show();
};
</script> </script>
<template> <template>
<VnChangePassword <VnChangePassword
ref="changePassRef" ref="changePassRef"
:ask-old-pass="true" :ask-old-pass="askOldPass"
:submit-fn=" :submit-fn="
async (newPassword, oldPassword) => { async (newPassword, oldPassword) => {
await axios.patch(`Accounts/change-password`, { await axios.patch(`Accounts/change-password`, {
@ -110,17 +132,57 @@ async function sync() {
</VnConfirm> </VnConfirm>
<QItem <QItem
v-if=" v-if="
entityId == account.id && useAcl().hasAny([
useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }]) { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
" "
v-ripple v-ripple
clickable clickable
@click="$refs.changePassRef.show()" @click="
openConfirmationModal(
t('account.card.actions.disableAccount.title'),
t('account.card.actions.disableAccount.subtitle'),
() => deleteAccount()
)
"
> >
<QItemSection>{{ t('globals.changePass') }}</QItemSection> <QItemSection>{{ t('globals.delete') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if="account.hasAccount" v-if="
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple
clickable
@click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
>
<QItemSection v-if="user.id === account.id">
{{ t('globals.changePass') }}
</QItemSection>
<QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
</QItem>
<QItem
v-if="
!account.hasAccount &&
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple
clickable
@click="
openConfirmationModal(
t('account.card.actions.enableAccount.title'),
t('account.card.actions.enableAccount.subtitle'),
() => updateStatusAccount(true)
)
"
>
<QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection>
</QItem>
<QItem
v-if="
account.hasAccount &&
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -135,7 +197,12 @@ async function sync() {
</QItem> </QItem>
<QItem <QItem
v-if="!account.active" v-if="
!account.active &&
useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -149,7 +216,12 @@ async function sync() {
<QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if="account.active" v-if="
account.active &&
useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -162,7 +234,12 @@ async function sync() {
> >
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
</QItem> </QItem>
<QItem v-ripple clickable @click="showSyncDialog = true"> <QItem
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
v-ripple
clickable
@click="showSyncDialog = true"
>
<QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
</QItem> </QItem>
<QSeparator /> <QSeparator />

View File

@ -58,6 +58,7 @@ lastEntries:
pvp: PVP pvp: PVP
label: Label label: Label
grouping: Grouping grouping: Grouping
packing: Packing
quantity: Quantity quantity: Quantity
cost: Cost cost: Cost
kg: Kg. kg: Kg.

View File

@ -58,6 +58,7 @@ lastEntries:
pvp: PVP pvp: PVP
label: Eti. label: Eti.
grouping: Grouping grouping: Grouping
packing: Packing
quantity: Cantidad quantity: Cantidad
cost: Coste cost: Coste
kg: Kg. kg: Kg.