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

fix: [DHIS2-17519] app crashing when opening new event from view event #3781

Merged
merged 4 commits into from
Nov 25, 2024
Merged

fix: [DHIS2-17519] app crashing when opening new event from view event #3781

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
591759e
fix: app crashing when openeing new event from view event
alaa-yahia Sep 2, 2024
c7030c7
fix: types
alaa-yahia Sep 4, 2024
60cb43d
chore: remove unnecessary code
alaa-yahia Sep 4, 2024
927182b
Merge remote-tracking branch 'origin/master' into DHIS2-17519-app-cra…
alaa-yahia Nov 20, 2024
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
8 changes: 7 additions & 1 deletion ...onents/DataEntries/SingleEventRegistrationEntry/SingleEventRegistrationEntry.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
// @flow
import React from 'react';
import { useSelector } from 'react-redux';
import { NewEventDataEntryWrapper } from './DataEntryWrapper/NewEventDataEntryWrapper.container';
import { NewRelationshipWrapper } from './NewRelationshipWrapper/NewEventNewRelationshipWrapper.container';
import { SelectionsNoAccess } from './SelectionsNoAccess/dataEntrySelectionsNoAccess.container';
import type { Props } from './SingleEventRegistrationEntry.types';

export const SingleEventRegistrationEntryComponent = ({ showAddRelationship, eventAccess }: Props) => {
export const SingleEventRegistrationEntryComponent = ({ showAddRelationship, eventAccess, id }: Props) => {
const itemId = useSelector((state: ReduxState) => state.dataEntries[id]?.itemId);
if (itemId && itemId !== 'newEvent') {
alaa-yahia marked this conversation as resolved.
Show resolved Hide resolved
return null;
}

if (!eventAccess.write) {
return (
<SelectionsNoAccess />
Expand Down
23 changes: 13 additions & 10 deletions ...onents/DataEntries/SingleEventRegistrationEntry/SingleEventRegistrationEntry.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { makeEventAccessSelector } from './SingleEventRegistrationEntry.selector
import { withLoadingIndicator } from '../../../HOC';
import { defaultDialogProps as dialogConfig } from '../../Dialogs/DiscardDialog.constants';
import { getOpenDataEntryActions } from './DataEntryWrapper/DataEntry';
import type { ContainerProps, StateProps, MapStateToProps } from './SingleEventRegistrationEntry.types';
import type { ContainerProps, StateProps, MapStateToProps, Props, MapDispatchToProps } from './SingleEventRegistrationEntry.types';
import { useCategoryCombinations } from '../../DataEntryDhis2Helpers/AOC/useCategoryCombinations';

const inEffect = (state: ReduxState) => dataEntryHasChanges(state, 'singleEvent-newEvent') || state.newEventPage.showAddRelationship;
Expand All @@ -25,9 +25,12 @@ const makeMapStateToProps = (): MapStateToProps => {
});
};

const mapDispatchToProps = () => ({});
const mapDispatchToProps: MapDispatchToProps = () => ({});

const mergeProps = (stateProps: StateProps): StateProps => (stateProps);
const mergeProps = (stateProps: StateProps, dispatchProps: {||}, ownProps: ContainerProps): Props => ({
...stateProps,
...ownProps,
});

const openSingleEventDataEntry = (InnerComponent: React.ComponentType<ContainerProps>) => (
(props: ContainerProps) => {
Expand Down Expand Up @@ -59,13 +62,13 @@ export const SingleEventRegistrationEntry: React.ComponentType<ContainerProps> =
compose(
openSingleEventDataEntry,
connect<
StateProps,
ContainerProps,
StateProps,
*,
ReduxState,
*,
>(makeMapStateToProps, mapDispatchToProps, mergeProps),
Props,
ContainerProps,
StateProps,
{||},
ReduxState,
*
>(makeMapStateToProps, mapDispatchToProps, mergeProps),
withLoadingIndicator(),
withBrowserBackWarning(dialogConfig, inEffect),
)(SingleEventRegistrationEntryComponent);
18 changes: 10 additions & 8 deletions ...components/DataEntries/SingleEventRegistrationEntry/SingleEventRegistrationEntry.types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
// @flow
export type Props = {|
export type StateProps = {|
ready: boolean,
superskip marked this conversation as resolved.
Show resolved Hide resolved
showAddRelationship: boolean,
eventAccess: {|
read: boolean,
write: boolean,
|},
|};

export type StateProps = {|
ready: boolean,
...Props,
|}

export type ContainerProps = {|
id: string,
selectedScopeId: string,
|};

export type DispatchProps = {|
onCancel: () => void,
export type Props = {|
...ContainerProps,
...StateProps,
|};

export type DispatchProps = () => {||};
alaa-yahia marked this conversation as resolved.
Show resolved Hide resolved

export type MapDispatchToProps = () => {||};

export type MapStateToProps = (ReduxState, ContainerProps) => StateProps;

Loading