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

fix: [DHIS2-17843] Disable delete enrollment button when user does not have authority #3859

Merged
merged 6 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
7 changes: 5 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
"PO-Revision-Date: 2024-10-14T14:53:34.553Z\n"
"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
"PO-Revision-Date: 2024-10-25T18:18:11.518Z\n"

msgid "Choose one or more dates..."
msgstr "Choose one or more dates..."
Expand Down Expand Up @@ -1133,6 +1133,9 @@ msgstr "Mark as cancelled"
msgid "Mark incomplete"
msgstr "Mark incomplete"

msgid "You do not have access to delete this enrollment"
msgstr "You do not have access to delete this enrollment"

msgid "Delete enrollment"
msgstr "Delete enrollment"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const ActionsPlain = ({
onUpdate,
onDelete,
onUpdateOwnership,
canCascadeDeleteEnrollment,
isTransferLoading,
onAddNew,
loading,
Expand Down Expand Up @@ -115,6 +116,7 @@ export const ActionsPlain = ({
onUpdate={handleOnUpdateStatus}
/>
<Delete
canCascadeDeleteEnrollment={canCascadeDeleteEnrollment}
enrollment={enrollment}
onDelete={handleOnDelete}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ActionsComponent } from './Actions.component';
import type { Props } from './actions.types';
import { useUpdateEnrollment, useDeleteEnrollment } from '../dataMutation/dataMutation';
import { useUpdateOwnership } from './Transfer/hooks';
import { useAuthorities } from '../hooks/useAuthorities';

export const Actions = ({
enrollment = {},
Expand All @@ -20,6 +21,7 @@ export const Actions = ({
}: Props) => {
const { updateMutation, updateLoading } = useUpdateEnrollment(refetchEnrollment, refetchTEI, onError, onSuccess);
const { deleteMutation, deleteLoading } = useDeleteEnrollment(onDelete, onError, onSuccess);
const { canCasacdeDeleteEnrollment } = useAuthorities();
const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({
teiId: enrollment.trackedEntity,
programId: enrollment.program,
Expand Down Expand Up @@ -52,6 +54,7 @@ export const Actions = ({
onUpdate={updateMutation}
onUpdateStatus={handleUpdateStatus}
onDelete={deleteMutation}
canCascadeDeleteEnrollment={canCasacdeDeleteEnrollment}
loading={updateLoading || deleteLoading || updateStatusLoading}
onUpdateOwnership={updateEnrollmentOwnership}
isTransferLoading={isTransferLoading}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// @flow
import React, { useState, useMemo } from 'react';
import {
IconDelete16,
MenuItem,
Expand All @@ -9,18 +10,21 @@ import {
ButtonStrip,
Button,
} from '@dhis2/ui';
import React, { useState } from 'react';
import i18n from '@dhis2/d2-i18n';
import type { Props } from './delete.types';
import { ConditionalTooltip } from '../../../Tooltips/ConditionalTooltip/';

export const Delete = ({ enrollment, onDelete }: Props) => {
export const Delete = ({ canCascadeDeleteEnrollment, enrollment, onDelete }: Props) => {
const [toggle, setToggle] = useState(false);
const disabled = useMemo(() => !canCascadeDeleteEnrollment, [canCascadeDeleteEnrollment]);
henrikmv marked this conversation as resolved.
Show resolved Hide resolved
const tooltipContent = i18n.t('You do not have access to delete this enrollment');

return (
<div>
<ConditionalTooltip content={tooltipContent} enabled={disabled}>
<MenuItem
dense
dataTest="widget-enrollment-actions-delete"
disabled={disabled}
icon={<IconDelete16 />}
destructive
label={i18n.t('Delete')}
Expand Down Expand Up @@ -54,6 +58,6 @@ export const Delete = ({ enrollment, onDelete }: Props) => {
</ModalActions>
</Modal>
)}
</div>
</ConditionalTooltip>
);
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow

export type Props = {|
canCascadeDeleteEnrollment: boolean,
enrollment: Object,
onDelete: (arg: Object) => void,
|};
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type PlainProps = {|
onDelete: (arg: Object) => void,
onAddNew: (arg: Object) => void,
onUpdateOwnership: UpdateEnrollmentOwnership,
canCascadeDeleteEnrollment: boolean,
isTransferLoading: boolean,
loading: boolean,
canAddNew: boolean,
Expand Down
henrikmv marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// @flow
import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';

const auth = Object.freeze({
F_ENROLLMENT_CASCADE_DELETE: 'F_ENROLLMENT_CASCADE_DELETE',
ALL: 'ALL',
});

export const useAuthorities = () => {
const queryKey = ['authorities'];
const queryFn = {
resource: 'me.json',
params: {
fields: 'authorities',
},
};
const queryOptions = {
select: ({ authorities }) =>
authorities &&
authorities.some(authority => authority === auth.ALL || authority === auth.F_ENROLLMENT_CASCADE_DELETE),
};
const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);

return {
canCasacdeDeleteEnrollment: Boolean(data),
};
};
Loading