Skip to content

Commit

Permalink
fix: bulk update delete flag (#3466)
Browse files Browse the repository at this point in the history
Allow deleting with BULK_UPDATE flag turned off
  • Loading branch information
Tymek committed Apr 6, 2023
1 parent e0b59ba commit e864657
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
Expand Up @@ -5,6 +5,7 @@ import Input from 'component/common/Input/Input';
import { formatUnknownError } from 'utils/formatUnknownError';
import useToast from 'hooks/useToast';
import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';

interface IArchivedFeatureDeleteConfirmProps {
deletedFeatures: string[];
Expand Down Expand Up @@ -34,14 +35,21 @@ export const ArchivedFeatureDeleteConfirm = ({
}: IArchivedFeatureDeleteConfirmProps) => {
const [confirmName, setConfirmName] = useState('');
const { setToastData, setToastApiError } = useToast();
const { deleteFeatures } = useProjectApi();
const { deleteFeature, deleteFeatures } = useProjectApi();
const { uiConfig } = useUiConfig();

const onDeleteFeatureToggle = async () => {
try {
if (deletedFeatures.length === 0) {
return;
}
await deleteFeatures(projectId, deletedFeatures);

if (uiConfig?.flags?.bulkOperations) {
await deleteFeatures(projectId, deletedFeatures);
} else {
await deleteFeature(deletedFeatures[0]);
}

await refetch();
setToastData({
type: 'success',
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/hooks/api/actions/useProjectApi/useProjectApi.ts
Expand Up @@ -223,6 +223,15 @@ const useProjectApi = () => {
return makeRequest(req.caller, req.id);
};

const deleteFeature = async (featureId: string) => {
const path = `api/admin/archive/${featureId}`;
const req = createRequest(path, {
method: 'DELETE',
});

return makeRequest(req.caller, req.id);
};

const deleteFeatures = async (projectId: string, featureIds: string[]) => {
const path = `api/admin/projects/${projectId}/delete`;
const req = createRequest(path, {
Expand Down Expand Up @@ -267,6 +276,7 @@ const useProjectApi = () => {
archiveFeatures,
reviveFeatures,
staleFeatures,
deleteFeature,
deleteFeatures,
searchProjectUser,
errors,
Expand Down

0 comments on commit e864657

Please sign in to comment.