Skip to content
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.

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

[MINT-3217] Common milestone library #1540

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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: 1 addition & 2 deletions pkg/graph/resolvers/mto_common_milestone.resolvers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const commonBreadCrumbs = (
},
MODEL_TO_OPERATIONS: {
text: 'modelToOperationsMisc:heading',
url: `/models/${modelID}/collaboration-area/model-to-operation`
url: `/models/${modelID}/collaboration-area/model-to-operations`
},
NOTIFICATIONS: {
text: 'notifications:breadcrumb',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ exports[`EChimpCardsTable > matches snapshot 1`] = `
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-2 of 2 results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10560,6 +10560,7 @@ exports[`ShareExportModal > matches the snapshot 1`] = `
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-1 of 1 results
Expand Down
3 changes: 2 additions & 1 deletion src/components/TablePageSize/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const TablePageSize = ({
suffix
}: TablePageSizeProps) => {
const classNames = classnames('desktop:margin-top-2', className);

return (
<div className={classNames}>
<Select
Expand All @@ -42,7 +43,7 @@ const TablePageSize = ({
data-testid="table-page-size"
name="tablePageSize"
onChange={(e: any) => {
setPageSize(e.target.value);
setPageSize(Number(e.target.value));
}}
value={pageSize}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`Table Results Componenet > matches snapshot 1`] = `
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-10 of 100 results
Expand Down
6 changes: 2 additions & 4 deletions src/components/TableResults/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('Table Results Componenet', () => {
);

expect(
await screen.getByText(/Showing 41-50 of 456 results/)
screen.getByText(/Showing 41-50 of 456 results/)
).toBeInTheDocument();
});

Expand All @@ -45,9 +45,7 @@ describe('Table Results Componenet', () => {
/>
);

expect(
await screen.getByText(/Showing 1-10 of 42 results/)
).toBeInTheDocument();
expect(screen.getByText(/Showing 1-10 of 42 results/)).toBeInTheDocument();
expect(await screen.findByText('"Happiness"')).toBeInTheDocument();
});

Expand Down
22 changes: 11 additions & 11 deletions src/components/TableResults/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ const TableResults = ({
{t('tableAndPagination:results.noResults')}{' '}
{/* Displays the search input even if there are no results */}
{displayResult(globalFilter)}
{globalFilter && (
<Alert
type="warning"
heading={t('results.alertHeading', {
query: globalFilter
})}
>
{t('results.alertDescription')}
</Alert>
)}
</div>
{globalFilter && (
<Alert
type="warning"
heading={t('results.alertHeading', {
query: globalFilter
})}
>
{t('results.alertDescription')}
</Alert>
)}
</>
)
) : (
<div role="status" aria-live="polite">
<div role="status" aria-live="polite" className="margin-bottom-2">
{t('results.results', {
currentPage,
pageRange: displayedRowsCount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-9 of 17 results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-3 of 7 results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ exports[`CR and TDLs page > matches snapshot 1`] = `
<span>
<div
aria-live="polite"
class="margin-bottom-2"
role="status"
>
Showing 1-2 of 2 results
Expand Down
Loading
Loading