{
+ const nextValue = value?.target ? value.target.value : value?.value ?? value ?? '';
+ setSelectedStatusFilter(nextValue);
+ setCurrentPage(1);
+ }}
+ options={statusFilterOptions}
+ placeholder="Filter by Status"
+ width="180px"
+ variant="toolbar"
+ />
+
@@ -1851,19 +2175,25 @@ const CompanyProfile = () => {
-
+ {isLoading ? (
+
+
+
+ ) : (
+
+ )}
{modalMode && (
diff --git a/ipi-survey-platform/src/services/establishments/establishmentService.js b/ipi-survey-platform/src/services/establishments/establishmentService.js
index dc15d1c..a4adc76 100644
--- a/ipi-survey-platform/src/services/establishments/establishmentService.js
+++ b/ipi-survey-platform/src/services/establishments/establishmentService.js
@@ -4,8 +4,38 @@ import resolveEstablishmentId from '../utils/establishment.js';
const dashboardEndpoint = '/establishment_dashboard';
const establishmentsEndpoint = '/establishments';
-export const fetchEstablishments = async (config = {}) => {
- const response = await getRequest(establishmentsEndpoint, config);
+const buildEstablishmentQueryParams = (params = {}) => {
+ const {
+ page,
+ limit,
+ search,
+ emirateId,
+ isicCode,
+ status,
+ sortBy,
+ sortOrder,
+ export: exportFormat,
+ } = params;
+
+ const query = {};
+ if (page !== undefined) query.page = page;
+ if (limit !== undefined) query.limit = limit;
+ if (search) query.search = search;
+ if (emirateId) query.emirate_id = emirateId;
+ if (isicCode) query.isic_code = isicCode;
+ if (status) query.status = status;
+ if (sortBy) query.sort_by = sortBy;
+ if (sortOrder) query.sort_order = sortOrder;
+ if (exportFormat) query.export = exportFormat;
+ return query;
+};
+
+export const fetchEstablishments = async ({ params, ...config } = {}) => {
+ const query = buildEstablishmentQueryParams(params);
+ const response = await getRequest(establishmentsEndpoint, {
+ ...config,
+ params: { ...(config.params || {}), ...query },
+ });
return response.data;
};
diff --git a/ipi-survey-platform/src/services/masters/masterService.js b/ipi-survey-platform/src/services/masters/masterService.js
index f60f5df..944cdde 100644
--- a/ipi-survey-platform/src/services/masters/masterService.js
+++ b/ipi-survey-platform/src/services/masters/masterService.js
@@ -5,6 +5,8 @@ const endpoints = {
zeroTargetReasons: '/zero_target_reason',
products: '/products',
units: '/unit_master',
+ emirates: '/emirates',
+ cityTowns: '/city-towns',
};
const extractReasons = (payload) => {
@@ -72,6 +74,38 @@ const toUnitOption = (item) => {
return null;
};
+const toEmirateOption = (item) => {
+ if (item === undefined || item === null) return null;
+ if (typeof item === 'string' || typeof item === 'number') {
+ const value = toStringOrNull(item);
+ return value ? { label: value, value } : null;
+ }
+ if (typeof item === 'object') {
+ const id = toStringOrNull(item.id ?? item.value ?? item.code);
+ const name = toStringOrNull(item.name ?? item.label ?? item.description);
+ const finalLabel = name ?? id;
+ if (!finalLabel) return null;
+ return { label: finalLabel, value: id ?? finalLabel, raw: item };
+ }
+ return null;
+};
+
+const toCityOption = (item) => {
+ if (item === undefined || item === null) return null;
+ if (typeof item === 'string' || typeof item === 'number') {
+ const value = toStringOrNull(item);
+ return value ? { label: value, value } : null;
+ }
+ if (typeof item === 'object') {
+ const id = toStringOrNull(item.id ?? item.value ?? item.code);
+ const name = toStringOrNull(item.name ?? item.label ?? item.description);
+ const finalLabel = name ?? id;
+ if (!finalLabel) return null;
+ return { label: finalLabel, value: id ?? finalLabel, raw: item };
+ }
+ return null;
+};
+
export const getVariationReasons = async (config = {}) => {
const response = await getRequest(endpoints.variationReasons, config);
return response.data;
@@ -116,6 +150,30 @@ export const fetchUnits = async ({ signal } = {}) => {
return list.map(toUnitOption).filter(Boolean);
};
+export const getEmirates = async (config = {}) => {
+ const response = await getRequest(endpoints.emirates, config);
+ return response.data;
+};
+
+export const fetchEmirates = async ({ signal } = {}) => {
+ const data = await getEmirates({ signal });
+ const list = extractReasons(data);
+ return list.map(toEmirateOption).filter(Boolean);
+};
+
+export const getCityTowns = async (emirateId, config = {}) => {
+ const params = { ...(config.params || {}), emirate_id: emirateId };
+ const response = await getRequest(endpoints.cityTowns, { ...config, params });
+ return response.data;
+};
+
+export const fetchCityTowns = async ({ emirateId, signal } = {}) => {
+ if (!emirateId) return [];
+ const data = await getCityTowns(emirateId, { signal });
+ const list = extractReasons(data);
+ return list.map(toCityOption).filter(Boolean);
+};
+
export default {
getVariationReasons,
fetchVariationReasons,
@@ -125,4 +183,8 @@ export default {
fetchProducts,
getUnits,
fetchUnits,
+ getEmirates,
+ fetchEmirates,
+ getCityTowns,
+ fetchCityTowns,
};