Skip to content

Commit

Permalink
Fix/Update and remove deprecated dependencies (#922)
Browse files Browse the repository at this point in the history
* Trigger lockfile change

* debug event edit page content

* Update wp-env docker image

* Update .wp-env.json

* destroy wp env docker

* debug

* Run e2e in parallel

* Update pr-checks.yml

* Update deps

* downgrade jest

* Revert "downgrade jest"

This reverts commit 7bd3cbf.

* Revert "Update deps"

This reverts commit da58577.

* Fix vendor scripts

* Update pr-checks.yml

* Restore config

* Update package.json

* Update index.js

* Restore package.json

* Update yarn.lock

* Restore typeform

* Update dependencies

* Remove deprecated jest testEnvironment

* Fix lints as per the latest recommended config

* Fix form builder reducer

* Fix E2E
  • Loading branch information
manzoorwanijk committed Jun 11, 2021
1 parent b3e67b7 commit 4a726c0
Show file tree
Hide file tree
Showing 77 changed files with 2,126 additions and 1,798 deletions.
9 changes: 5 additions & 4 deletions domains/core/admin/blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"url": "git+https://github.com/eventespresso/barista.git"
},
"dependencies": {
"@wordpress/block-library": "^3.2.3",
"@wordpress/blocks": "^9.1.2",
"@wordpress/block-library": "^3.2.4",
"@wordpress/blocks": "^9.1.3",
"@wordpress/components": "^14.1.2",
"@wordpress/compose": "^4.1.1",
"@wordpress/editor": "^10.1.3",
"@wordpress/editor": "^10.1.4",
"@wordpress/url": "^3.1.1",
"react-select": "^4.3.1"
},
Expand All @@ -25,6 +25,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
3 changes: 2 additions & 1 deletion domains/core/admin/eventEditor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const useEntityActionsMenuItems = <E extends Entity, T extends string>(
entity: E,
filterByEntityType = true
): Array<React.ReactNode> => {
const registry = useMemo(() => new EntityActionsMenuRegistry({ domain, entityType, entityId: entity.id }), [
entity.id,
entityType,
]);
const registry = useMemo(
() => new EntityActionsMenuRegistry({ domain, entityType, entityId: entity.id }),
[entity.id, entityType]
);

const { generateElements } = registry;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const useEntityCardDetailsItems = <T extends string>(
entityId: EntityId,
filterByEntityType = true
): Array<React.ReactNode> => {
const registry = useMemo(() => new EntityCardDetailsRegistry({ domain, entityType, entityId }), [
entityId,
entityType,
]);
const registry = useMemo(
() => new EntityCardDetailsRegistry({ domain, entityType, entityId }),
[entityId, entityType]
);

const { generateElements } = registry;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import { EntityEditModalData } from '@edtrUI/types';
import useOnSubmit from './useOnSubmit';

const Container: React.FC = () => {
const { getData, isOpen, close: closeEditDateModal, setData } = useGlobalModal<EntityEditModalData>(
EdtrGlobalModals.EDIT_DATE
);
const {
getData,
isOpen,
close: closeEditDateModal,
setData,
} = useGlobalModal<EntityEditModalData>(EdtrGlobalModals.EDIT_DATE);
const { close: closeNewDateModal } = useGlobalModal(EdtrGlobalModals.NEW_DATE);

const onClose = useCallback(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ import { ActiveDatesFilters } from './filterBar';
const DatesList: React.FC = () => {
const filterState = useDatesListFilterState();

const renderList = useCallback(() => (filterState.view === 'card' ? <RenderCardView /> : <RenderTableView />), [
filterState.view,
]);
const renderList = useCallback(
() => (filterState.view === 'card' ? <RenderCardView /> : <RenderTableView />),
[filterState.view]
);

return (
<EntityList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,8 @@ import { DatetimeSales, DatetimeStatus } from '@eventespresso/predicates';
import { labels, statusOptions, salesOptions } from './controls/options';

const ActiveDatesFilters: React.FC = () => {
const {
status,
setStatus,
sales,
setSales,
searchText,
setSearchText,
recurrence,
setRecurrence,
} = useDatesListFilterState();
const { status, setStatus, sales, setSales, searchText, setSearchText, recurrence, setRecurrence } =
useDatesListFilterState();

const statusTitle = `${labels.status}: ${statusOptions?.[status]}`;
const salesTitle = `${labels.sales}: ${salesOptions?.[sales]}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ const renderDraggableItem: SortByControlProps<Datetime>['renderDraggableItem'] =
const SortByControl: React.FC = () => {
const { sortBy, setSortBy } = useDatesListFilterState();
const filteredDateIds = useFilteredDateIds();
const { allReorderedEntities: draggableItems, sortResponder, updateEntityList } = useReorderDatetimes(
filteredDateIds
);
const {
allReorderedEntities: draggableItems,
sortResponder,
updateEntityList,
} = useReorderDatetimes(filteredDateIds);

return (
<SortByControlUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ const ModalContainer: React.FC = () => {
);
}

const contextProps = useMemo(() => ({ assignmentType, entity, title, onCloseModal: onClose }), [
assignmentType,
entity,
onClose,
title,
]);
const contextProps = useMemo(
() => ({ assignmentType, entity, title, onCloseModal: onClose }),
[assignmentType, entity, onClose, title]
);

const onSubmit = useCallback<TAMModalProps['onSubmit']>(
async (data) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ const BodyCell: React.FC<RenderCellProps> = ({ datetime, ticket }) => {

const status = getAssignmentStatus({ datetimeId: datetime.id, ticketId: ticket.id });

const onClick = useCallback(() => toggleAssignment({ datetimeId: datetime.id, ticketId: ticket.id }), [
datetime.id,
ticket.id,
toggleAssignment,
]);
const onClick = useCallback(
() => toggleAssignment({ datetimeId: datetime.id, ticketId: ticket.id }),
[datetime.id, ticket.id, toggleAssignment]
);

const icon = useMemo(() => getRelationIcon(status), [status]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import { ContextProvider, ProviderProps } from '../../context';

const ApolloWrapper = ApolloMockedProvider();

const TestWrapper = (props: ProviderProps): React.FC => ({ children }) => {
return (
<ApolloWrapper>
<ContextProvider {...props}>{children}</ContextProvider>
</ApolloWrapper>
);
};
const TestWrapper =
(props: ProviderProps): React.FC =>
({ children }) => {
return (
<ApolloWrapper>
<ContextProvider {...props}>{children}</ContextProvider>
</ApolloWrapper>
);
};

export default TestWrapper;
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ const useDataStateManager = (props: BaseProps): DataStateManager => {
const { initialize, isInitialized } = assignmentManager;
const initialized = isInitialized();

const hasNoAssignedDates = useCallback(({ ticketId }) => orphanEntities.tickets.includes(ticketId), [
orphanEntities.tickets,
]);
const hasNoAssignedDates = useCallback(
({ ticketId }) => orphanEntities.tickets.includes(ticketId),
[orphanEntities.tickets]
);

const hasNoAssignedTickets = useCallback(({ datetimeId }) => orphanEntities.datetimes.includes(datetimeId), [
orphanEntities.datetimes,
]);
const hasNoAssignedTickets = useCallback(
({ datetimeId }) => orphanEntities.datetimes.includes(datetimeId),
[orphanEntities.datetimes]
);

const hasOrphanEntitiesOfType = useCallback(
(entityType: keyof typeof orphanEntities) => {
Expand All @@ -50,10 +52,10 @@ const useDataStateManager = (props: BaseProps): DataStateManager => {

const hasOrphanDates = useCallback(() => hasOrphanEntitiesOfType('datetimes'), [hasOrphanEntitiesOfType]);

const hasOrphanEntities = useCallback(() => hasOrphanTickets() || hasOrphanDates(), [
hasOrphanDates,
hasOrphanTickets,
]);
const hasOrphanEntities = useCallback(
() => hasOrphanTickets() || hasOrphanDates(),
[hasOrphanDates, hasOrphanTickets]
);

const getOldRelation = useCallback(
({ datetimeId }): EntityId[] => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ const useFilteredDatetimes = (allDates: Array<Datetime>): Array<Datetime> => {
const datesInYearAndMonth = inYearAndMonth(datesByMonth);

// If the year i.e. datesByMonth[0] is set, then filter
const datetimes = useMemo(() => (datesByMonth[0] ? datesInYearAndMonth(allDates) : allDates), [
allDates,
datesByMonth,
datesInYearAndMonth,
]);
const datetimes = useMemo(
() => (datesByMonth[0] ? datesInYearAndMonth(allDates) : allDates),
[allDates, datesByMonth, datesInYearAndMonth]
);

return useMemo(() => {
return showTrashedDates ? datetimes : notTrashed(datetimes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ const DatesByMonthControl: React.FC<DatesByMonthControlProps> = ({ datesByMonth,
const yearMonth = datesByMonth.join(':');

// Add all dates option at the top, "0:0" to match the "year:month" format
const monthsListWithAllDates = useMemo(() => [{ value: '0:0', label: __('All Dates') }, ...monthsList], [
monthsList,
]);
const monthsListWithAllDates = useMemo(
() => [{ value: '0:0', label: __('All Dates') }, ...monthsList],
[monthsList]
);

return (
<SelectWithLabel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import { EntityEditModalData } from '@edtrUI/types';
import useOnSubmit from './useOnSubmit';

const Container: React.FC = () => {
const { getData, isOpen, close: closeModal, setData } = useGlobalModal<EntityEditModalData>(
EdtrGlobalModals.EDIT_TICKET
);
const {
getData,
isOpen,
close: closeModal,
setData,
} = useGlobalModal<EntityEditModalData>(EdtrGlobalModals.EDIT_TICKET);

const onClose = useCallback(() => {
closeModal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import { ActiveTicketsFilters } from './filterBar';
const TicketsList: React.FC = () => {
const filterState = useTicketsListFilterState();

const renderList = useCallback(() => (filterState.view === 'card' ? <RenderCardView /> : <RenderTableView />), [
filterState.view,
]);
const renderList = useCallback(
() => (filterState.view === 'card' ? <RenderCardView /> : <RenderTableView />),
[filterState.view]
);

return (
<EntityList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,8 @@ import { TicketsSales, TicketsStatus } from '@eventespresso/predicates';
import { labels, statusOptions, salesOptions } from './controls/options';

const ActiveTicketsSFilters: React.FC = () => {
const {
status,
setStatus,
sales,
setSales,
searchText,
setSearchText,
isChained,
toggleIsChained,
} = useTicketsListFilterState();
const { status, setStatus, sales, setSales, searchText, setSearchText, isChained, toggleIsChained } =
useTicketsListFilterState();

const statusTitle = `${labels.status}: ${statusOptions?.[status]}`;
const salesTitle = `${labels.sales}: ${salesOptions?.[sales]}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ const renderDraggableItem: SortByControlProps<Ticket>['renderDraggableItem'] = (
const SortByControl: React.FC = () => {
const { sortBy, setSortBy } = useTicketsListFilterState();
const filteredTicketIds = useFilteredTicketIds();
const { allReorderedEntities: draggableItems, sortResponder, updateEntityList } = useReorderTickets(
filteredTicketIds
);
const {
allReorderedEntities: draggableItems,
sortResponder,
updateEntityList,
} = useReorderTickets(filteredTicketIds);

return (
<SortByControlUI
Expand Down
3 changes: 2 additions & 1 deletion domains/core/admin/wpPluginsPage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
3 changes: 2 additions & 1 deletion domains/eventSmart/admin/edtrSlots/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
3 changes: 2 additions & 1 deletion domains/eventSmart/admin/upsellEditor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
3 changes: 2 additions & 1 deletion domains/rem/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -u"
"update-deps": "npx ncu -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const useRecurrenceMutator = (id = ''): RM => {

const mutationHandler = useMutationHandler();

const getUpdateCallback = useUpdateCallback((TypeName.Recurrence as unknown) as EdtrTypeName);
const getUpdateCallback = useUpdateCallback(TypeName.Recurrence as unknown as EdtrTypeName);

const createEntity = useCallback<RM['createEntity']>(
(input) => {
Expand Down
2 changes: 1 addition & 1 deletion domains/rem/src/ui/Tickets/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ContentRenderer } from './multiStep';

const Tickets: React.FC = () => {
const { addTicket, tickets, deleteTicket } = useFormState();
const templates = (useTickets() as unknown) as RemTicket[];
const templates = useTickets() as unknown as RemTicket[];
const { utcToSiteTime } = useTimeZoneTime();
const getTicketPrices = useTicketPrices();
const prepTemplatePrices = usePrepTemplatePrices();
Expand Down
9 changes: 4 additions & 5 deletions domains/rem/src/ui/generatedDates/GeneratedDates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ import './bg-colors.scss';
const GeneratedDates: React.FC = () => {
const dates = useGenerateDates(true);
const { pageNumber, perPage, setPerPage, setPageNumber } = usePagination();
const paginatedDates = useMemo(() => paginateEntities({ entities: dates, pageNumber, perPage }), [
dates,
pageNumber,
perPage,
]);
const paginatedDates = useMemo(
() => paginateEntities({ entities: dates, pageNumber, perPage }),
[dates, pageNumber, perPage]
);
const total = dates?.length;

return (
Expand Down
3 changes: 2 additions & 1 deletion domains/wpUser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"scripts": {
"lint": "eslint ./src/**/*.{ts,tsx} --format=codeframe",
"update-deps": "npx ncu -p yarn -u"
"update-deps": "npx ncu -p yarn -u",
"lint-fix": "eslint ./src/**/*.{ts,tsx} --fix"
}
}

0 comments on commit 4a726c0

Please sign in to comment.