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.

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

UISACQCOMP-166: configure the plugin via props #726

Merged
merged 12 commits into from
Nov 9, 2023
Merged

UISACQCOMP-166: configure the plugin via props #726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa43be4
UISACQCOMP-166: configure the plugin via props
alisher-epam Nov 7, 2023
9055af6
refactor: move logic to component container
alisher-epam Nov 7, 2023
0777355
test: fix failing tests
alisher-epam Nov 7, 2023
c2ede79
test: add test cases
alisher-epam Nov 8, 2023
601a880
refactor: change component name
alisher-epam Nov 8, 2023
bffeaf6
remove isRequired attribute from name prop
alisher-epam Nov 8, 2023
8bbe386
refactor: default props
alisher-epam Nov 8, 2023
ebbf189
refactor: add default formatter
alisher-epam Nov 8, 2023
8f71be6
change default export to named export
alisher-epam Nov 8, 2023
2ef422e
remove default formatter
alisher-epam Nov 8, 2023
3385e50
update DonorsList with providing default formatter
alisher-epam Nov 8, 2023
1b88905
fix formatter
alisher-epam Nov 8, 2023
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
10 changes: 9 additions & 1 deletion lib/Donors/DonorsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { isEmpty } from 'lodash';
import PropTypes from 'prop-types';

import { MultiColumnList } from '@folio/stripes/components';
import { useStripes } from '@folio/stripes/core';

import {
alignRowProps,
defaultColumnMapping,
defaultVisibleColumns,
} from './constants';

import { getDonorsListFormatter } from './utils';

export const DonorsList = ({
columnMapping,
columnWidths,
Expand All @@ -16,12 +20,16 @@ export const DonorsList = ({
id,
visibleColumns,
}) => {
const stripes = useStripes();
const canViewOrganizations = stripes.hasPerm('ui-organizations.view');
const defaultFormatter = isEmpty(formatter) || getDonorsListFormatter({ canViewOrganizations });
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you need isEmpty here? Moreover:

isEmpty(undefined) || getDonorsListFormatter(..) // true ??
isEmpty({ foo: 'bar' }) || getDonorsListFormatter(..)  // default formatter even we passed one through the props ??

just:

export const DonorsList = ({
  ..
  formatter: formatterProp,
  ..
}) => {
..
const formatter = useMemo(() => formatterProp || getDonorsListFormatter({ canViewOrganizations }), [formatterProp, canViewOrganizations]);
..


return (
<MultiColumnList
id={id}
columnMapping={columnMapping}
contentData={contentData}
formatter={formatter}
formatter={defaultFormatter}
rowProps={alignRowProps}
visibleColumns={visibleColumns}
columnWidths={columnWidths}
Expand Down
2 changes: 2 additions & 0 deletions lib/Donors/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { Donors } from './Donors';
export { DonorsList } from './DonorsList';
export { useFetchDonors } from './hooks/useFetchDonors';
Loading