Skip to content

ARC-3323: Keep old columns and no filters for non key users #1329

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

Closed
reunefe wants to merge 1 commit into from
Closed

ARC-3323: Keep old columns and no filters for non key users #1329

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
94 changes: 58 additions & 36 deletions src/modules/account/const/my-material-requests.const.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,39 @@ export const GET_MATERIAL_REQUEST_DOWNLOAD_FILTER_ARRAY = (): {
},
];

export const getAccountMaterialRequestTableColumns = (): Column<MaterialRequest>[] => [
{
Header: tText('modules/cp/const/material-requests___materiaal'),
accessor: MaterialRequestKeys.material,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<span className="p-material-requests__table-titel-material">
<span className="p-material-requests__table-titel-material-name">
{original.objectSchemaName}
</span>
<span className="p-material-requests__table-titel-material-provider">
{original.maintainerName}
</span>
</span>
),
},
export const getAccountMaterialRequestTableColumns = (
isKeyUser: boolean
): Column<MaterialRequest>[] => [
...(isKeyUser
? [
{
Header: tText('modules/cp/const/material-requests___materiaal'),
accessor: MaterialRequestKeys.material,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<span className="p-material-requests__table-titel-material">
<span className="p-material-requests__table-titel-material-name">
{original.objectSchemaName}
</span>
<span className="p-material-requests__table-titel-material-provider">
{original.maintainerName}
</span>
</span>
),
},
]
: [
{
Header: tText('modules/cp/const/material-requests___materiaal'),
accessor: MaterialRequestKeys.material,
},
{
Header: tText('modules/cp/const/material-requests___aanbieder'),
accessor: MaterialRequestKeys.maintainer,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<span className="u-color-neutral">{original.maintainerName}</span>
),
},
]),
{
Header: tText('modules/cp/const/material-requests___aangevraagd-op'),
accessor: MaterialRequestKeys.requestedAt,
Expand All @@ -125,25 +143,29 @@ export const getAccountMaterialRequestTableColumns = (): Column<MaterialRequest>
</span>
),
},
{
Header: tText('modules/cp/const/material-requests___status'),
accessor: MaterialRequestKeys.status,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<MaterialRequestStatusPill status={original.status} />
),
},
{
Header: tText('modules/cp/const/material-requests___download'),
accessor: MaterialRequestKeys.downloadUrl,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<MaterialRequestDownloadButton materialRequest={original} />
),
},
{
Header: tText('modules/cp/const/material-requests___request-name'),
accessor: MaterialRequestKeys.requestName,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<span className="u-color-neutral">{original.requestName}</span>
),
},
...(isKeyUser
? [
{
Header: tText('modules/cp/const/material-requests___status'),
accessor: MaterialRequestKeys.status,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<MaterialRequestStatusPill status={original.status} />
),
},
{
Header: tText('modules/cp/const/material-requests___download'),
accessor: MaterialRequestKeys.downloadUrl,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<MaterialRequestDownloadButton materialRequest={original} />
),
},
{
Header: tText('modules/cp/const/material-requests___request-name'),
accessor: MaterialRequestKeys.requestName,
Cell: ({ row: { original } }: MaterialRequestRow) => (
<span className="u-color-neutral">{original.requestName}</span>
),
},
]
: []),
];
190 changes: 97 additions & 93 deletions src/modules/account/views/AccountMyMaterialRequests.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import { ROUTES_BY_LOCALE } from '@shared/const';
import { QUERY_PARAM_KEY } from '@shared/const/query-param-keys';
import { tHtml, tText } from '@shared/helpers/translate';
import { useHasAnyPermission } from '@shared/hooks/has-permission';
import { useIsKeyUser } from '@shared/hooks/is-key-user';
import { useLocale } from '@shared/hooks/use-locale/use-locale';
import type { DefaultSeoInfo } from '@shared/types/seo';
import { VisitorLayout } from '@visitor-layout/index';
Expand All @@ -59,6 +60,7 @@ export const AccountMyMaterialRequests: FC<DefaultSeoInfo> = ({ url, canonicalUr
const hasOwnMaterialRequestsPerm = useHasAnyPermission(Permission.VIEW_OWN_MATERIAL_REQUESTS);
const hasAnyMaterialRequestsPerm = useHasAnyPermission(Permission.VIEW_ANY_MATERIAL_REQUESTS);
const locale = useLocale();
const isKeyUser = useIsKeyUser();

const { data: currentMaterialRequestDetail, isFetching: isLoading } = useGetMaterialRequestById(
currentMaterialRequest?.id || null
Expand Down Expand Up @@ -228,7 +230,7 @@ export const AccountMyMaterialRequests: FC<DefaultSeoInfo> = ({ url, canonicalUr
<Table<MaterialRequest>
className="u-mt-24 p-material-requests__table p-account-my-material-requests__table"
options={{
columns: getAccountMaterialRequestTableColumns(),
columns: getAccountMaterialRequestTableColumns(isKeyUser),
data: materialRequests?.items || [],
initialState: {
pageSize: ACCOUNT_MATERIAL_REQUESTS_TABLE_PAGE_SIZE,
Expand Down Expand Up @@ -279,103 +281,105 @@ export const AccountMyMaterialRequests: FC<DefaultSeoInfo> = ({ url, canonicalUr
'u-text-center u-color-neutral u-py-48': isFetching || noData,
})}
>
<div className="l-container">
<div className="p-material-requests__header">
<div className={clsx('u-flex', 'u-flex-row', 'u-gap-sm')}>
<MultiSelect
variant="rounded"
label={tText('Type')}
options={typesList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Type aanvraag')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedTypes,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedTypes,
}}
/>
{isKeyUser && (
<div className="l-container">
<div className="p-material-requests__header">
<div className={clsx('u-flex', 'u-flex-row', 'u-gap-sm')}>
<MultiSelect
variant="rounded"
label={tText('Type')}
options={typesList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Type aanvraag')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedTypes,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedTypes,
}}
/>

<MultiSelect
variant="rounded"
label={tText('Status')}
options={statusList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Status aanvraag')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedStatuses,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedStatuses,
}}
/>
<MultiSelect
variant="rounded"
label={tText('Status')}
options={statusList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Status aanvraag')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedStatuses,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedStatuses,
}}
/>

<MultiSelect
variant="rounded"
label={tText('Download')}
options={downloadUrlList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Aanvraag met download')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedDownloadFilters,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedDownloadFilters,
}}
/>
</div>

<MultiSelect
variant="rounded"
label={tText('Download')}
options={downloadUrlList}
onChange={noop}
className={clsx(
'p-material-requests__dropdown',
'p-material-requests__dropdown-no-dividers'
)}
iconOpen={<Icon name={IconNamesLight.AngleUp} aria-hidden />}
iconClosed={<Icon name={IconNamesLight.AngleDown} aria-hidden />}
iconCheck={<Icon name={IconNamesLight.Check} aria-hidden />}
checkboxHeader={tText('Aanvraag met download')}
confirmOptions={{
label: tText('Pas toe'),
variants: ['black'],
onClick: setSelectedDownloadFilters,
}}
resetOptions={{
icon: <Icon className="u-font-size-22" name={IconNamesLight.Redo} />,
label: tText('Reset'),
variants: ['text'],
onClick: setSelectedDownloadFilters,
}}
<SearchBar
id="materiaalaanvragen-searchbar"
value={search}
className="p-material-requests__searchbar"
placeholder={tText('Zoek')}
onChange={setSearch}
onSearch={(newValue) =>
setFilters({
[QUERY_PARAM_KEY.SEARCH_QUERY_KEY]: newValue,
page: 1,
})
}
/>
</div>

<SearchBar
id="materiaalaanvragen-searchbar"
value={search}
className="p-material-requests__searchbar"
placeholder={tText('Zoek')}
onChange={setSearch}
onSearch={(newValue) =>
setFilters({
[QUERY_PARAM_KEY.SEARCH_QUERY_KEY]: newValue,
page: 1,
})
}
/>
</div>
</div>
)}

{isFetching && <Loading owner="Material requests overview" fullscreen />}
{noData && renderEmptyMessage()}
Expand Down