Skip to content

Commit

Permalink
fix(changelog): fix display and one forgotten button (#15536)
Browse files Browse the repository at this point in the history
ref: MANAGER-16546
Signed-off-by: Maxime Bajeux <[email protected]>
  • Loading branch information
MaximeBajeux authored Feb 20, 2025
1 parent 62b5396 commit 66365d7
Show file tree
Hide file tree
Showing 6 changed files with 190 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { describe, vi } from 'vitest';
import { render } from '@testing-library/react';
import { ChangelogButton } from '@ovh-ux/manager-react-components';
import { wrapper } from '@/wrapperRenders';
import DetailPage from './Detail.page';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,159 @@ exports[`Detail > should render correctly 1`] = `
<div />
<div
class="min-w-[7rem]"
/>
>
<osds-menu>
<osds-button
color="primary"
size="sm"
slot="menu-title"
variant="ghost"
>
<osds-icon
class="mr-2"
color="primary"
name="guides"
size="sm"
/>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header
</osds-text>
</osds-button>
<osds-menu-item>
<osds-button
color="primary"
href="https://docs.ovh.com/gb/en/public-cloud/"
size="sm"
target="_blank"
variant="ghost"
>
<span
slot="start"
>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header_all_guides
</osds-text>
<osds-icon
class="ml-1"
color="primary"
name="external-link"
size="xxs"
/>
</span>
</osds-button>
</osds-menu-item>
<osds-menu-item>
<osds-button
color="primary"
href="https://docs.ovh.com/gb/en/public-cloud/public-cloud-first-steps/"
size="sm"
target="_blank"
variant="ghost"
>
<span
slot="start"
>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header_first_steps_with_instances
</osds-text>
<osds-icon
class="ml-1"
color="primary"
name="external-link"
size="xxs"
/>
</span>
</osds-button>
</osds-menu-item>
<osds-menu-item>
<osds-button
color="primary"
href="https://docs.ovh.com/gb/en/kubernetes/creating-a-cluster/"
size="sm"
target="_blank"
variant="ghost"
>
<span
slot="start"
>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header_create_a_cluster
</osds-text>
<osds-icon
class="ml-1"
color="primary"
name="external-link"
size="xxs"
/>
</span>
</osds-button>
</osds-menu-item>
<osds-menu-item>
<osds-button
color="primary"
href="https://docs.ovh.com/gb/en/kubernetes/deploying-an-application/"
size="sm"
target="_blank"
variant="ghost"
>
<span
slot="start"
>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header_deploy_an_application
</osds-text>
<osds-icon
class="ml-1"
color="primary"
name="external-link"
size="xxs"
/>
</span>
</osds-button>
</osds-menu-item>
<osds-menu-item>
<osds-button
color="primary"
href="https://docs.ovh.com/gb/en/kubernetes/using-lb/"
size="sm"
target="_blank"
variant="ghost"
>
<span
slot="start"
>
<osds-text
color="primary"
size="500"
>
pci_project_guides_header_loadbalancer_kube
</osds-text>
<osds-icon
class="ml-1"
color="primary"
name="external-link"
size="xxs"
/>
</span>
</osds-button>
</osds-menu-item>
</osds-menu>
</div>
</div>
</div>
</div>
Expand Down
16 changes: 11 additions & 5 deletions packages/manager/apps/pci-vouchers/src/pages/ListingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,17 @@ export default function ListingPage() {
]}
></OsdsBreadcrumb>
)}
<div className="flex items-center justify-between mt-4">
<Headers title={t('cpb_project_management_credit_vouchers')} changelogButton={<ChangelogButton
links={CHANGELOG_LINKS}
chapters={CHANGELOG_CHAPTERS}
/>} headerButton={<PciGuidesHeader category="storage" />} />
<div className="mt-4">
<Headers
title={t('cpb_project_management_credit_vouchers')}
changelogButton={
<ChangelogButton
links={CHANGELOG_LINKS}
chapters={CHANGELOG_CHAPTERS}
/>
}
headerButton={<PciGuidesHeader category="storage" />}
/>
</div>
<Notifications />
<Headers description={t('cpb_vouchers_add_explain_bis')} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ vi.mock('@/data/hooks', async (importOriginal) => {
};
});

vi.mock('@ovh-ux/manager-react-components', async (importOriginal) => {
const actual: any = await importOriginal();
return {
...actual,
ChangelogButton: vi.fn().mockReturnValue(<div></div>),
};
});

const renderComponent = ({ ...args }: DashboardLayoutProps) => {
return render(
<QueryClientProvider client={queryClient}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import template from '../modal/terminate/terminate.html';

export default class iplbListingCtrl extends ListLayoutHelper.ListLayoutCtrl {
/* @ngInject */
constructor($state, $q, ouiDatagridService, CucControllerHelper) {
constructor($state, $q, ouiDatagridService, CucControllerHelper, constants) {
super($q, ouiDatagridService);
this.$state = $state;
this.ouiDatagridService = ouiDatagridService;
this.CucControllerHelper = CucControllerHelper;
this.constants = constants;
}

gotoService({ serviceName }) {
Expand Down
17 changes: 16 additions & 1 deletion packages/manager/modules/iplb/src/listing/listing.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
<div class="iplb">
<oui-header class="mb-2" data-heading="{{:: $ctrl.header }}"></oui-header>
<oui-header class="mb-2">
<oui-header-heading>
<div class="d-flex align-items-center justify-content-between">
<h1
class="oui-header__title"
data-translate="{{:: $ctrl.header }}"
></h1>
<div class="d-flex justify-content-end gap-1 flex-wrap">
<changelog-button
links="$ctrl.constants.CHANGELOG.iplb.links"
chapters="$ctrl.constants.CHANGELOG.iplb.chapters"
></changelog-button>
</div>
</div>
</oui-header-heading>
</oui-header>
</div>
<div data-ovh-alert="InfoErrors"></div>
<oui-datagrid
Expand Down

0 comments on commit 66365d7

Please sign in to comment.