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

UIU-3141 - refactor away from default props for functional components. #2832

Merged
merged 2 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Fix issue with `Proxy borrower` field value. Refs UIU-3290.
* Remove duplicates from the keyboard shortcut modal. Refs UIU-3026.
* Add sub permission `manual-block-templates.collection.get` to permission `Users: Can create, edit and remove patron blocks`. Refs UIU-3305.
* React v19: refactor away from default props for functional components. Refs. UIU-3141.

## [11.0.9](https://github.com/folio-org/ui-users/tree/v11.0.9) (2024-12-13)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.8...v11.0.9)
Expand Down
12 changes: 3 additions & 9 deletions src/components/AffiliationsManager/AffiliationsManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { AffiliationsManagerModal } from './AffiliationsManagerModal';
import AffiliationsManagerTrigger from './AffiliationsManagerTrigger';

const AffiliationsManager = ({
disabled,
disabled = false,
onUpdateAffiliations,
renderTrigger,
renderTrigger = AffiliationsManagerTrigger,
userId,
withTrigger,
withTrigger = true,
}) => {
const [isModalOpen, toggleModal] = useToggle(!withTrigger);

Expand All @@ -36,10 +36,4 @@ AffiliationsManager.propTypes = {
withTrigger: PropTypes.bool,
};

AffiliationsManager.defaultProps = {
disabled: false,
renderTrigger: AffiliationsManagerTrigger,
withTrigger: true,
};

export default AffiliationsManager;
6 changes: 1 addition & 5 deletions src/components/AffiliationsSelect/AffiliationsSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Selection } from '@folio/stripes/components';
import { affiliationsShape } from '../../shapes';

const AffiliationsSelect = ({
id,
id = 'user-assigned',
affiliations,
value,
onChange,
Expand Down Expand Up @@ -53,10 +53,6 @@ const AffiliationsSelect = ({
);
};

AffiliationsSelect.defaultProps = {
id: 'user-assigned',
};

AffiliationsSelect.propTypes = {
affiliations: affiliationsShape,
onChange: PropTypes.func.isRequired,
Expand Down
11 changes: 6 additions & 5 deletions src/components/AssignedUsers/AssignedUsersContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ import AssignUsers from './AssignUsers';
import AssignedUsersList from './AssignedUsersList';
import { getUpdatedUsersList } from './utils';

const AssignedUsersContainer = ({ permissionSetId, expanded, onToggle, tenantId }) => {
const AssignedUsersContainer = ({
permissionSetId,
expanded = true,
onToggle,
tenantId
}) => {
const callout = useCallout();
const intl = useIntl();

Expand Down Expand Up @@ -123,8 +128,4 @@ AssignedUsersContainer.propTypes = {
tenantId: PropTypes.string,
};

AssignedUsersContainer.defaultProps = {
expanded: true,
};

export default AssignedUsersContainer;
7 changes: 1 addition & 6 deletions src/components/AssignedUsers/AssignedUsersList.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
VISIBLE_COLUMNS,
} from './constants';

const AssignedUsersList = ({ users, isFetching }) => (
const AssignedUsersList = ({ users = [], isFetching = false }) => (
<Row
start="xs"
data-test-assigned-users
Expand All @@ -34,9 +34,4 @@ AssignedUsersList.propTypes = {
isFetching: PropTypes.bool,
};

AssignedUsersList.defaultProps = {
users: [],
isFetching: false,
};

export default AssignedUsersList;
7 changes: 1 addition & 6 deletions src/components/BulkRenewalDialog/BulkRenewedLoansList.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@ const propTypes = {
errorMessages: PropTypes.object.isRequired,
};

const defaultProps = {
height: 300,
};

const BulkRenewedLoansList = (props) => {
const {
failedRenewals,
successRenewals,
height,
height = 300,
errorMessages,
requestCounts,
loanPolicies,
Expand Down Expand Up @@ -126,7 +122,6 @@ const BulkRenewedLoansList = (props) => {
);
};

BulkRenewedLoansList.defaultProps = defaultProps;
BulkRenewedLoansList.propTypes = propTypes;

export default BulkRenewedLoansList;
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {

import { USER_TYPES } from '../../../../../constants';

const ChangeUserTypeModal = ({ onChange, initialUserType, open }) => {
const ChangeUserTypeModal = ({ onChange, initialUserType, open = false }) => {
const userTypeModalFooter = (
<ModalFooter>
<Button
Expand Down Expand Up @@ -47,8 +47,4 @@ ChangeUserTypeModal.propTypes = {
open: PropTypes.bool,
};

ChangeUserTypeModal.defaultProps = {
open: false,
};

export default ChangeUserTypeModal;
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import css from './CheckboxColumn.css';
const CheckboxColumn = memo(props => {
const {
value,
checked,
checked = false,
roleName,
onChange,
onChange = noop,
} = props;

return (
Expand Down Expand Up @@ -39,9 +39,4 @@ CheckboxColumn.propTypes = {
onChange: PropTypes.func,
};

CheckboxColumn.defaultProps = {
checked: false,
onChange: noop,
};

export default CheckboxColumn;
7 changes: 1 addition & 6 deletions src/components/Loans/components/ActionsBar/ActionsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ const propTypes = {
contentEnd: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
};

const defaultProps = {
show: true,
};

const ActionsBar = ({ show, contentStart, contentEnd }) => {
const ActionsBar = ({ show = true, contentStart, contentEnd }) => {
if (!show) {
return null;
}
Expand All @@ -30,6 +26,5 @@ const ActionsBar = ({ show, contentStart, contentEnd }) => {
};

ActionsBar.propTypes = propTypes;
ActionsBar.defaultProps = defaultProps;

export default ActionsBar;
18 changes: 5 additions & 13 deletions src/components/PermissionsAccordion/PermissionsAccordion.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ const PermissionsAccordion = (props) => {
const {
accordionId,
affiliations,
disabled,
disabled = false,
expanded,
onChangeAffiliation,
onChangeAffiliation = noop,
onToggle,
permToModify,
permToDelete,
permissionsField,
filtersConfig,
visibleColumns,
headlineContent,
excludePermissionSets,
initialValues: { personal },
isLoading,
excludePermissionSets = false,
initialValues: { personal } = {},
isLoading = false,
form: { change },
setButtonRef,
tenantId,
Expand Down Expand Up @@ -310,12 +310,4 @@ PermissionsAccordion.propTypes = {
setButtonRef: PropTypes.func
};

PermissionsAccordion.defaultProps = {
disabled: false,
excludePermissionSets: false,
initialValues: {},
isLoading: false,
onChangeAffiliation: noop,
};

export default stripesConnect(injectIntl(PermissionsAccordion));
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import css from './CheckboxColumn.css';
const CheckboxColumn = memo(props => {
const {
value,
checked,
checked = false,
permissionName,
onChange,
onChange = noop,
} = props;

return (
Expand Down Expand Up @@ -39,9 +39,4 @@ CheckboxColumn.propTypes = {
onChange: PropTypes.func,
};

CheckboxColumn.defaultProps = {
checked: false,
onChange: noop,
};

export default CheckboxColumn;
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export const getComponentText = (text, additionalText = defaultAdditionalText, c

const ShowLongContentInPopover = ({
text,
additionalText,
contentLength,
additionalText = defaultAdditionalText,
contentLength = defaultContentLength,
}) => {
const {
contentText,
Expand All @@ -61,9 +61,4 @@ ShowLongContentInPopover.propTypes = {
contentLength: PropTypes.number,
};

ShowLongContentInPopover.defaultProps = {
additionalText: defaultAdditionalText,
contentLength: defaultContentLength,
};

export default ShowLongContentInPopover;
Loading