Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release - release/hosting-collaboration-w2 #14758

Merged
merged 5 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Einen Domainnamen auswΓ€hlen",
"zimbra_account_alias_add_btn_confirm": "BestΓ€tigen",
"zimbra_account_alias_add_success_message": "Ihre Anfrage zur Erstellung eines Alias wurde registriert. Sie wird in KΓΌrze bearbeitet.",
"zimbra_account_alias_add_error_message": "Ihre Anfrage zur Erstellung eines Alias ist fehlgeschlagen. {{ error }}"
"zimbra_account_alias_add_error_message": "Ihre Anfrage zur Erstellung eines Alias ist fehlgeschlagen. {{ error }}",
"zimbra_account_alias_add_btn_cancel": "Abbrechen"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Select a domain name",
"zimbra_account_alias_add_btn_confirm": "Confirm",
"zimbra_account_alias_add_success_message": "Your request to create an alias has been processed. It will be processed in a few moments.",
"zimbra_account_alias_add_error_message": "Your request to create an alias could not be completed. {{ error }}"
"zimbra_account_alias_add_error_message": "Your request to create an alias could not be completed. {{ error }}",
"zimbra_account_alias_add_btn_cancel": "Cancel"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Seleccionar un dominio",
"zimbra_account_alias_add_btn_confirm": "Confirmar",
"zimbra_account_alias_add_success_message": "La solicitud de creaciΓ³n de alias se ha enviado. SerΓ‘ tratada en unos instantes.",
"zimbra_account_alias_add_error_message": "Se ha producido un error al enviar la solicitud de creaciΓ³n del alias. {{ error }}"
"zimbra_account_alias_add_error_message": "Se ha producido un error al enviar la solicitud de creaciΓ³n del alias. {{ error }}",
"zimbra_account_alias_add_btn_cancel": "Cancelar"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"zimbra_account_alias_add_input_email_helper_rule_3": "Les caractΓ¨res spΓ©ciaux ne peuvent pas Γͺtre placΓ©s cΓ΄te Γ  cΓ΄te",
"zimbra_account_alias_add_select_domain_placeholder": "SΓ©lectionner un nom de domaine",
"zimbra_account_alias_add_btn_confirm": "Confirmer",
"zimbra_account_alias_add_btn_cancel": "Annuler",
"zimbra_account_alias_add_success_message": "Votre demande de crΓ©ation d'alias a bien Γ©tΓ© prise en compte. Elle sera traitΓ©e d'ici quelques instants.",
"zimbra_account_alias_add_error_message": "Votre demande de crΓ©ation d'alias n'a pas pu aboutir. {{ error }}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"zimbra_account_alias_add_input_email_helper_rule_3": "Les caractΓ¨res spΓ©ciaux ne peuvent pas Γͺtre placΓ©s cΓ΄te Γ  cΓ΄te",
"zimbra_account_alias_add_select_domain_placeholder": "SΓ©lectionner un nom de domaine",
"zimbra_account_alias_add_btn_confirm": "Confirmer",
"zimbra_account_alias_add_btn_cancel": "Annuler",
"zimbra_account_alias_add_success_message": "Votre demande de crΓ©ation d'alias a bien Γ©tΓ© prise en compte. Elle sera traitΓ©e d'ici quelques instants.",
"zimbra_account_alias_add_error_message": "Votre demande de crΓ©ation d'alias n'a pas pu aboutir. {{ error }}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Selezionare un dominio",
"zimbra_account_alias_add_btn_confirm": "Confermare",
"zimbra_account_alias_add_success_message": "La tua richiesta di creazione dell'alias Γ¨ stata presa in carico. SarΓ  elaborata entro pochi minuti.",
"zimbra_account_alias_add_error_message": "Impossibile completare la richiesta di creazione dell'alias: {{ error }}"
"zimbra_account_alias_add_error_message": "Impossibile completare la richiesta di creazione dell'alias: {{ error }}",
"zimbra_account_alias_add_btn_cancel": "Annulla"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Wybierz nazwΔ™ domeny",
"zimbra_account_alias_add_btn_confirm": "ZatwierdΕΊ",
"zimbra_account_alias_add_success_message": "Dyspozycja utworzenia aliasu zostaΕ‚a przyjΔ™ta. Zostanie przetworzona w ciΔ…gu kilku minut.",
"zimbra_account_alias_add_error_message": "Utworzenie aliasu nie powiodΕ‚o siΔ™. {{error}}"
"zimbra_account_alias_add_error_message": "Utworzenie aliasu nie powiodΕ‚o siΔ™. {{error}}",
"zimbra_account_alias_add_btn_cancel": "Anuluj"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"zimbra_account_alias_add_select_domain_placeholder": "Escolher um nome de domΓ­nio",
"zimbra_account_alias_add_btn_confirm": "Confirmar",
"zimbra_account_alias_add_success_message": "O seu pedido de criação de alias foi registado. SerÑ tratado dentro de alguns instantes.",
"zimbra_account_alias_add_error_message": "O seu pedido de criação de alias não foi bem-sucedido. {{ error }}"
"zimbra_account_alias_add_error_message": "O seu pedido de criação de alias não foi bem-sucedido. {{ error }}",
"zimbra_account_alias_add_btn_cancel": "Anular"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "Ihre Anfrage zum HinzufΓΌgen einer Organisation wurde registriert. Sie wird in KΓΌrze wirksam.",
"zimbra_organization_add_error_message": "Ihre Anfrage zum HinzufΓΌgen einer Organisation ist fehlgeschlagen. {{ error }}",
"zimbra_organization_edit_success_message": "Ihre Γ„nderungsanfrage wurde registriert. Sie wird in KΓΌrze ausgefΓΌhrt.",
"zimbra_organization_edit_error_message": "Ihre Γ„nderungsanfrage ist fehlgeschlagen. {{ error }}"
"zimbra_organization_edit_error_message": "Ihre Γ„nderungsanfrage ist fehlgeschlagen. {{ error }}",
"zimbra_organization_add_cancel": "Abbrechen"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "Your request to add an organisation has been submitted. It will be effective in a few moments.",
"zimbra_organization_add_error_message": "Unable to submit your request to add an organisation. {{ error }}",
"zimbra_organization_edit_success_message": "Your request to edit has been submitted. It will be executed in a few moments.",
"zimbra_organization_edit_error_message": "Unable to submit your request to edit. {{ error }}"
"zimbra_organization_edit_error_message": "Unable to submit your request to edit. {{ error }}",
"zimbra_organization_add_cancel": "Cancel"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "La solicitud de adiciΓ³n de la organizaciΓ³n se ha enviado. SerΓ‘ efectiva en unos instantes.",
"zimbra_organization_add_error_message": "Se ha producido un error al enviar la solicitud de adiciΓ³n de la organizaciΓ³n: {{ error }}",
"zimbra_organization_edit_success_message": "La solicitud de modificaciΓ³n se ha enviado. Se ejecutarΓ‘ en unos instantes.",
"zimbra_organization_edit_error_message": "Se ha producido un error al enviar la solicitud de modificaciΓ³n: {{ error }}"
"zimbra_organization_edit_error_message": "Se ha producido un error al enviar la solicitud de modificaciΓ³n: {{ error }}",
"zimbra_organization_add_cancel": "Cancelar"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"zimbra_organization_add": "Confirmer",
"zimbra_organization_add_cancel": "Annuler",
"zimbra_organization_add_modal_title": "Ajouter une organisation",
"zimbra_organization_add_modal_content_part1": "L'organisation reprΓ©sente un groupement logique de domaines et de boites mails.",
"zimbra_organization_add_modal_content_part2": "Elle permet de dΓ©finir des politiques de gestion groupΓ©es et dΓ©finit l'isolation de vos boites mails (limite de l'annuaire d'entreprise).",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"zimbra_organization_add": "Confirmer",
"zimbra_organization_add_cancel": "Annuler",
"zimbra_organization_add_modal_title": "Ajouter une organisation",
"zimbra_organization_add_modal_content_part1": "L'organisation reprΓ©sente un groupement logique de domaines et de boites mails.",
"zimbra_organization_add_modal_content_part2": "Elle permet de dΓ©finir des politiques de gestion groupΓ©es et dΓ©finit l'isolation de vos boites mails (limite de l'annuaire d'entreprise).",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "La tua richiesta di aggiunta dell'organizzazione Γ¨ stata presa in carico. SarΓ  effettiva entro pochi minuti.",
"zimbra_organization_add_error_message": "La tua richiesta di aggiunta dell'organizzazione non Γ¨ andata a buon fine: {{ error }}",
"zimbra_organization_edit_success_message": "La tua richiesta di modifica Γ¨ stata presa in carico. SarΓ  eseguita entro pochi minuti.",
"zimbra_organization_edit_error_message": "La tua richiesta di modifica non Γ¨ andata a buon fine: {{ error }}"
"zimbra_organization_edit_error_message": "La tua richiesta di modifica non Γ¨ andata a buon fine: {{ error }}",
"zimbra_organization_add_cancel": "Annulla"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "Dyspozycja dodania organizacji zostaΕ‚a przyjΔ™ta. Zostanie wykonana w ciΔ…gu kilku minut.",
"zimbra_organization_add_error_message": "Dodanie organizacji nie powiodΕ‚o siΔ™. {{error}}",
"zimbra_organization_edit_success_message": "Dyspozycja modyfikacji zostaΕ‚a przyjΔ™ta. Zostanie wykonana w ciΔ…gu kilku minut.",
"zimbra_organization_edit_error_message": "Modyfikacja nie powiodΕ‚a siΔ™. {{error}}"
"zimbra_organization_edit_error_message": "Modyfikacja nie powiodΕ‚a siΔ™. {{error}}",
"zimbra_organization_add_cancel": "Anuluj"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"zimbra_organization_add_success_message": "O seu pedido de adição de uma organização foi registado. SerÑ aplicado dentro de alguns instantes.",
"zimbra_organization_add_error_message": "Não foi possível adicionar uma organização. {{ error }}",
"zimbra_organization_edit_success_message": "O seu pedido de modificação foi registado. SerÑ executado dentro de alguns instantes.",
"zimbra_organization_edit_error_message": "Não foi possível realizar o pedido de modificação. {{ error }}"
"zimbra_organization_edit_error_message": "Não foi possível realizar o pedido de modificação. {{ error }}",
"zimbra_organization_add_cancel": "Anular"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "Dieser Organisation ist noch mindestens eine Domain zugeordnet.",
"zimbra_organization_delete_modal_message_disabled_part2": "Bitte lΓΆschen Sie die zugehΓΆrigen Domains, bevor Sie Ihre Organisation lΓΆschen.",
"zimbra_organization_delete_success_message": "Ihre LΓΆschanfrage wurde registriert Sie wird in KΓΌrze ausgefΓΌhrt.",
"zimbra_organization_delete_error_message": "Ihre LΓΆschanfrage ist fehlgeschlagen. {{ error }}"
"zimbra_organization_delete_error_message": "Ihre LΓΆschanfrage ist fehlgeschlagen. {{ error }}",
"zimbra_organization_delete_cancel": "Abbrechen"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "There is at least one domain still linked to this organisation.",
"zimbra_organization_delete_modal_message_disabled_part2": "Please delete the linked domains before deleting your organisation.",
"zimbra_organization_delete_success_message": "Your deletion request has been submitted. It will be executed in a few moments.",
"zimbra_organization_delete_error_message": "Unable to submit your deletion request. {{ error }}"
"zimbra_organization_delete_error_message": "Unable to submit your deletion request. {{ error }}",
"zimbra_organization_delete_cancel": "Cancel"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "Hay al menos un dominio asociado a esta organizaciΓ³n.",
"zimbra_organization_delete_modal_message_disabled_part2": "Por favor, elimine los dominios asociados antes de eliminar la organizaciΓ³n.",
"zimbra_organization_delete_success_message": "La solicitud de eliminaciΓ³n se ha enviado. Se ejecutarΓ‘ en unos instantes.",
"zimbra_organization_delete_error_message": "Se ha producido un error al enviar la solicitud de eliminaciΓ³n: {{ error }}"
"zimbra_organization_delete_error_message": "Se ha producido un error al enviar la solicitud de eliminaciΓ³n: {{ error }}",
"zimbra_organization_delete_cancel": "Cancelar"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"zimbra_organization_delete": "Supprimer",
"zimbra_organization_delete_cancel": "Annuler",
"zimbra_organization_delete_modal_title": "Supprimer l'organisation",
"zimbra_organization_delete_modal_content": "Voulez-vous vraiment supprimer l'organisation ?",
"zimbra_organization_delete_modal_message_disabled_part1": "Au moins un domaine est encore associΓ© Γ  cette organisation.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"zimbra_organization_delete": "Supprimer",
"zimbra_organization_delete_cancel": "Annuler",
"zimbra_organization_delete_modal_title": "Supprimer l'organisation",
"zimbra_organization_delete_modal_content": "Voulez-vous vraiment supprimer l'organisation ?",
"zimbra_organization_delete_modal_message_disabled_part1": "Au moins un domaine est encore associΓ© Γ  cette organisation.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "All'organizzazione Γ¨ ancora associato almeno un dominio.",
"zimbra_organization_delete_modal_message_disabled_part2": "Elimina i domini associati prima di eliminare la tua organizzazione.",
"zimbra_organization_delete_success_message": "La tua richiesta di eliminazione Γ¨ stata presa in carico correttamente. SarΓ  eseguita entro pochi minuti.",
"zimbra_organization_delete_error_message": "La tua richiesta di eliminazione non Γ¨ andata a buon fine. {{ error }}"
"zimbra_organization_delete_error_message": "La tua richiesta di eliminazione non Γ¨ andata a buon fine. {{ error }}",
"zimbra_organization_delete_cancel": "Annulla"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "Co najmniej jedna domena jest nadal powiΔ…zana z tΔ… organizacjΔ….",
"zimbra_organization_delete_modal_message_disabled_part2": "Przed usuniΔ™ciem organizacji usuΕ„ powiΔ…zane domeny.",
"zimbra_organization_delete_success_message": "Dyspozycja usuniΔ™cia zostaΕ‚a przyjΔ™ta. Zostanie wykonana w ciΔ…gu kilku minut.",
"zimbra_organization_delete_error_message": "UsuniΔ™cie nie powiodΕ‚o siΔ™. {{error}}"
"zimbra_organization_delete_error_message": "UsuniΔ™cie nie powiodΕ‚o siΔ™. {{error}}",
"zimbra_organization_delete_cancel": "Anuluj"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"zimbra_organization_delete_modal_message_disabled_part1": "Ainda hÑ pelo menos um domínio associado a esta organização.",
"zimbra_organization_delete_modal_message_disabled_part2": "Elimine os domínios associados antes de suprimir a sua organização.",
"zimbra_organization_delete_success_message": "O pedido de eliminação foi registado. SerÑ executado dentro de alguns instantes.",
"zimbra_organization_delete_error_message": "O seu pedido de eliminação não foi bem-sucedido. {{ error }}"
"zimbra_organization_delete_error_message": "O seu pedido de eliminação não foi bem-sucedido. {{ error }}",
"zimbra_organization_delete_cancel": "Anular"
}
5 changes: 4 additions & 1 deletion packages/manager/apps/zimbra/src/api/account/api.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
import { fetchIcebergV2, v2 } from '@ovh-ux/manager-core-api';
import { AccountBodyParamsType, AccountType } from './type';
import { getApiPath } from '../utils/apiPath';
import { APIV2_DEFAULT_PAGESIZE } from '@/utils';

// GET

export const getZimbraPlatformAccounts = ({
platformId,
queryParameters,
pageParam,
pageSize = APIV2_DEFAULT_PAGESIZE,
}: {
platformId: string;
queryParameters?: {
organizationId?: string;
domainId?: string;
};
pageParam?: unknown;
pageSize?: number;
}) => {
const params = new URLSearchParams(queryParameters).toString();
const queryString = params ? `?${params}` : '';
return fetchIcebergV2<AccountType[]>({
route: `${getApiPath(platformId)}account${queryString}`,
pageSize: 25,
pageSize,
cursor: pageParam as string,
});
};
Expand Down
12 changes: 10 additions & 2 deletions packages/manager/apps/zimbra/src/api/account/key.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ export const getZimbraPlatformAccountsQueryKey = (
organizationId?: string;
domainId?: string;
},
shouldFetchAll?: boolean,
) => {
const params = new URLSearchParams(queryParameters).toString();
const queryString = params ? `?${params}` : '';
return [`get/zimbra/platform/${platformId}/account${queryString}`];
return [
'get',
'account',
'zimbra',
platformId,
queryString,
shouldFetchAll ? 'all' : '',
].filter(Boolean);
};

export const getZimbraPlatformAccountDetailQueryKey = (
platformId: string,
accountId?: string,
) => [`get/zimbra/platform/${platformId}/account/${accountId}`];
) => ['get', 'account', 'zimbra', platformId, accountId];
5 changes: 4 additions & 1 deletion packages/manager/apps/zimbra/src/api/domain/api.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
import { fetchIcebergV2, v2, v6 } from '@ovh-ux/manager-core-api';
import { DomainBodyParamsType, DomainType } from './type';
import { getApiPath } from '../utils/apiPath';
import { APIV2_DEFAULT_PAGESIZE } from '@/utils';

// GET

export const getZimbraPlatformDomains = ({
platformId,
organizationId,
pageParam,
pageSize = APIV2_DEFAULT_PAGESIZE,
}: {
platformId: string;
organizationId?: string;
pageParam?: unknown;
pageSize?: number;
}) =>
fetchIcebergV2<DomainType[]>({
route: `${getApiPath(platformId)}domain${
organizationId ? `?organizationId=${organizationId}` : ''
}`,
pageSize: 25,
pageSize,
cursor: pageParam as string,
});

Expand Down
17 changes: 12 additions & 5 deletions packages/manager/apps/zimbra/src/api/domain/key.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
export const getZimbraPlatformDomainsQueryKey = (
platformId: string,
organizationId?: string,
) => [
`get/zimbra/platform/${platformId}/domain?organizationId=${organizationId}`,
];
shouldFetchAll?: boolean,
) =>
[
'get',
'zimbra',
'domain',
platformId,
shouldFetchAll ? 'all' : '',
organizationId,
].filter(Boolean);

export const getZimbraPlatformDomainQueryKey = (
platformId: string,
domainId: string,
) => [`get/zimbra/platform/${platformId}/domain/${domainId}`];
) => ['get', 'domain', 'zimbra', platformId, domainId];

export const getDomainsZoneListQueryKey = ['get/domain/zone'];
export const getDomainsZoneListQueryKey = ['get', 'domain', 'zone'];
5 changes: 4 additions & 1 deletion packages/manager/apps/zimbra/src/api/organization/api.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import { fetchIcebergV2, v2 } from '@ovh-ux/manager-core-api';
import { OrganizationBodyParamsType, OrganizationType } from './type';
import { getApiPath } from '../utils/apiPath';
import { APIV2_DEFAULT_PAGESIZE } from '@/utils';

// GET

export const getZimbraPlatformOrganization = ({
platformId,
pageParam,
pageSize = APIV2_DEFAULT_PAGESIZE,
}: {
platformId: string;
pageParam?: unknown;
pageSize?: number;
}) =>
fetchIcebergV2<OrganizationType[]>({
route: `${getApiPath(platformId)}organization`,
pageSize: 25,
pageSize,
cursor: pageParam as string,
});

Expand Down
16 changes: 12 additions & 4 deletions packages/manager/apps/zimbra/src/api/organization/key.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
export const getZimbraPlatformOrganizationQueryKey = (platformId: string) => [
`get/zimbra/platform/${platformId}/organization`,
];
export const getZimbraPlatformOrganizationQueryKey = (
platformId: string,
shouldFetchAll?: boolean,
) =>
[
'get',
'organization',
'zimbra',
platformId,
shouldFetchAll ? 'all' : '',
].filter(Boolean);

export const getZimbraPlatformOrganizationDetailsQueryKey = (
platformId: string,
organizationId: string,
) => [`get/zimbra/platform/${platformId}/organization/${organizationId}`];
) => ['get', 'organization', 'zimbra', platformId, organizationId];
Loading
Loading