Skip to content

fix(pci-instances): disable vnc tab instead hiding #19466

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(pci-instances): disable vnc tab instead hiding #19466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Sie haben kein Backup",
"pci_instances_dashboard_backup_title": "Verwaltung des Backups",
"pci_instances_dashboard_backup_number_of_backups": "Anzahl der Backups der Instanz",
"pci_instances_dashboard_backup_last_updated_backups": "Datum des letzten Backups"
"pci_instances_dashboard_backup_last_updated_backups": "Datum des letzten Backups",
"pci_instances_dashboard_tab_vnc_disabled_text": "Der Status dieser Instanz erlaubt keine Verbindung über die VNC-Konsole."
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_en_GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "You do not have a backup",
"pci_instances_dashboard_backup_title": "Backup management",
"pci_instances_dashboard_backup_number_of_backups": "Instance backup count",
"pci_instances_dashboard_backup_last_updated_backups": "Date of last backup"
"pci_instances_dashboard_backup_last_updated_backups": "Date of last backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "The state of this instance does not allow connection via the VNC console."
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_es_ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "No tiene backup",
"pci_instances_dashboard_backup_title": "Gestión del backup",
"pci_instances_dashboard_backup_number_of_backups": "Número de backups de la instancia",
"pci_instances_dashboard_backup_last_updated_backups": "Fecha del último backup"
"pci_instances_dashboard_backup_last_updated_backups": "Fecha del último backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "El estado de esta instancia no permite la conexión a través de la consola VNC"
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_fr_CA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Vous n'avez pas de backup",
"pci_instances_dashboard_backup_title": "Gestion du backup",
"pci_instances_dashboard_backup_number_of_backups": "Nombre de backups de l'instance",
"pci_instances_dashboard_backup_last_updated_backups": "Date du dernier backup"
"pci_instances_dashboard_backup_last_updated_backups": "Date du dernier backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "L'état de cette instance ne permet pas la connexion via la console VNC"
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_fr_FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Vous n'avez pas de backup",
"pci_instances_dashboard_backup_title": "Gestion du backup",
"pci_instances_dashboard_backup_number_of_backups": "Nombre de backups de l'instance",
"pci_instances_dashboard_backup_last_updated_backups": "Date du dernier backup"
"pci_instances_dashboard_backup_last_updated_backups": "Date du dernier backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "L'état de cette instance ne permet pas la connexion via la console VNC"
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_it_IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Non hai backup",
"pci_instances_dashboard_backup_title": "Gestione del backup",
"pci_instances_dashboard_backup_number_of_backups": "Numero di backup dell’istanza",
"pci_instances_dashboard_backup_last_updated_backups": "Data dell'ultimo backup"
"pci_instances_dashboard_backup_last_updated_backups": "Data dell'ultimo backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "Lo stato di questa istanza non consente la connessione tramite la console VNC"
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_pl_PL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Nie posiadasz kopii zapasowej",
"pci_instances_dashboard_backup_title": "Zarządzanie kopiami zapasowymi",
"pci_instances_dashboard_backup_number_of_backups": "Liczba kopii zapasowych instancji",
"pci_instances_dashboard_backup_last_updated_backups": "Data ostatniego backupu"
"pci_instances_dashboard_backup_last_updated_backups": "Data ostatniego backupu",
"pci_instances_dashboard_tab_vnc_disabled_text": "Stan tej instancji nie pozwala na połączenie przez konsolę VNC."
}
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/public/translations/dashboard/Messages_pt_PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"pci_instances_dashboard_backup_empty_message": "Não possui backups",
"pci_instances_dashboard_backup_title": "Gestão do backup",
"pci_instances_dashboard_backup_number_of_backups": "Número de backups da instância",
"pci_instances_dashboard_backup_last_updated_backups": "Data do último backup"
"pci_instances_dashboard_backup_last_updated_backups": "Data do último backup",
"pci_instances_dashboard_tab_vnc_disabled_text": "O estado desta instância não permite a conexão via console VNC"
}
25 changes: 21 additions & 4 deletions packages/manager/apps/pci-instances/src/components/tab/TabsPanel.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
import { FC, useEffect, useState } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { Tabs, TabList, Tab, TabsValueChangeEvent } from '@ovhcloud/ods-react';
import {
Tabs,
TabList,
Tab,
TabsValueChangeEvent,
Tooltip,
TooltipTrigger,
TooltipContent,
} from '@ovhcloud/ods-react';

type TTabItem = {
label: string;
to: string;
badge?: string;
disabled?: boolean;
tooltipText?: string | null;
};

type TTabsPanelProps = {
Expand All @@ -30,9 +40,16 @@ const TabsPanel: FC<TTabsPanelProps> = ({ tabs }) => {
<Tabs value={activeTab} onValueChange={handleTabChange}>
<TabList>
{tabs.map((tab) => (
<Tab key={tab.to} value={tab.to}>
{tab.label}
</Tab>
<Tooltip key={tab.to}>
<TooltipTrigger asChild>
<Tab value={tab.to} disabled={tab.disabled}>
{tab.label}
</Tab>
</TooltipTrigger>
{tab.tooltipText && (
<TooltipContent>{tab.tooltipText}</TooltipContent>
)}
</Tooltip>
))}
</TabList>
</Tabs>
Expand Down
22 changes: 14 additions & 8 deletions packages/manager/apps/pci-instances/src/data/hooks/instance/selectors/instances.selector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,27 @@ const mapInstanceAddresses = (instance: TAggregatedInstanceDto) =>
return acc.set(type, [rest]);
}, new Map<TInstanceAddressType, TAggregatedInstanceAddress[]>());

const isActionToDisplay = (name: TActionName) => name !== 'vnc';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We must find later another way to achieve this and thus to prevent from having this business rule into the client logic ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree :)


const mapInstanceActions = (
instance: TAggregatedInstanceDto,
projectUrl: string,
): TAggregatedInstanceActions =>
instance.actions.reduce<TAggregatedInstanceActions>((acc, action) => {
const { group, name } = action;
const newAction = {
label: `pci_instances_list_action_${name}`,
link: getActionHrefByName(projectUrl, name, instance),
};
const foundAction = acc.get(group);
if (!foundAction) return acc.set(group, [newAction]);
foundAction.push(newAction);

if (isActionToDisplay(name)) {
const newAction = {
label: `pci_instances_list_action_${name}`,
link: getActionHrefByName(projectUrl, name, instance),
};
const foundAction = acc.get(group);
if (!foundAction) return acc.set(group, [newAction]);
foundAction.push(newAction);
}

return acc;
}, new Map() as TAggregatedInstanceActions);
}, new Map());

export const instancesSelector = (
{ pages }: InfiniteData<TAggregatedInstanceDto[], number>,
Expand Down
27 changes: 13 additions & 14 deletions packages/manager/apps/pci-instances/src/pages/instances/instance/Instance.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,23 @@ const Instance: FC = () => {
instanceId,
});

const tabs = useMemo(() => {
const defaultTab = [
const tabs = useMemo(
() => [
{
label: t('general_information'),
to: dashboardPath.pathname,
},
];

return instance?.isEditEnabled
? [
...defaultTab,
{
label: t('dashboard:pci_instances_dashboard_tab_vnc_title'),
to: vncPath.pathname,
},
]
: defaultTab;
}, [dashboardPath.pathname, vncPath.pathname, t, instance?.isEditEnabled]);
{
label: t('dashboard:pci_instances_dashboard_tab_vnc_title'),
to: vncPath.pathname,
disabled: !instance?.isVncEnabled,
tooltipText: !instance?.isVncEnabled
? t('dashboard:pci_instances_dashboard_tab_vnc_disabled_text')
: null,
},
],
[dashboardPath.pathname, vncPath.pathname, t, instance?.isVncEnabled],
);

return (
<InstanceWrapper>
Expand Down
6 changes: 6 additions & 0 deletions ...i-instances/src/pages/instances/instance/dashboard/view-models/selectInstanceDashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@ export type TInstanceDashboardViewModel = {
isDeleteEnabled: boolean;
isEditEnabled: boolean;
isBackupEnabled: boolean;
isVncEnabled: boolean;
} | null;

const isEditionEnabled = (actions: TInstanceAction[]) =>
actions.some(({ name }) => name === 'edit');

const isVncEnabled = (actions: TInstanceAction[]) =>
actions.some(({ name }) => name === 'vnc');

const mapFlavor = ({ name, specs }: TInstanceFlavor) => ({
name,
ram: specs ? `${specs.ram.value} ${specs.ram.unit}` : '-',
Expand Down Expand Up @@ -187,6 +191,7 @@ const isAdditionalAction = ({ name }: { name: TActionName }) => {
'delete',
'activate_monthly_billing',
'create_backup',
'vnc',
];

return !excludeActions.includes(name);
Expand Down Expand Up @@ -299,5 +304,6 @@ export const selectInstanceDashboard = (
isDeleteEnabled: canDeleteInstance(instance.actions),
isEditEnabled: isEditionEnabled(instance.actions),
isBackupEnabled: canCreateBackup(instance.actions),
isVncEnabled: isVncEnabled(instance.actions),
};
};
3 changes: 2 additions & 1 deletion packages/manager/apps/pci-instances/src/types/instance/common.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export type TActionName =
| 'unshelve'
| 'resume'
| 'reinstall'
| 'delete';
| 'delete'
| 'vnc';

export type TStatus =
| 'ACTIVE'
Expand Down
Loading