Skip to content

Commit 37eddd2

Browse files
feat(pci-instances): allow user to select new region for unavailable flavor
ref: #TAPC-4635, #TAPC-5212, #TAPC-4598 Signed-off-by: tsiorifamonjena <[email protected]> Co-authored-by: CDS Translator Agent <[email protected]>
1 parent a0e8452 commit 37eddd2

File tree

19 files changed

+460
-121
lines changed

19 files changed

+460
-121
lines changed

packages/manager/apps/pci-instances/public/translations/creation/Messages_de_DE.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Erweiterte Einstellungen",
44
"pci_instances_creation_quantity_title": "Wählen Sie eine Menge",
55
"pci_instances_creation_quantity_label": "Anzahl der zu erstellenden Instanzen",
6-
"pci_instance_creation_quantity_rule": "Ihr aktuelles Kontingent erlaubt es Ihnen, gleichzeitig bis zu {{ quota }} Instanz(en) vom Typ {{ type }} für die Region {{ region }} zu erstellen.",
6+
"pci_instance_creation_quantity_rule": "Ihr aktuelles Kontingent erlaubt es Ihnen, gleichzeitig bis zu {{ quota }} Instanz(en) vom Typ {{ type }} für die Region {{ region }} zu erstellen. <Link>Überprüfen Sie Ihr Kontingent.</Link>",
77
"pci_instance_creation_choose_localization_title": "Wählen Sie einen Standort",
88
"pci_instance_creation_select_localization_label": "Wählen Sie einen Standort aus: ",
99
"pci_instance_creation_continue_order": "Meine Bestellung fortsetzen",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_help": "Dieses Modell ist in Ihrer ausgewählten Region nicht verfügbar. Sie können es jedoch auswählen, müssen aber eine andere Region für dieses Modell wählen.",
3232
"pci_instance_creation_flavor_unavailable_quota": "Quota nicht verfügbar",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "Ihr Kontingent erlaubt es Ihnen nicht, dieses Instanzmodell auszuwählen. Bitte erhöhen Sie Ihr Kontingent.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Wählen Sie eine neue Region",
36+
"pci_instance_creation_select_new_region_label": "Wählen Sie eine Region aus",
37+
"pci_instance_creation_select_new_region_for_flavor": "Dieses Modell <strong>({{ flavor }})</strong> ist in Ihrer <strong>ausgewählten Region</strong> nicht verfügbar. Sie können es jedoch auswählen, müssen aber eine andere verfügbare Region für dieses Modell wählen.",
38+
"pci_instance_creation_select_new_region": "Wählen Sie eine Region aus"
3539
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_en_GB.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Advanced settings",
44
"pci_instances_creation_quantity_title": "Choose a quantity",
55
"pci_instances_creation_quantity_label": "Number of instances to create",
6-
"pci_instance_creation_quantity_rule": "Your current quota allows you to create up to {{ quota }} instance(s) of type {{ type }} for the {{ region }} region simultaneously.",
6+
"pci_instance_creation_quantity_rule": "Your current quota allows you to create up to {{ quota }} instance(s) of type {{ type }} simultaneously for the {{ region }} region. <Link>Check your quota.</Link>",
77
"pci_instance_creation_choose_localization_title": "Choose a location",
88
"pci_instance_creation_select_localization_label": "Select a location: ",
99
"pci_instance_creation_continue_order": "Continue my order",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_quota": "Quota unavailable",
3232
"pci_instance_creation_flavor_unavailable_help": "This model is not available in your selected region. However, you can select it, but you will need to choose another region for this model.",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "Your quota does not allow you to choose this instance type. Please increase your quota.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Choose a new region",
36+
"pci_instance_creation_select_new_region_label": "Select a region",
37+
"pci_instance_creation_select_new_region_for_flavor": "This model <strong>({{ flavor }})</strong> is not available in your <strong>selected region</strong>. However, you can select it, but you will need to choose another available region for this model.",
38+
"pci_instance_creation_select_new_region": "Choose a region"
3539
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_es_ES.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Parámetros avanzados",
44
"pci_instances_creation_quantity_title": "Elegir una cantidad",
55
"pci_instances_creation_quantity_label": "Número de instancias a crear",
6-
"pci_instance_creation_quantity_rule": "Su cuota actual le permite crear simultáneamente hasta {{ quota }} instancia(s) de tipo {{ type }} para la región de {{ region }}.",
6+
"pci_instance_creation_quantity_rule": "Su cuota actual le permite crear simultáneamente hasta {{ quota }} instancia(s) del tipo {{ type }} para la región de {{ region }}. <Link>Consulte su cuota.</Link>",
77
"pci_instance_creation_choose_localization_title": "Elija una ubicación",
88
"pci_instance_creation_select_localization_label": "Seleccione una ubicación: ",
99
"pci_instance_creation_continue_order": "Continuar mi pedido",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_quota": "Cuota no disponible",
3232
"pci_instance_creation_flavor_unavailable_help": "Este modelo no está disponible en su región seleccionada. Sin embargo, puede seleccionarlo, pero deberá elegir otra región para este modelo.",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "Su cuota no le permite elegir este modelo de instancia. Por favor, aumente su cuota.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Elegir una nueva región",
36+
"pci_instance_creation_select_new_region_label": "Seleccionar una región",
37+
"pci_instance_creation_select_new_region_for_flavor": "Este modelo <strong>({{ flavor }})</strong> no está disponible en su <strong>región seleccionada</strong>. Sin embargo, puede seleccionarlo, pero deberá elegir otra región disponible para este modelo.",
38+
"pci_instance_creation_select_new_region": "Seleccione una región"
3539
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_fr_CA.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,9 @@
5252
"pci_instance_creation_availabilityZone_choose_for_me": "Choisir pour moi",
5353
"pci_instance_creation_availabilityZone_user_choice": "Je choisis ma zone de disponibilité",
5454
"pci_instance_creation_availabilityZone_help_description_p1": "Dans un environnement cloud, la disponibilité et la résilience des services sont essentielles pour garantir la continuité des opérations, même en cas de panne d’une zone de disponibilité (AZ).",
55-
"pci_instance_creation_availabilityZone_help_description_p2": "Comme les instances sont des services zonaux, elles ne sont déployées que dans une seule zone de disponibilité. Pour garantir la résilience, il revient donc au client de répartir manuellement ses instances sur plusieurs zones."
55+
"pci_instance_creation_availabilityZone_help_description_p2": "Comme les instances sont des services zonaux, elles ne sont déployées que dans une seule zone de disponibilité. Pour garantir la résilience, il revient donc au client de répartir manuellement ses instances sur plusieurs zones.",
56+
"pci_instance_creation_select_new_region_title": "Choisir une nouvelle région",
57+
"pci_instance_creation_select_new_region_label": "Selectionner une région",
58+
"pci_instance_creation_select_new_region_for_flavor": "Ce modèle <strong>({{ flavor }})</strong> n'est pas disponible dans votre <strong>région selectionnée</strong>. Vous pouvez toutefois le sélectionner mais vous devrez choisir une autre région disponible pour ce modèle.",
59+
"pci_instance_creation_select_new_region": "Choisissez une région"
5660
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_fr_FR.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,9 @@
5252
"pci_instance_creation_availabilityZone_choose_for_me": "Choisir pour moi",
5353
"pci_instance_creation_availabilityZone_user_choice": "Je choisis ma zone de disponibilité",
5454
"pci_instance_creation_availabilityZone_help_description_p1": "Dans un environnement cloud, la disponibilité et la résilience des services sont essentielles pour garantir la continuité des opérations, même en cas de panne d’une zone de disponibilité (AZ).",
55-
"pci_instance_creation_availabilityZone_help_description_p2": "Comme les instances sont des services zonaux, elles ne sont déployées que dans une seule zone de disponibilité. Pour garantir la résilience, il revient donc au client de répartir manuellement ses instances sur plusieurs zones."
55+
"pci_instance_creation_availabilityZone_help_description_p2": "Comme les instances sont des services zonaux, elles ne sont déployées que dans une seule zone de disponibilité. Pour garantir la résilience, il revient donc au client de répartir manuellement ses instances sur plusieurs zones.",
56+
"pci_instance_creation_select_new_region_title": "Choisir une nouvelle région",
57+
"pci_instance_creation_select_new_region_label": "Selectionner une région",
58+
"pci_instance_creation_select_new_region_for_flavor": "Ce modèle <strong>({{ flavor }})</strong> n'est pas disponible dans votre <strong>région selectionnée</strong>. Vous pouvez toutefois le sélectionner mais vous devrez choisir une autre région disponible pour ce modèle.",
59+
"pci_instance_creation_select_new_region": "Choisissez une région"
5660
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_it_IT.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Impostazioni avanzate",
44
"pci_instances_creation_quantity_title": "Scegli una quantità",
55
"pci_instances_creation_quantity_label": "Numero di istanze da creare",
6-
"pci_instance_creation_quantity_rule": "Il tuo attuale limite ti consente di creare simultaneamente fino a {{ quota }} istanza(e) di tipo {{ type }} per la regione {{ region }}.",
6+
"pci_instance_creation_quantity_rule": "Il tuo attuale quota ti consente di creare simultaneamente fino a {{ quota }} istanza(e) di tipo {{ type }} per la regione di {{ region }}. <Link>Controlla il tuo quota.</Link>",
77
"pci_instance_creation_choose_localization_title": "Scegli una posizione",
88
"pci_instance_creation_select_localization_label": "Seleziona una posizione: ",
99
"pci_instance_creation_continue_order": "Continua il mio ordine",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_quota": "Quota non disponibile",
3232
"pci_instance_creation_flavor_unavailable_help": "Questo modello non è disponibile nella tua regione selezionata. Puoi comunque selezionarlo, ma dovrai scegliere un'altra regione per questo modello.",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "Il tuo quota non ti consente di scegliere questo modello di istanza. Si prega di aumentare il proprio quota.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Scegli una nuova regione",
36+
"pci_instance_creation_select_new_region_label": "Selezionare una regione",
37+
"pci_instance_creation_select_new_region_for_flavor": "Questo modello <strong>({{ flavor }})</strong> non è disponibile nella tua <strong>regione selezionata</strong>. Tuttavia, puoi selezionarlo, ma dovrai scegliere un'altra regione disponibile per questo modello.",
38+
"pci_instance_creation_select_new_region": "Seleziona una regione"
3539
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_pl_PL.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Ustawienia zaawansowane",
44
"pci_instances_creation_quantity_title": "Wybierz ilość",
55
"pci_instances_creation_quantity_label": "Liczba instancji do utworzenia",
6-
"pci_instance_creation_quantity_rule": "Twój aktualny limit pozwala na jednoczesne utworzenie do {{ quota }} instancji typu {{ type }} w regionie {{ region }}.",
6+
"pci_instance_creation_quantity_rule": "Twój aktualny limit pozwala na jednoczesne utworzenie do {{ quota }} instancji typu {{ type }} w regionie {{ region }}. <Link>Sprawdź swój limit.</Link>",
77
"pci_instance_creation_choose_localization_title": "Wybierz lokalizację",
88
"pci_instance_creation_select_localization_label": "Wybierz lokalizację: ",
99
"pci_instance_creation_continue_order": "Kontynuuj moje zamówienie",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_quota": "Niedostępny limit",
3232
"pci_instance_creation_flavor_unavailable_help": "Ten model nie jest dostępny w wybranym regionie. Możesz go jednak wybrać, ale będziesz musiał wybrać inny region dla tego modelu.",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "Twój limit nie pozwala na wybór tego modelu instancji. Proszę zwiększyć swój limit.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Wybierz nowy region",
36+
"pci_instance_creation_select_new_region_label": "Wybierz region",
37+
"pci_instance_creation_select_new_region_for_flavor": "Ten model <strong>({{ flavor }})</strong> nie jest dostępny w twoim <strong>wybranym regionie</strong>. Możesz go jednak wybrać, ale będziesz musiał wybrać inny dostępny region dla tego modelu.",
38+
"pci_instance_creation_select_new_region": "Wybierz region"
3539
}

packages/manager/apps/pci-instances/public/translations/creation/Messages_pt_PT.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pci_instances_creation_advanced_parameters": "Configurações avançadas",
44
"pci_instances_creation_quantity_title": "Escolher uma quantidade",
55
"pci_instances_creation_quantity_label": "Número de instâncias a criar",
6-
"pci_instance_creation_quantity_rule": "O seu quota atual permite-lhe criar simultaneamente até {{ quota }} instância(s) do tipo {{ type }} para a região {{ region }}.",
6+
"pci_instance_creation_quantity_rule": "O seu quota atual permite-lhe criar simultaneamente até {{ quota }} instância(s) do tipo {{ type }} para a região de {{ region }}. <Link>Consulte o seu quota.</Link>",
77
"pci_instance_creation_choose_localization_title": "Escolha uma localização",
88
"pci_instance_creation_select_localization_label": "Selecione uma localização: ",
99
"pci_instance_creation_continue_order": "Continuar a minha encomenda",
@@ -31,5 +31,9 @@
3131
"pci_instance_creation_flavor_unavailable_quota": "Quota indisponível",
3232
"pci_instance_creation_flavor_unavailable_help": "Este modelo não está disponível na sua região selecionada. No entanto, você pode selecioná-lo, mas terá que escolher outra região para este modelo.",
3333
"pci_instance_creation_flavor_unavailable_quota_help": "O seu quota não permite escolher este modelo de instância. Por favor, aumente o seu quota.",
34-
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet"
34+
"pci_instance_creation_select_flavor_price_hint": "* Lorem ipsum dolor sit amet",
35+
"pci_instance_creation_select_new_region_title": "Escolher uma nova região",
36+
"pci_instance_creation_select_new_region_label": "Selecionar uma região",
37+
"pci_instance_creation_select_new_region_for_flavor": "Este modelo <strong>({{ flavor }})</strong> não está disponível na sua <strong>região selecionada</strong>. No entanto, você pode selecioná-lo, mas terá que escolher outra região disponível para este modelo.",
38+
"pci_instance_creation_select_new_region": "Escolha uma região"
3539
}

packages/manager/apps/pci-instances/src/__mocks__/instance/constants.ts

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,3 +850,52 @@ export const mockedFlavors: TFlavorDataForTable[] = [
850850
monthlyPrice: 1632.0,
851851
},
852852
];
853+
854+
export const mockedFlavorAvailableRegions = [
855+
{
856+
label: 'Europe',
857+
options: [
858+
{
859+
customRendererData: {
860+
countryCode: 'be',
861+
deploymentMode: 'localzone',
862+
macroRegion: 'EU-WEST-LZ-BRU',
863+
},
864+
label: 'Bruxelles',
865+
value: 'EU-WEST-LZ-BRU-A',
866+
},
867+
{
868+
customRendererData: {
869+
countryCode: 'fr',
870+
deploymentMode: 'region',
871+
macroRegion: 'GRA',
872+
},
873+
label: 'GRA11',
874+
value: 'GRA11',
875+
},
876+
{
877+
customRendererData: {
878+
countryCode: 'fr',
879+
deploymentMode: 'region',
880+
macroRegion: 'GRA',
881+
},
882+
label: 'GRA7',
883+
value: 'GRA7',
884+
},
885+
],
886+
},
887+
{
888+
label: 'Amerique du Nord',
889+
options: [
890+
{
891+
customRendererData: {
892+
countryCode: 'ca',
893+
deploymentMode: 'region',
894+
macroRegion: 'BHS',
895+
},
896+
label: 'Beauharnois',
897+
value: 'BHS5',
898+
},
899+
],
900+
},
901+
];

packages/manager/apps/pci-instances/src/components/flavorsTable/FlavorsTable.component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export type TFlavorsTableProps = TableProp &
2727
columns: TableColumn[];
2828
rows: TableRow[];
2929
selectable?: boolean;
30-
onClick?: (flavorName: string) => void;
30+
onRowClick?: (flavorName: string) => void;
3131
};
3232

3333
const stickyFirstColumnClasses = [
@@ -49,7 +49,7 @@ export const FlavorsTable = memo(
4949
columns,
5050
rows,
5151
className,
52-
onClick,
52+
onRowClick: onClick,
5353
selectable = false,
5454
size = TABLE_SIZE.md,
5555
variant = TABLE_VARIANT.default,

0 commit comments

Comments
 (0)