)}
+
{policyState.action === ACTIONS.REDIRECT_TO_POOL && (
)}
+
void;
};
+
export default function RuleForm({
rule,
onSubmit,
submitButtonText,
onCancel,
-}: RuleFormProps) {
+}: Readonly) {
const { t } = useTranslation('l7/rules/rules-form');
const { t: tPciCommon } = useTranslation('pci-common');
const [formState, setFormState] = useState({
@@ -145,7 +146,6 @@ export default function RuleForm({
>
{
setFormState((state) => ({
@@ -277,7 +273,6 @@ export default function RuleForm({
{
setFormState((state) => ({
...state,
diff --git a/packages/manager/apps/pci-load-balancer/src/components/listing/Actions.component.tsx b/packages/manager/apps/pci-load-balancer/src/components/listing/Actions.component.tsx
index 408ec1aad459..d17aa71405e4 100644
--- a/packages/manager/apps/pci-load-balancer/src/components/listing/Actions.component.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/components/listing/Actions.component.tsx
@@ -10,7 +10,7 @@ type ActionsComponentProps = {
export default function ActionsComponent({
loadBalancer,
}: Readonly) {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const loadBalancerDetailHref = useHref(
`../${loadBalancer.region}/${loadBalancer.id}`,
diff --git a/packages/manager/apps/pci-load-balancer/src/components/listing/OperatingStatus.component.tsx b/packages/manager/apps/pci-load-balancer/src/components/listing/OperatingStatus.component.tsx
index 23b29afc386d..48dc3a8d861c 100644
--- a/packages/manager/apps/pci-load-balancer/src/components/listing/OperatingStatus.component.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/components/listing/OperatingStatus.component.tsx
@@ -14,7 +14,7 @@ export default function OperatingStatusComponent({
status,
className,
}: Readonly) {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const chipAttribute: OdsChipAttribute = useMemo(() => {
switch (status) {
diff --git a/packages/manager/apps/pci-load-balancer/src/components/listing/ProvisioningStatus.component.tsx b/packages/manager/apps/pci-load-balancer/src/components/listing/ProvisioningStatus.component.tsx
index db044e31b639..0c23c8059dd9 100644
--- a/packages/manager/apps/pci-load-balancer/src/components/listing/ProvisioningStatus.component.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/components/listing/ProvisioningStatus.component.tsx
@@ -14,7 +14,7 @@ export default function ProvisioningStatusComponent({
status,
className,
}: Readonly) {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const chipAttribute: OdsChipAttribute = useMemo(() => {
switch (status) {
diff --git a/packages/manager/apps/pci-load-balancer/src/helpers/index.ts b/packages/manager/apps/pci-load-balancer/src/helpers/index.ts
index 216c2850bd41..526ab65a3110 100644
--- a/packages/manager/apps/pci-load-balancer/src/helpers/index.ts
+++ b/packages/manager/apps/pci-load-balancer/src/helpers/index.ts
@@ -5,7 +5,7 @@ import * as dateFnsLocales from 'date-fns/locale';
import { useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { getDateFnsLocale } from '@ovh-ux/manager-core-utils';
-import { THealthMonitor, THealthMonitorType } from '@/api/data/health-monitor';
+import { THealthMonitorType } from '@/api/data/health-monitor';
import { HEALTH_MONITOR_TYPE } from '@/constants';
export const paginateResults = (
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/create/Create.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/create/Create.page.tsx
index 49dfeada5b4b..8212567de7bc 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/create/Create.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/create/Create.page.tsx
@@ -94,8 +94,8 @@ export default function CreatePage(): JSX.Element {
const { projectId } = useParams();
- const { t } = useTranslation('octavia-load-balancer');
- const { t: tCreate } = useTranslation('create');
+ const { t } = useTranslation('load-balancer');
+ const { t: tCreate } = useTranslation('load-balancer/create');
const { t: tCommon } = useTranslation('pci-common');
const { t: tRegionsList } = useTranslation('regions-list');
@@ -257,7 +257,7 @@ export default function CreatePage(): JSX.Element {
type: 'navigation',
});
addSuccess(
-
+
{(_t) => _t('octavia_load_balancer_create_banner')}
,
false,
@@ -270,7 +270,7 @@ export default function CreatePage(): JSX.Element {
type: 'navigation',
});
addError(
-
+
{(_t) => (
-
+
{(_t) => (
) => {
- const { t: tCreate } = useTranslation('create');
+ const { t: tCreate } = useTranslation('load-balancer/create');
const { getFormattedHourlyCatalogPrice } = useCatalogPrice();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/delete/Delete.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/delete/Delete.page.tsx
index ff47216f3c58..29f1934aa597 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/delete/Delete.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/delete/Delete.page.tsx
@@ -13,7 +13,7 @@ import {
export default function DeletePage() {
const { addSuccess, addError } = useNotifications();
- const { t: tDelete } = useTranslation('delete');
+ const { t: tDelete } = useTranslation('load-balancer/delete');
const navigate = useNavigate();
const { projectId, loadBalancerId, region } = useParams();
const onClose = () => {
@@ -36,7 +36,7 @@ export default function DeletePage() {
loadBalancer,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -50,7 +50,7 @@ export default function DeletePage() {
},
onSuccess() {
addSuccess(
-
+
{(_t) => _t('octavia_load_balancer_delete_success')}
,
true,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/Detail.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/Detail.page.tsx
index 0a244963aab5..260e0f8b2514 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/Detail.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/Detail.page.tsx
@@ -21,7 +21,7 @@ import { useLoadBalancer } from '@/api/hook/useLoadBalancer';
import TabsPanel from '@/components/detail/TabsPanel.component';
export default function DetailPage() {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const [activePanelTranslation, setActivePanelTranslation] = useState(null);
const location = useLocation();
@@ -51,13 +51,11 @@ export default function DetailPage() {
{
name: 'octavia_load_balancer_statistics_tab_title',
title: t('octavia_load_balancer_statistics_tab_title'),
- to: useResolvedPath(ROUTE_PATHS.STATISTICS).pathname,
isDisabled: true,
},
{
name: 'octavia_load_balancer_certificates_tab_title',
title: t('octavia_load_balancer_certificates_tab_title'),
- to: useResolvedPath(ROUTE_PATHS.CERTIFICATES).pathname,
isDisabled: true,
},
{
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/edit/Edit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/edit/Edit.page.tsx
index 94545d9566d8..0d72f3762dd3 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/edit/Edit.page.tsx
@@ -15,7 +15,7 @@ import LabelComponent from '@/components/form/Label.component';
export default function Edit() {
const { addSuccess, addError } = useNotifications();
- const { t: tEditName } = useTranslation('edit-name');
+ const { t: tEditName } = useTranslation('load-balancer/edit-name');
const { projectId, region, loadBalancerId } = useParams();
const navigate = useNavigate();
const onClose = () => {
@@ -39,7 +39,7 @@ export default function Edit() {
name: loadBalancerName,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/Listeners.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/Listeners.page.tsx
index 2ccffb385f38..f2fbe8a774d8 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/Listeners.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/Listeners.page.tsx
@@ -10,7 +10,7 @@ import { Outlet } from 'react-router-dom';
import { DISCOVER_LINK } from '@/constants';
export default function Listeners() {
- const { t } = useTranslation('octavia-load-balancer-listeners');
+ const { t } = useTranslation('listeners');
return (
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/create/Create.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/create/Create.page.tsx
index 9e5c7238852f..4ab1dc4fba16 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/create/Create.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/create/Create.page.tsx
@@ -1,16 +1,27 @@
import { ApiError } from '@ovh-ux/manager-core-api';
import { useNotifications } from '@ovh-ux/manager-react-components';
+import { useState } from 'react';
import { Translation } from 'react-i18next';
import { useNavigate, useParams } from 'react-router-dom';
-import { useCreateListener } from '@/api/hook/useLoadBalancer';
-import ListenerForm from '@/components/detail/listeners/ListenerForm.page';
+import ListenerForm, {
+ TListenerFormState,
+} from '@/components/form/ListenerForm.page';
import { useAllLoadBalancerPools } from '@/api/hook/usePool';
+import { useCreateListener } from '@/api/hook/useLoadBalancer';
+import { TProtocol } from '@/api/data/load-balancer';
export default function CreateListener() {
const navigate = useNavigate();
const { projectId, region, loadBalancerId } = useParams();
const { addSuccess, addError } = useNotifications();
+ const [formState, setFormState] = useState
({
+ name: '',
+ protocol: '' as TProtocol,
+ port: 1,
+ pool: null,
+ });
+
const { data: pools } = useAllLoadBalancerPools({
projectId,
region,
@@ -23,7 +34,7 @@ export default function CreateListener() {
loadBalancerId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -31,16 +42,17 @@ export default function CreateListener() {
})
}
,
+
true,
);
navigate('..');
},
onSuccess() {
addSuccess(
-
+
{(_t) =>
_t('octavia_load_balancer_listeners_create_success', {
- listener: '??',
+ listener: formState?.name,
})
}
,
@@ -52,6 +64,8 @@ export default function CreateListener() {
return (
navigate('..')}
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/delete/DeleteListener.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/delete/DeleteListener.page.tsx
index 4b596d8664bf..41a7c96e1a89 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/delete/DeleteListener.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/delete/DeleteListener.page.tsx
@@ -30,7 +30,7 @@ export default function DeleteListenerPage() {
region,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -44,7 +44,7 @@ export default function DeleteListenerPage() {
},
onSuccess() {
addSuccess(
-
+
{(_t) =>
_t('octavia_load_balancer_listener_delete_success', {
listener: listener?.name,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/edit/Edit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/edit/Edit.page.tsx
index ddc524748099..1f7ef0f7a9c7 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/edit/Edit.page.tsx
@@ -1,17 +1,28 @@
import { ApiError } from '@ovh-ux/manager-core-api';
import { useNotifications } from '@ovh-ux/manager-react-components';
+import { useEffect, useState } from 'react';
import { Translation } from 'react-i18next';
import { useNavigate, useParams } from 'react-router-dom';
-import ListenerForm from '@/components/detail/listeners/ListenerForm.page';
-import { useEditLoadBalancer } from '@/api/hook/useLoadBalancer';
+import { TProtocol } from '@/api/data/load-balancer';
import { useListener } from '@/api/hook/useListener';
+import { useEditLoadBalancer } from '@/api/hook/useLoadBalancer';
import { useAllLoadBalancerPools } from '@/api/hook/usePool';
+import ListenerForm, {
+ TListenerFormState,
+} from '@/components/form/ListenerForm.page';
export default function EditListener() {
const navigate = useNavigate();
const { projectId, region, loadBalancerId, listenerId } = useParams();
const { addSuccess, addError } = useNotifications();
+ const [formState, setFormState] = useState({
+ name: '',
+ protocol: '' as TProtocol,
+ port: 1,
+ pool: null,
+ });
+
const { data: pools } = useAllLoadBalancerPools({
projectId,
region,
@@ -31,7 +42,7 @@ export default function EditListener() {
listenerId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -45,10 +56,10 @@ export default function EditListener() {
},
onSuccess() {
addSuccess(
-
+
{(_t) =>
_t('octavia_load_balancer_listeners_edit_success', {
- listener: '??',
+ listener: formState?.name,
})
}
,
@@ -58,9 +69,21 @@ export default function EditListener() {
},
});
+ useEffect(() => {
+ if (listener && pools?.length) {
+ setFormState({
+ name: listener.name,
+ protocol: listener.protocol,
+ port: listener.port,
+ pool: pools.find((pool) => pool.id === listener.defaultPoolId) ?? null,
+ });
+ }
+ }, [listener, pools]);
+
return (
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -53,7 +53,7 @@ export default function CreatePage() {
onSuccess(newPolicy) {
const l7RulesCreationLink = `${projectUrl}/octavia-load-balancer/${region}/${loadBalancerId}/listeners/${listenerId}/l7/${newPolicy?.id}/rules/create`;
addSuccess(
-
+
{(_t) => (
{
@@ -28,7 +28,7 @@ export default function DeletePage() {
policyId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -42,7 +42,7 @@ export default function DeletePage() {
},
onSuccess() {
addSuccess(
-
+
{(_t) =>
_t('octavia_load_balancer_list_l7_policies_delete_success', {
policy: policy?.name,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/edit/Edit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/edit/Edit.page.tsx
index 14164532bdbd..aa2829cf1b7e 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/edit/Edit.page.tsx
@@ -5,13 +5,13 @@ import { ApiError } from '@ovh-ux/manager-core-api';
import { ODS_SPINNER_SIZE } from '@ovhcloud/ods-components';
import { OsdsSpinner } from '@ovhcloud/ods-components/react';
import { useGetPolicy, useUpdatePolicy } from '@/api/hook/useL7Policy';
-import PolicyForm from '@/components/detail/listeners/l7/PolicyForm.component';
+import PolicyForm from '@/components/form/PolicyForm.component';
import { useListener } from '@/api/hook/useListener';
import { useAllLoadBalancerPools } from '@/api/hook/usePool';
export default function EditPage() {
const { addSuccess, addError } = useNotifications();
- const { t } = useTranslation('octavia-load-balancer-l7-edit');
+ const { t } = useTranslation('l7/edit');
const {
listenerId,
projectId,
@@ -43,7 +43,7 @@ export default function EditPage() {
region,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -56,7 +56,7 @@ export default function EditPage() {
},
onSuccess(updatedPolicy) {
addSuccess(
-
+
{(_t) => (
) {
- const { t } = useTranslation('octavia-load-balancer-l7');
+ const { t } = useTranslation('l7');
const items = [
{
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/List.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/List.page.tsx
index 2c3ec961e56b..31cfe803f8b8 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/List.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/List.page.tsx
@@ -32,7 +32,7 @@ import { useL7Policies } from '@/api/hook/useL7Policy';
import { useL7PoliciesDatagridColumn } from '@/pages/detail/listeners/l7/list/useL7PoliciesDatagridColumn';
export default function L7PoliciesList() {
- const { t } = useTranslation('octavia-load-balancer-l7');
+ const { t } = useTranslation('l7');
const { t: tFilter } = useTranslation('filter');
const { projectId, region, listenerId } = useParams();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/useL7PoliciesDatagridColumn.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/useL7PoliciesDatagridColumn.tsx
index 2b400183672a..734af0a9b176 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/useL7PoliciesDatagridColumn.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/list/useL7PoliciesDatagridColumn.tsx
@@ -15,11 +15,11 @@ import {
import OperatingStatusComponent from '@/components/listing/OperatingStatus.component';
import ProvisioningStatusComponent from '@/components/listing/ProvisioningStatus.component';
import { TL7Policy } from '@/api/data/l7Policies';
-import ActionsComponent from '@/components/detail/listeners/l7/Actions.component';
+import ActionsComponent from '@/pages/detail/listeners/l7/list/Actions.component';
export const useL7PoliciesDatagridColumn = () => {
- const { t: tLoadBalancer } = useTranslation('octavia-load-balancer');
- const { t: tL7Policies } = useTranslation('octavia-load-balancer-l7');
+ const { t: tLoadBalancer } = useTranslation('load-balancer');
+ const { t: tL7Policies } = useTranslation('l7');
const navigate = useNavigate();
const columns: DatagridColumn[] = [
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/L7Rules.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/L7Rules.page.tsx
index 6fc2cba9d86f..9086d9b22dda 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/L7Rules.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/L7Rules.page.tsx
@@ -25,11 +25,11 @@ import { ROUTE_PATHS } from '@/routes';
export default function L7RulesPage() {
const { t: tPciCommon } = useTranslation('pci-common');
- const { t: tL7Policies } = useTranslation('octavia-load-balancer-l7');
+ const { t: tL7Policies } = useTranslation('l7');
const { t } = useTranslation('l7/rules');
const hrefProject = useProjectUrl('public-cloud');
- const { t: tLoadBalancer } = useTranslation('octavia-load-balancer');
- const { t: tListener } = useTranslation('octavia-load-balancer-listeners');
+ const { t: tLoadBalancer } = useTranslation('load-balancer');
+ const { t: tListener } = useTranslation('listeners');
const { projectId, loadBalancerId, region, listenerId } = useParams();
const { data: project } = useProject();
const { data: listener } = useListener({
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/create/Create.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/create/Create.page.tsx
index 2813ad836a79..4e916129672d 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/create/Create.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/create/Create.page.tsx
@@ -4,7 +4,7 @@ import { ApiError } from '@ovh-ux/manager-core-api';
import { useNotifications } from '@ovh-ux/manager-react-components';
import { ODS_SPINNER_SIZE } from '@ovhcloud/ods-components';
import { OsdsSpinner } from '@ovhcloud/ods-components/react';
-import RuleForm from '@/components/detail/listeners/l7/rules/RuleForm.component';
+import RuleForm from '@/components/form/RuleForm.component';
import { useCreateL7Rule } from '@/api/hook/useL7Rule';
export default function CreatePage() {
@@ -18,7 +18,7 @@ export default function CreatePage() {
region,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/delete/Delete.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/delete/Delete.page.tsx
index aacac9701e13..c9bed26745a2 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/delete/Delete.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/delete/Delete.page.tsx
@@ -23,7 +23,7 @@ export default function DeletePage() {
ruleId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/edit/Edit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/edit/Edit.page.tsx
index 44dd72090611..7d4c71b44fbb 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/edit/Edit.page.tsx
@@ -4,7 +4,7 @@ import { ApiError } from '@ovh-ux/manager-core-api';
import { useNotifications } from '@ovh-ux/manager-react-components';
import { ODS_SPINNER_SIZE } from '@ovhcloud/ods-components';
import { OsdsSpinner } from '@ovhcloud/ods-components/react';
-import RuleForm from '@/components/detail/listeners/l7/rules/RuleForm.component';
+import RuleForm from '@/components/form/RuleForm.component';
import { useGetL7Rule, useUpdateL7Rule } from '@/api/hook/useL7Rule';
export default function UpdatePage() {
@@ -17,7 +17,7 @@ export default function UpdatePage() {
region,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/components/detail/listeners/l7/rules/Actions.component.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/Actions.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-load-balancer/src/components/detail/listeners/l7/rules/Actions.component.tsx
rename to packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/Actions.component.tsx
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/useL7RulesDatagridColumn.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/useL7RulesDatagridColumn.tsx
index f0e4fbc57627..65dd5bb735c3 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/useL7RulesDatagridColumn.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/listeners/l7/rules/list/useL7RulesDatagridColumn.tsx
@@ -8,11 +8,11 @@ import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
import { OsdsIcon } from '@ovhcloud/ods-components/react';
import OperatingStatusComponent from '@/components/listing/OperatingStatus.component';
import ProvisioningStatusComponent from '@/components/listing/ProvisioningStatus.component';
-import ActionsComponent from '@/components/detail/listeners/l7/rules/Actions.component';
+import ActionsComponent from '@/pages/detail/listeners/l7/rules/list/Actions.component';
import { TL7Rule } from '@/api/data/l7Rules';
export const useL7RulesDatagridColumn = () => {
- const { t: tLoadBalancer } = useTranslation('octavia-load-balancer');
+ const { t: tLoadBalancer } = useTranslation('load-balancer');
const { t: tL7Policies } = useTranslation('l7/rules/list');
const columns: DatagridColumn[] = [
{
@@ -88,6 +88,7 @@ export const useL7RulesDatagridColumn = () => {
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/overview/GeneralInformation.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/overview/GeneralInformation.tsx
index 379e5f9f08a9..d220edcaec7b 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/overview/GeneralInformation.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/overview/GeneralInformation.tsx
@@ -33,7 +33,7 @@ export default function GeneralInformation({
loadBalancerCreationDate,
loadBalancerId,
}: GeneralInformationProps) {
- const { t: tOverview } = useTranslation('octavia_load_balancer_overview');
+ const { t } = useTranslation('load-balancer/overview');
const editNameHref = useHref('./edit-name');
@@ -51,13 +51,13 @@ export default function GeneralInformation({
level={ODS_TEXT_LEVEL.heading}
color={ODS_THEME_COLOR_INTENT.text}
>
- {tOverview('octavia_load_balancer_overview_info_title')}
+ {t('octavia_load_balancer_overview_info_title')}
{loadBalancerName}
-
-
+
-
+ size={ODS_BUTTON_SIZE.sm}
+ variant={ODS_BUTTON_VARIANT.ghost}
+ href={editNameHref}
+ >
+
+
+
}
/>
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/Pools.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/Pools.page.tsx
index a3cc9809fa5c..d995f3600948 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/Pools.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/Pools.page.tsx
@@ -10,7 +10,7 @@ import { Outlet } from 'react-router-dom';
import { DISCOVER_LINK } from '@/constants';
export default function Pools() {
- const { t } = useTranslation('octavia-load-balancer-pools');
+ const { t } = useTranslation('pools');
return (
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/create/PoolsCreate.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/create/PoolsCreate.page.tsx
index fa493a2491e3..78574903f4ce 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/create/PoolsCreate.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/create/PoolsCreate.page.tsx
@@ -58,7 +58,7 @@ export default function PoolsCreatePage() {
});
addError(
-
+
{(_t) => (
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
@@ -45,7 +45,7 @@ export default function DeletePoolPage() {
},
onSuccess() {
addSuccess(
-
+
{(_t) =>
_t('octavia_load_balancer_pools_components_delete_success', {
pool: poolName,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/Detail.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/Detail.page.tsx
index 74ab14f84a1d..8e154b557026 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/Detail.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/Detail.page.tsx
@@ -23,9 +23,9 @@ import { useGetPool } from '@/api/hook/usePool';
export default function PoolDetailPage() {
const { t: tCommon } = useTranslation('pci-common');
- const { t: tLoadBalancer } = useTranslation('octavia-load-balancer');
- const { t: tPools } = useTranslation('octavia-load-balancer-pools');
- const { t: tPoolsDetail } = useTranslation('load-balancer-pools-detail');
+ const { t: tLoadBalancer } = useTranslation('load-balancer');
+ const { t: tPools } = useTranslation('pools');
+ const { t: tPoolsDetail } = useTranslation('pools/detail');
const [activePanelTranslation, setActivePanelTranslation] = useState(null);
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/HealthMonitor.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/HealthMonitor.tsx
index cd09450cc48a..cd5fd1e8a82c 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/HealthMonitor.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/HealthMonitor.tsx
@@ -1,7 +1,4 @@
-import {
- Notifications,
- RedirectionGuard,
-} from '@ovh-ux/manager-react-components';
+import { RedirectionGuard } from '@ovh-ux/manager-react-components';
import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
import {
ODS_BUTTON_SIZE,
@@ -32,10 +29,7 @@ import ProvisioningStatusComponent from '@/components/listing/ProvisioningStatus
import { HEALTH_MONITOR_TYPE, LABELS } from '@/constants';
export default function HealthMonitor() {
- const { t } = useTranslation([
- 'octavia-load-balancer-health-monitor',
- 'octavia-load-balancer',
- ]);
+ const { t } = useTranslation(['health-monitor', 'load-balancer']);
const { projectId, region, poolId } = useParams();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/create/HealthMonitorCreate.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/create/HealthMonitorCreate.page.tsx
index 99241eb58be9..7b078d76a513 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/create/HealthMonitorCreate.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/create/HealthMonitorCreate.page.tsx
@@ -15,7 +15,7 @@ import {
import { THealthMonitorFormState } from '@/api/data/health-monitor';
export default function HealthMonitorCreatePage() {
- const { t } = useTranslation('octavia-load-balancer-health-monitor-create');
+ const { t } = useTranslation('health-monitor/create');
const navigate = useNavigate();
const { addSuccess, addError } = useNotifications();
@@ -55,7 +55,7 @@ export default function HealthMonitorCreatePage() {
addError(
,
true,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/delete/DeleteHealthMonitor.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/delete/DeleteHealthMonitor.page.tsx
index af49dc48cdea..0f43dc9dd9c6 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/delete/DeleteHealthMonitor.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/delete/DeleteHealthMonitor.page.tsx
@@ -13,7 +13,7 @@ import {
} from '@/api/hook/useHealthMonitor';
export default function DeleteHealthMonitorPage() {
- const { t } = useTranslation('octavia-load-balancer-health-monitor-delete');
+ const { t } = useTranslation('health-monitor/delete');
const navigate = useNavigate();
const { addSuccess, addError } = useNotifications();
@@ -46,7 +46,7 @@ export default function DeleteHealthMonitorPage() {
addError(
,
true,
@@ -94,7 +94,7 @@ export default function DeleteHealthMonitorPage() {
>
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/edit/HealthMonitorEdit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/edit/HealthMonitorEdit.page.tsx
index bd0ec402f3dc..631a3ac3be00 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/edit/HealthMonitorEdit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/edit/HealthMonitorEdit.page.tsx
@@ -13,7 +13,7 @@ import { THealthMonitorFormState } from '@/api/data/health-monitor';
import { isTypeHttpOrHttps } from '@/helpers';
export default function HealthMonitorEditPage() {
- const { t } = useTranslation('octavia-load-balancer-health-monitor-edit');
+ const { t } = useTranslation('health-monitor/edit');
const navigate = useNavigate();
const { addSuccess, addError } = useNotifications();
@@ -45,7 +45,7 @@ export default function HealthMonitorEditPage() {
addError(
,
true,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/rename/RenameHealthMonitor.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/rename/RenameHealthMonitor.page.tsx
index bf2777efb3dd..4922f9402609 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/rename/RenameHealthMonitor.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/health-monitor/rename/RenameHealthMonitor.page.tsx
@@ -19,12 +19,8 @@ import {
} from '@/api/hook/useHealthMonitor';
export default function RenameHealthMonitorPage() {
- const { t } = useTranslation(
- 'octavia-load-balancer-health-monitor-edit-name',
- );
- const { t: tForm } = useTranslation(
- 'octavia-load-balancer-health-monitor-form',
- );
+ const { t } = useTranslation('health-monitor/edit-name');
+ const { t: tForm } = useTranslation('health-monitor/form');
const { t: tCommon } = useTranslation('pci-common');
const navigate = useNavigate();
@@ -55,7 +51,7 @@ export default function RenameHealthMonitorPage() {
addError(
,
true,
);
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/create/Create.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/create/Create.page.tsx
index 83e56300d8f8..1fb4f8fa65bc 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/create/Create.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/create/Create.page.tsx
@@ -39,7 +39,7 @@ export default function CreatePage() {
poolId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/delete/Delete.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/delete/Delete.page.tsx
index 3f2b5d740e52..9ba77c1ef097 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/delete/Delete.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/delete/Delete.page.tsx
@@ -32,7 +32,7 @@ export default function DeletePage() {
memberId,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/edit/Edit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/edit/Edit.page.tsx
index 39499b97e986..dfb72e04d5df 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/edit/Edit.page.tsx
@@ -41,7 +41,7 @@ export default function EditPage() {
name: memberName,
onError(error: ApiError) {
addError(
-
+
{(_t) =>
_t('octavia_load_balancer_global_error', {
message: error?.response?.data?.message || error?.message || null,
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/List.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/List.page.tsx
index b97544e773f9..c8999514186b 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/List.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/List.page.tsx
@@ -31,7 +31,7 @@ import { usePoolMemberDatagridColumn } from './usePoolMemberDatagridColumn';
export default function PoolMemberList() {
const { t } = useTranslation('pools/members/list');
- const { t: tPoolDetail } = useTranslation('load-balancer-pools-detail');
+ const { t: tPoolDetail } = useTranslation('pools/detail');
const { t: tFilter } = useTranslation('filter');
const { projectId, region, poolId } = useParams();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/usePoolMemberDatagridColumn.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/usePoolMemberDatagridColumn.tsx
index e8e34e455864..e2deb073610e 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/usePoolMemberDatagridColumn.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/members/list/usePoolMemberDatagridColumn.tsx
@@ -9,7 +9,7 @@ import { TPoolMember } from '@/api/data/pool-member';
import ActionsComponent from '@/components/detail/pools/members/Actions.component';
export const usePoolMemberDatagridColumn = () => {
- const { t: tLoadBalancer } = useTranslation('octavia-load-balancer');
+ const { t: tLoadBalancer } = useTranslation('load-balancer');
const { t: tPoolMembers } = useTranslation('pools/members/list');
const columns: DatagridColumn[] = [
{
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/overview/PoolOverview.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/overview/PoolOverview.tsx
index faa1181190ae..7d0ec6f3b4ab 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/overview/PoolOverview.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/detail/overview/PoolOverview.tsx
@@ -27,12 +27,10 @@ import OperatingStatusComponent from '@/components/listing/OperatingStatus.compo
import ProvisioningStatusComponent from '@/components/listing/ProvisioningStatus.component';
export default function PoolOverview() {
- const { t } = useTranslation('octavia-load-balancer');
- const { t: tPools } = useTranslation('octavia-load-balancer-pools');
- const { t: tPoolDetail } = useTranslation('load-balancer-pools-detail');
- const { t: tPoolOverview } = useTranslation(
- 'octavia-load-balancer-pools-detail-overview',
- );
+ const { t } = useTranslation('load-balancer');
+ const { t: tPools } = useTranslation('pools');
+ const { t: tPoolDetail } = useTranslation('pools/detail');
+ const { t: tPoolOverview } = useTranslation('pools/overview');
const { projectId, region, poolId } = useParams();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/edit/PoolsEdit.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/edit/PoolsEdit.page.tsx
index d00d0fab7dcc..c8096c690023 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/edit/PoolsEdit.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/detail/pools/edit/PoolsEdit.page.tsx
@@ -63,7 +63,7 @@ export default function PoolsEditPage(): JSX.Element {
});
addError(
-
+
{(_t) => (
{
- const { t } = useTranslation('octavia-load-balancer');
- const { t: tPools } = useTranslation('octavia-load-balancer-pools');
+ const { t } = useTranslation('load-balancer');
+ const { t: tPools } = useTranslation('pools');
const columns: DatagridColumn[] = [
{
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/listing/Listing.page.tsx b/packages/manager/apps/pci-load-balancer/src/pages/listing/Listing.page.tsx
index 2ac434858560..d1e4b0910506 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/listing/Listing.page.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/listing/Listing.page.tsx
@@ -35,7 +35,7 @@ import { useDatagridColumn } from '@/pages/listing/useDatagridColumn';
import { useLoadBalancers } from '@/api/hook/useLoadBalancer';
export default function ListingPage() {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const { t: tFilter } = useTranslation('filter');
const { projectId } = useParams();
diff --git a/packages/manager/apps/pci-load-balancer/src/pages/listing/useDatagridColumn.tsx b/packages/manager/apps/pci-load-balancer/src/pages/listing/useDatagridColumn.tsx
index 1c595da2e3cf..f3466604e486 100644
--- a/packages/manager/apps/pci-load-balancer/src/pages/listing/useDatagridColumn.tsx
+++ b/packages/manager/apps/pci-load-balancer/src/pages/listing/useDatagridColumn.tsx
@@ -13,7 +13,7 @@ import ActionsComponent from '@/components/listing/Actions.component';
import CreationDate from '@/components/listing/CreationDate.component';
export const useDatagridColumn = () => {
- const { t } = useTranslation('octavia-load-balancer');
+ const { t } = useTranslation('load-balancer');
const columns: DatagridColumn[] = [
{
diff --git a/packages/manager/modules/manager-pci-common/src/components/quantity-selector/QuantitySelector.component.tsx b/packages/manager/modules/manager-pci-common/src/components/quantity-selector/QuantitySelector.component.tsx
index 24e78fde1bd6..7886a9697bf9 100644
--- a/packages/manager/modules/manager-pci-common/src/components/quantity-selector/QuantitySelector.component.tsx
+++ b/packages/manager/modules/manager-pci-common/src/components/quantity-selector/QuantitySelector.component.tsx
@@ -23,7 +23,6 @@ import { useTranslation } from 'react-i18next';
import React, { useEffect, useState } from 'react';
import '../../translations/quantity-selector';
-import { clsx } from 'clsx';
export interface QuantitySelectorProps {
label?: string;