Skip to content

feat(pci.db): improve services capabilities logic #20110

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

feat(pci.db): improve services capabilities logic #20110

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
16 changes: 9 additions & 7 deletions ...atabases-analytics/src/components/order/cluster-options/IpsRestrictionsForm.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ const IpsRestrictionsForm = React.forwardRef<
{!value.find((v) => v.ip === formatIpMask(dataplatformIp)) && (
<Button
className="px-2"
mode={'outline'}
size={'sm'}
mode="outline"
size="sm"
disabled={disabled}
onClick={() =>
addIp({
ip: dataplatformIp,
Expand All @@ -129,8 +130,9 @@ const IpsRestrictionsForm = React.forwardRef<
{!value.find((v) => v.ip === formatIpMask(ipQuery.data?.ip)) && (
<Button
className="px-2"
mode={'outline'}
size={'sm'}
mode="outline"
size="sm"
disabled={disabled}
onClick={() =>
addIp({ ip: ipQuery.data?.ip, description: 'current ip' })
}
Expand Down Expand Up @@ -198,7 +200,7 @@ const IpsRestrictionsForm = React.forwardRef<
<Button
data-testid="ip-add-button"
className="md:mt-8"
mode={'outline'}
mode="outline"
disabled={disabled}
onClick={onSubmit}
>
Expand Down Expand Up @@ -230,8 +232,8 @@ const IpsRestrictionsForm = React.forwardRef<
<Button
data-testid={`ip-remove-button-${idx}`}
className="text-red-500 rounded-full p-2 hover:text-red-500 size-8"
mode={'ghost'}
variant={'destructive'}
mode="ghost"
variant="destructive"
type="button"
onClick={() => removeIp(idx)}
disabled={disabled}
Expand Down
2 changes: 1 addition & 1 deletion .../apps/pci-databases-analytics/src/pages/services/[serviceId]/dashboard/Dashboard.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ const Dashboard = () => {
</div>
<div
data-testid="dashboard-billing-link"
className="flex flex-row gap-1 mt-3"
className="flex flex-row gap-1 mt-2"
>
<OvhLink
application="public-cloud"
Expand Down
9 changes: 9 additions & 0 deletions ...er/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/Settings.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ const mockedService = {
maintenanceApply: {
create: database.service.capability.StateEnum.enabled,
},
serviceIpRestriction: {
update: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
};

Expand Down
6 changes: 6 additions & 0 deletions .../src/pages/services/[serviceId]/settings/_components/AdvancedConfigurationUpdate.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ const mockedService = {
maintenanceApply: {
create: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
};

Expand Down
6 changes: 3 additions & 3 deletions ...cs/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ const IpsRestrictionsUpdate = ({
<IpsRestrictionsForm
{...field}
disabled={
service.capabilities.ipRestrictions?.update !==
database.service.capability.StateEnum.enabled
service.capabilities.serviceIpRestriction?.update ===
database.service.capability.StateEnum.disabled
}
value={field.value as database.IpRestrictionCreation[]}
onChange={field.onChange}
Expand All @@ -110,7 +110,7 @@ const IpsRestrictionsUpdate = ({
data-testid="ips-update-submit-button"
disabled={
isPending ||
service.capabilities.ipRestrictions?.update ===
service.capabilities.serviceIpRestriction?.update ===
database.service.capability.StateEnum.disabled
}
>
Expand Down
8 changes: 7 additions & 1 deletion ...lytics/src/pages/services/[serviceId]/settings/_components/IpsRestrictionsUpdate.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,13 @@ const mockedService = {
delete: database.service.capability.StateEnum.enabled,
create: database.service.capability.StateEnum.enabled,
},
ipRestrictions: {
serviceIpRestriction: {
update: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
Expand Down
15 changes: 15 additions & 0 deletions ...bases-analytics/src/pages/services/[serviceId]/settings/_components/Maintenances.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ const mockedService = {
maintenanceApply: {
create: database.service.capability.StateEnum.enabled,
},
serviceIpRestriction: {
update: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
};

Expand Down Expand Up @@ -156,6 +165,12 @@ describe('Maintenance in settings page', () => {
maintenanceApply: {
create: database.service.capability.StateEnum.disabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.disabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.disabled,
},
},
},
category: 'operational',
Expand Down
15 changes: 15 additions & 0 deletions ...alytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ const mockedService = {
delete: database.service.capability.StateEnum.enabled,
read: database.service.capability.StateEnum.enabled,
},
serviceIpRestriction: {
update: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
};

Expand Down Expand Up @@ -235,6 +244,12 @@ describe('Service configuration page', () => {
read: database.service.capability.StateEnum.enabled,
update: database.service.capability.StateEnum.disabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.disabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.disabled,
},
},
},
category: 'operational',
Expand Down
17 changes: 13 additions & 4 deletions ...s-analytics/src/pages/services/[serviceId]/settings/_components/UpdateTable.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,35 @@ const UpdateTable = () => {
cell: `${humanizeEngine(service.engine)} ${service.version}`,
onClick: () => navigate('./update-version'),
updateButtonDisplayed: availabilitiesVersionQuery.data?.length > 1,
disable:
service.capabilities.service.update ===
Copy link
Contributor

@lionel95200x lionel95200x Nov 19, 2025

Choose a reason for hiding this comment

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

Maybe you could create a const as it's always the same check or maybe move it in a utils cause you have the same check in packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx

Copy link
Contributor Author

@abullet33 abullet33 Nov 19, 2025

Choose a reason for hiding this comment

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

I understand your point but it's only used at 2 places, so for me it's a little bit overkill to create a utils for that, even a const. We are managing all capabilities this way, so I guess it will be easier to understand "global capa management" if we all use it that way

Copy link
Contributor

@lionel95200x lionel95200x Nov 19, 2025

Choose a reason for hiding this comment

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

Yes use in 2 place but 6 times, and if you forgot to update one it will be painful to find the issue :)

database.service.capability.StateEnum.disabled,
},
{
title: t('tablePlan'),
cell: service.plan,
onClick: () => navigate('./update-plan'),
updateButtonDisplayed: availabilitiesPlanQuery.data?.length > 1,
disable:
Copy link
Contributor

@jperchoc jperchoc Nov 19, 2025

Choose a reason for hiding this comment

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

We are using -ed for the updateButtonDisplayed, we should be consistent here:

Suggested change
disable:
disabled:

service.capabilities.service.update ===
database.service.capability.StateEnum.disabled,
},
{
title: t('tableFlavor'),
cell: service.flavor,
onClick: () => navigate('./update-flavor'),
updateButtonDisplayed: availabilitiesFlavorQuery.data?.length > 1,
disable:
service.capabilities.serviceFlavor.update ===
database.service.capability.StateEnum.disabled,
},
service.storage?.size.value && {
title: t('tableStorage'),
cell: `${formatStorage(service.storage.size)} ${service.storage.type}`,
onClick: () => navigate('./update-flavor'),
disable:
service.capabilities.serviceDisk.update ===
database.service.capability.StateEnum.disabled,
updateButtonDisplayed:
availabilitiesFlavorQuery.data?.length > 0 &&
availabilitiesFlavorQuery.data[0].specifications.storage &&
Expand All @@ -91,10 +103,7 @@ const UpdateTable = () => {
data-testid={`update-button-${row.title}`}
className="py-0 h-auto"
onClick={row.onClick}
disabled={
service.capabilities.service.update ===
database.service.capability.StateEnum.disabled
}
disabled={row.disable}
>
{t('tableUpdateButton')}
</Button>
Expand Down
15 changes: 15 additions & 0 deletions ...abases-analytics/src/pages/services/[serviceId]/settings/_components/UpdateTable.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ const mockedService = {
delete: database.service.capability.StateEnum.enabled,
create: database.service.capability.StateEnum.enabled,
},
serviceIpRestriction: {
update: database.service.capability.StateEnum.enabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.enabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.enabled,
},
},
};

Expand Down Expand Up @@ -118,6 +127,12 @@ describe('Update table in settings page', () => {
delete: database.service.capability.StateEnum.disabled,
create: database.service.capability.StateEnum.disabled,
},
serviceFlavor: {
update: database.service.capability.StateEnum.disabled,
},
serviceDisk: {
update: database.service.capability.StateEnum.disabled,
},
},
},
category: 'operational',
Expand Down
4 changes: 3 additions & 1 deletion ...r/apps/pci-databases-analytics/src/types/cloud/project/database/service/CapabilityEnum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export enum CapabilityEnum {
'fork' = 'fork',
'indexes' = 'indexes',
'integrations' = 'integrations',
'ipRestrictions' = 'ipRestrictions',
'maintenanceApply' = 'maintenanceApply',
'maintenanceTime' = 'maintenanceTime',
'maintenances' = 'maintenances',
Expand All @@ -26,6 +25,9 @@ export enum CapabilityEnum {
'queryStatistics' = 'queryStatistics',
'queryStatisticsReset' = 'queryStatisticsReset',
'service' = 'service',
'serviceDisk' = 'serviceDisk',
'serviceFlavor' = 'serviceFlavor',
'serviceIpRestriction' = 'serviceIpRestriction',
'userCredentialsReset' = 'userCredentialsReset',
'userAcls' = 'userAcls',
'users' = 'users',
Expand Down
Loading