Skip to content

Commit 7ebb11a

Browse files
Merge branch 'main' into feat-7385
2 parents f2a218e + 9e237f4 commit 7ebb11a

File tree

11 files changed

+24
-18
lines changed

11 files changed

+24
-18
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node
33
{
44
"name": "ns8-mail",
5-
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",
5+
"image": "mcr.microsoft.com/devcontainers/javascript-node:22-bookworm",
66
// Configure tool-specific properties.
77
"customizations": {
88
// Configure properties specific to VS Code.

build-images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ container=$(buildah from scratch)
1616
# Reuse existing nodebuilder-mail container, to speed up builds
1717
if ! buildah containers --format "{{.ContainerName}}" | grep -q nodebuilder-mail; then
1818
echo "Pulling NodeJS runtime..."
19-
buildah from --name nodebuilder-mail -v "${PWD}:/usr/src:Z" docker.io/library/node:lts
19+
buildah from --name nodebuilder-mail -v "${PWD}:/usr/src:Z" docker.io/library/node:22.16.0-slim
2020
fi
2121

2222
if [[ -n "${SKIP_UI_BUILD}" ]]; then

imageroot/validator-definitions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@
309309
"local": {
310310
"type": "string",
311311
"title": "Address local part",
312-
"minLength": 1
312+
"minLength": 1,
313+
"pattern": "^[a-zA-Z0-9](?:[a-zA-Z0-9._-]*[a-zA-Z0-9])?$"
313314
},
314315
"atype": {
315316
"type": "string",

ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@carbon/icons-vue": "^10.37.0",
1414
"@carbon/vue": "^2.40.0",
15-
"@nethserver/ns8-ui-lib": "^1.2.1",
15+
"@nethserver/ns8-ui-lib": "^1.3.1",
1616
"await-to-js": "^3.0.0",
1717
"axios": "^0.21.2",
1818
"carbon-components": "^10.41.0",

ui/public/i18n/en/translation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@
212212
"type_domain": "Alias",
213213
"type_adduser": "User",
214214
"type_addgroup": "Group",
215-
"address_already_exists": "Address already exists"
215+
"address_already_exists": "Address already exists",
216+
"local_pattern": "Invalid address"
216217
},
217218
"mailboxes": {
218219
"title": "Mailboxes",

ui/public/i18n/it/translation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@
148148
"type_adduser": "Utente",
149149
"destinations_placeholder": "Scegliere le destinazioni o digitare un indirizzo e-mail esterno",
150150
"public": "Pubblico",
151-
"no_address": "Nessun indirizzo"
151+
"no_address": "Nessun indirizzo",
152+
"local_pattern": "Indirizzo non valido"
152153
},
153154
"mailboxes": {
154155
"title": "Caselle postali",

ui/public/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"docs": {
14-
"documentation_url": "https://github.com/NethServer/ns8-mail",
14+
"documentation_url": "https://docs.nethserver.org/projects/ns8/en/latest/mail.html",
1515
"bug_url": "https://github.com/NethServer/dev",
1616
"code_url": "https://github.com/NethServer/ns8-mail"
1717
},

ui/src/components/CreateOrEditAddressModal.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ export default {
362362
}
363363
}
364364
365-
const alterAddressData = {
365+
const createAddressData = {
366366
local: this.local,
367367
internal: this.isInternal,
368368
destinations: destinations,
@@ -372,17 +372,17 @@ export default {
372372
let domainForNotification = "";
373373
374374
if (this.selectedDomainId == "wildcard") {
375-
alterAddressData.atype = "wildcard";
375+
createAddressData.atype = "wildcard";
376376
} else {
377-
alterAddressData.atype = "domain";
378-
alterAddressData.domain = this.selectedDomainId;
377+
createAddressData.atype = "domain";
378+
createAddressData.domain = this.selectedDomainId;
379379
domainForNotification = this.selectedDomainId;
380380
}
381381
382382
const res = await to(
383383
this.createModuleTaskForApp(this.instanceName, {
384384
action: taskAction,
385-
data: alterAddressData,
385+
data: createAddressData,
386386
extra: {
387387
title: this.$t("addresses.create_address_address", {
388388
address: `${this.local}@${domainForNotification}`,

ui/src/components/CreateOrEditDomainModal.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,8 @@ export default {
510510
name: catchallFound.name,
511511
};
512512
}
513+
} else {
514+
alterDomainData.catchall = null;
513515
}
514516
515517
const res = await to(
@@ -643,8 +645,8 @@ export default {
643645
644646
const destFound = this.allDestinationsForUi.find((dui) => {
645647
return (
646-
dui.value ===
647-
`${this.domain.catchall.name}_${this.domain.catchall.dtype}`
648+
dui.value.toLowerCase() ===
649+
`${this.domain.catchall.name}_${this.domain.catchall.dtype}`.toLowerCase()
648650
);
649651
});
650652

ui/src/views/Status.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
:totalFileCountLabel="core.$t('backup.total_file_count')"
151151
:backupDisabledLabel="core.$t('common.disabled')"
152152
:showMoreLabel="core.$t('common.show_more')"
153+
:multipleUncertainStatusLabel="core.$t('backup.some_backups_failed_or_are_pending')"
153154
:moduleId="instanceName"
154155
:moduleUiName="instanceLabel"
155156
:repositories="backupRepositories"

0 commit comments

Comments
 (0)