Skip to content

Commit

Permalink
fix: org Unit filters not filtering on source
Browse files Browse the repository at this point in the history 
IA-3759
  • Loading branch information
@beygorghor
beygorghor authored Dec 12, 2024
2 parents 37805fa + 16c3da9 commit 5d90ee3
Showing 1 changed file with 97 additions and 88 deletions.
185 changes: 97 additions & 88 deletions hat/assets/js/apps/Iaso/domains/orgUnits/components/OrgUnitsFilters.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ export const OrgUnitFilters: FunctionComponent<Props> = ({
locationLimit,
setLocationLimit,
}) => {
const classes: Record<string, string> = useStyles();
const { formatMessage }: { formatMessage: IntlFormatMessage } =
useSafeIntl();
const currentUser = useCurrentUser();
// STATES
const [dataSourceId, setDataSourceId] = useState<number | undefined>(
currentSearch?.source ? parseInt(currentSearch?.source, 10) : undefined,
);
Expand All @@ -99,19 +96,15 @@ export const OrgUnitFilters: FunctionComponent<Props> = ({
const [initialOrgUnitId, setInitialOrgUnitId] = useState<
string | undefined
>(currentSearch?.levels);
const [filters, setFilters] = useState<Record<string, any>>(currentSearch);
const [showAdvancedSettings, setShowAdvancedSettings] = useState(false);

const { data: initialOrgUnit } = useGetOrgUnit(initialOrgUnitId);

useSkipEffectOnMount(() => {
setInitialOrgUnitId(currentSearch?.levels);
}, [currentSearch?.levels]);
const [filters, setFilters] = useState<Record<string, any>>(currentSearch);
// STATES

// DATA
const { data: initialOrgUnit } = useGetOrgUnit(initialOrgUnitId);
const { data: dataSources, isFetching: isFetchingDataSources } =
useGetDataSources(true);

const getVersionLabel = useGetVersionLabel(dataSources);
const { data: projects, isFetching: isFetchingProjects } =
useGetProjectsDropDown();
const { data: groups, isFetching: isFetchingGroups } = useGetGroups({
Expand All @@ -120,58 +113,103 @@ export const OrgUnitFilters: FunctionComponent<Props> = ({
});
const { data: orgUnitTypes, isFetching: isFetchingOrgUnitTypes } =
useGetOrgUnitTypesDropdownOptions(projectId);

const instancesOptions = useInstancesOptions();

const {
data: validationStatusOptions,
isLoading: isLoadingValidationStatusOptions,
} = useGetOrgUnitValidationStatus(true);
const handleChange = (key, value) => {
const newFilters: Record<string, unknown> = {
...filters,
};
if (key === 'version') {
setSourceVersionId(parseInt(value, 10));
}
if (key === 'source') {
setInitialOrgUnitId(undefined);
setSourceVersionId(undefined);
setDataSourceId(parseInt(value, 10));
delete newFilters.levels;
delete newFilters.orgUnitParentId;
}
if (key === 'levels') {
setInitialOrgUnitId(value);
}
if (key === 'project') {
setInitialOrgUnitId(undefined);
newFilters.orgUnitTypeId = undefined;
setProjectId(parseInt(value, 10));
}
if ((!value || value === '') && newFilters[key]) {
delete newFilters[key];
} else {
newFilters[key] = value;
}
if (newFilters.source && newFilters.version) {
delete newFilters.source;
}
setFilters(newFilters);
const tempSearches: [Record<string, unknown>] = [...searches];
tempSearches[searchIndex] = newFilters;
setSearches(tempSearches);
};
const currentColor = filters?.color
? `#${filters.color}`
: getChipColors(searchIndex);
// DATA

const getNewSourceVersionId = useCallback(
(newDataSourceId: number) => {
const dataSource = dataSources?.find(
src => src?.original?.id === newDataSourceId,
);
const versions = dataSource?.original?.versions || [];
return (
dataSource?.original?.default_version?.id ||
(versions.length > 0
? versions[versions.length - 1]?.id
: undefined)
);
},
[dataSources],
);

// EVENTS
const handleChange = useCallback(
(key, value) => {
const newFilters: Record<string, unknown> = {
...filters,
};
if (key === 'version') {
setSourceVersionId(parseInt(value, 10));
}
if (key === 'source') {
setInitialOrgUnitId(undefined);
const newDataSourceId = parseInt(value, 10);
const newSourceVersionId =
getNewSourceVersionId(newDataSourceId);
setSourceVersionId(newSourceVersionId);
newFilters.version = newSourceVersionId?.toString();
setDataSourceId(newDataSourceId);
delete newFilters.levels;
delete newFilters.orgUnitParentId;
}
if (key === 'levels') {
setInitialOrgUnitId(value);
}
if (key === 'project') {
setInitialOrgUnitId(undefined);
newFilters.orgUnitTypeId = undefined;
setProjectId(parseInt(value, 10));
}
if ((!value || value === '') && newFilters[key]) {
delete newFilters[key];
} else {
newFilters[key] = value;
}
if (newFilters.source && newFilters.version) {
delete newFilters.source;
}
setFilters(newFilters);
const tempSearches: [Record<string, unknown>] = [...searches];
tempSearches[searchIndex] = newFilters;
setSearches(tempSearches);
},
[filters, searches, searchIndex, setSearches, getNewSourceVersionId],
);

const handleLocationLimitChange = useCallback(
(key: string, value: number) => {
setLocationLimit(value);
},
[setLocationLimit],
);
// EVENTS

const currentColor = filters?.color
? `#${filters.color}`
: getChipColors(searchIndex);

// HOOKS
const currentUser = useCurrentUser();
const instancesOptions = useInstancesOptions();
const getVersionLabel = useGetVersionLabel(dataSources);
const classes: Record<string, string> = useStyles();
const { formatMessage }: { formatMessage: IntlFormatMessage } =
useSafeIntl();
// HOOKS

// USE EFFECTS
useSkipEffectOnMount(() => {
setInitialOrgUnitId(currentSearch?.levels);
}, [currentSearch?.levels]);

useSkipEffectOnMount(() => {
if (filters !== currentSearch) {
setFilters(currentSearch);
}
}, [currentSearch]);

// Splitting this effect from the one below, so we can use the deps array
useEffect(() => {
Expand All @@ -194,15 +232,7 @@ export const OrgUnitFilters: FunctionComponent<Props> = ({
}, [dataSourceId, dataSources, filters?.version]);

useEffect(() => {
// if no dataSourceId or sourceVersionId are provided, use the default from user
if (
!dataSourceId &&
!sourceVersionId &&
!filters?.version &&
currentUser?.account?.default_version?.data_source?.id &&
!filters?.group
) {
// TO-DO => IA-1491 when coming from groups page, we need to prefill source and version from the selected group !
if (!dataSourceId) {
setDataSourceId(
filters?.source ??
currentUser?.account?.default_version?.data_source?.id,
Expand All @@ -211,36 +241,15 @@ export const OrgUnitFilters: FunctionComponent<Props> = ({
filters?.version ?? currentUser?.account?.default_version?.id,
);
}
if (dataSourceId && !sourceVersionId) {
const newSourceVersionId = getNewSourceVersionId(dataSourceId);
setSourceVersionId(newSourceVersionId);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

// Set the version to the dataSources default version when changing source, or the first version if no default is set
useEffect(() => {
if (dataSourceId) {
const dataSource = dataSources?.find(
src => src?.original?.id === dataSourceId,
);
if (
dataSource &&
!dataSource.original?.versions.find(
version => version.id === sourceVersionId,
)
) {
const selectedVersion =
dataSource.original?.default_version?.id ||
dataSource.original?.versions[
dataSource.original.versions.length - 1
]?.id;
setSourceVersionId(selectedVersion);
}
}
}, [dataSourceId, sourceVersionId, dataSources]);
// USE EFFECTS

useSkipEffectOnMount(() => {
if (filters !== currentSearch) {
setFilters(currentSearch);
}
}, [currentSearch]);
const versionsDropDown = useMemo(() => {
if (!dataSources || !dataSourceId) return [];
return (
Expand Down

0 comments on commit 5d90ee3

Please sign in to comment.