Skip to content
Open
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
2 changes: 1 addition & 1 deletion app/views/CapacityAndResources/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function CapacityAndResourcesList() {
variables: {
filters: {
isActive: isDefined(filter.isActive) ? filter.isActive === 'true' : undefined,
title: filter.search ? { iContains: filter.search } : undefined,
search: filter.search || undefined,
},
pagination: {
limit,
Expand Down
46 changes: 35 additions & 11 deletions app/views/Links/LinkForm/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import {
useCallback,
useEffect,
useMemo,
} from 'react';
import { useParams } from 'react-router';
import {
createSearchParams,
useNavigate,
useParams,
useSearchParams,
} from 'react-router';
import {
BlockLoading,
Button,
Expand All @@ -28,14 +34,15 @@ import {

import {
type LinkCreateInput,
LinkTypeEnum,
type LinkUpdateInput,
useCreateLinkMutation,
useLinkDetailQuery,
useUpdateLinkMutation,
} from '#generated/types/graphql';
import useAlert from '#hooks/useAlert';
import useGlobalEnums from '#hooks/useGlobalEnums';
import useRouting from '#hooks/useRouting';
import routes from '#root/config/routes';
import {
errorMessage,
keySelector,
Expand Down Expand Up @@ -64,12 +71,20 @@ const LinkSchema: FormSchema = {
}),
};

const defaultEditFormValue: PartialFormType = {};
function isAllowedLinkType(value: string | null | undefined): value is LinkTypeEnum {
return value === LinkTypeEnum.Internal || value === LinkTypeEnum.External;
}

function LinkForm() {
const { id } = useParams();
const alert = useAlert();
const navigate = useRouting();
const navigate = useNavigate();
const [searchParams] = useSearchParams();

const seedType = searchParams.get('type');
const initialValue = useMemo<PartialFormType>(() => ({
linkType: isAllowedLinkType(seedType) ? seedType : undefined,
}), [seedType]);

const [{ data, fetching: linkDetailFetch }] = useLinkDetailQuery({
variables: { id: isDefined(id) ? id : '' },
Expand All @@ -88,29 +103,38 @@ function LinkForm() {
validate,
setError,
setValue,
} = useForm(LinkSchema, { value: defaultEditFormValue });
} = useForm(LinkSchema, { value: initialValue });

const {
linkType: linkTypeOptions,
} = useGlobalEnums();

const error = getErrorObject(formError);

const navigateToLinks = useCallback((linkType?: LinkTypeEnum | null) => {
navigate({
pathname: routes.links.path,
search: isDefined(linkType)
? createSearchParams({ tab: linkType }).toString()
: undefined,
});
}, [navigate]);

const handleCreate = useCallback(async (mutationData: PartialFormType) => {
const createPayload = removeNull(mutationData) as unknown as LinkCreateInput;
const res = await createLinkMutate({ data: createPayload });
const result = res.data?.createLink;

if (isDefined(result) && result.ok) {
navigate('links');
navigateToLinks(mutationData.linkType);
alert.show('Link created successfully', { variant: 'success' });
} else if (isDefined(result) && isDefined(result.errors)) {
setError(transformToFormError(result.errors));
alert.show(errorMessage, { variant: 'danger' });
} else {
alert.show(errorMessage, { variant: 'danger' });
}
}, [createLinkMutate, navigate, alert, setError]);
}, [createLinkMutate, navigateToLinks, alert, setError]);

const handleUpdate = useCallback(async (mutationData: PartialFormType) => {
if (isNotDefined(id)) {
Expand All @@ -124,15 +148,15 @@ function LinkForm() {
const result = res.data?.updateLink;

if (isDefined(result) && result.ok) {
navigate('links');
navigateToLinks(mutationData.linkType);
alert.show('Link updated successfully', { variant: 'success' });
} else if (isDefined(result) && isDefined(result.errors)) {
setError(transformToFormError(result.errors));
alert.show(errorMessage, { variant: 'danger' });
} else {
alert.show(errorMessage, { variant: 'danger' });
}
}, [updateLinkMutate, id, navigate, alert, setError]);
}, [updateLinkMutate, id, navigateToLinks, alert, setError]);

const handleFormSubmit = useCallback(
() => createSubmitHandler(
Expand All @@ -144,8 +168,8 @@ function LinkForm() {
);

const handleCancelClick = useCallback(() => {
navigate('links');
}, [navigate]);
navigateToLinks(value.linkType);
}, [navigateToLinks, value.linkType]);

useEffect(() => {
if (isNotDefined(data?.link)) {
Expand Down
36 changes: 23 additions & 13 deletions app/views/Links/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import {
useCallback,
useMemo,
useState,
} from 'react';
import {
createSearchParams,
useNavigate,
} from 'react-router';
import { AddFillIcon } from '@ifrc-go/icons';
import {
Button,
Expand Down Expand Up @@ -34,27 +37,31 @@ import {
} from '#generated/types/graphql';
import useAlert from '#hooks/useAlert';
import useFilterState from '#hooks/useFilterState';
import useRouting from '#hooks/useRouting';
import useUrlSearchState from '#hooks/useUrlSearchState';
import routes from '#root/config/routes';
import {
errorMessage,
idSelector,
} from '#utils/common';

type LinkListItem = NonNullable<LinkType> & { no: string }

interface LinkFilterType extends Omit<LinkFilter, 'createdAt'> {
interface LinkFilterType extends Omit<LinkFilter, 'createdAt' | 'linkType'> {
createdAtGte: string | undefined;
createdAtLte: string | undefined;
}

const defaultFilter: LinkFilterType = {
linkType: LinkTypeEnum.Internal,
search: undefined,
createdAtGte: undefined,
createdAtLte: undefined,
};
function Links() {
const [activeTab, setActiveTab] = useState<LinkTypeEnum>(LinkTypeEnum.Internal);
const [activeTab, setActiveTab] = useUrlSearchState<LinkTypeEnum>(
'tab',
(tab) => (tab as LinkTypeEnum) ?? LinkTypeEnum.Internal,
(tab) => tab,
);
const {
filter,
rawFilter,
Expand All @@ -69,33 +76,33 @@ function Links() {
});

const alert = useAlert();
const navigate = useRouting();
const navigate = useNavigate();

const queryVariables = useMemo(() => ({
pagination: {
limit,
offset,
},
filters: {
linkType: filter.linkType,
linkType: activeTab,
search: filter.search,
createdAt: (filter.createdAtGte || filter.createdAtLte) ? {
gte: filter.createdAtGte,
lte: filter.createdAtLte,
} : undefined,
},
}), [limit, offset, filter]);
}), [limit, offset, filter, activeTab]);

const [{ fetching, data }, reExecuteQuery] = useLinksQuery(
{ variables: queryVariables },
);

const handleTabChanges = useCallback(
(name: LinkTypeEnum.Internal | LinkTypeEnum.External) => {
(name: LinkTypeEnum) => {
setActiveTab(name);
setFilterField(name, 'linkType');
setPage(1);
},
[setFilterField],
[setActiveTab, setPage],
);

const [, deleteLink] = useDeleteLinkMutation();
Expand Down Expand Up @@ -163,8 +170,11 @@ function Links() {
], [onDeleteClick]);

const handleCreateClick = useCallback(() => {
navigate('createLink');
}, [navigate]);
navigate({
pathname: routes.createLink.path,
search: createSearchParams({ type: activeTab }).toString(),
});
}, [navigate, activeTab]);

return (
<Tabs
Expand Down
Loading