rez-table-listing-mui 2.0.10 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez-table-listing-mui",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "type": "module",
   "description": "A rez table listing component built on TanStack Table",
   "main": "dist/index.js",

package/src/listing/components/filter/components/attributes-filter.tsx

@@ -23,6 +23,7 @@ const AttributesFilter = ({
   setSearchTerm,
   tabValue,
   onChangeFunction,
+  isFlatJson,
 }: AttributesFilterProps) => {
   const { filterMaster, setFilterMaster, filters, setFilters } = tableStates;
 

package/src/listing/components/filter/components/forms/components/Multi-Select.tsx

@@ -16,15 +16,21 @@ const FormMultiSelect = ({
   dropdownData,
   sx,
   onValueChange,
+  isFlatJson,
 }: {
   filter: FilterStateProps;
   control: any;
   dropdownData: Record<string, DropdownOption[]>;
   sx?: SxProps<Theme>;
   onValueChange?: () => void;
+  isFlatJson: boolean;
 }) => {
   const options = dropdownData[filter.filter_attribute] || [];
 
+  // 🔑 single source of truth
+  const getOptionValue = (item: DropdownOption) =>
+    isFlatJson ? item.label : item.value;
+
   return (
     <Controller
       name={`${filter?.filter_attribute_name}.value`}
@@ -63,23 +69,30 @@ const FormMultiSelect = ({
                 const filtered = Array.isArray(selected)
                   ? selected.filter(Boolean)
                   : [];
+
                 return filtered
-                  .map(
-                    (val) =>
-                      options.find((item) => item.value === val)?.label || val
-                  )
+                  .map((val) => {
+                    const match = options.find(
+                      (item) => getOptionValue(item) === val
+                    );
+                    return match?.label || val;
+                  })
                   .join(", ");
               }}
             >
-              {options?.map((item, idx) => (
-                <MenuItem key={idx} value={item.value}>
-                  <Checkbox
-                    checked={cleanedValue.includes(item.value)}
-                    sx={{ marginRight: 1 }}
-                  />
-                  {item.label}
-                </MenuItem>
-              ))}
+              {options.map((item, idx) => {
+                const optionValue = getOptionValue(item);
+
+                return (
+                  <MenuItem key={idx} value={optionValue}>
+                    <Checkbox
+                      checked={cleanedValue.includes(optionValue)}
+                      sx={{ marginRight: 1 }}
+                    />
+                    {item.label}
+                  </MenuItem>
+                );
+              })}
             </Select>
           </FormControl>
         );

package/src/listing/components/filter/components/forms/index.tsx

@@ -40,6 +40,7 @@ const FilterForm = ({
   setDeleteFilterModalOpen,
   onChangeFunction,
   filterComponentOptions,
+  isFlatJson,
 }: {
   columnsData: FilterColumnsDataProps;
   dropdownData: FilterDropdownDataProps;
@@ -55,6 +56,7 @@ const FilterForm = ({
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
   filterComponentOptions?: FilterComponentOptions;
+  isFlatJson: boolean;
 }) => {
   const { filterMaster, filters, setFilters, setFilterMaster, setPagination } =
     tableStates;
@@ -393,6 +395,7 @@ const FilterForm = ({
                               control,
                               dropdownData,
                               updateFiltersFromForm,
+                              isFlatJson,
                             });
                           })()}
                         </Box>

package/src/listing/components/filter/components/forms/utils/filter-date-input-resolver.tsx

@@ -26,12 +26,14 @@ export const resolveFilterInput = ({
   control,
   dropdownData,
   updateFiltersFromForm,
+  isFlatJson,
 }: {
   filter: FilterStateProps;
   operator: string | undefined;
   control: any;
   dropdownData: any;
   updateFiltersFromForm: () => void;
+  isFlatJson: boolean;
 }) => {
   const dataType = filter?.filter_attribute_data_type;
 
@@ -95,6 +97,7 @@ export const resolveFilterInput = ({
         control={control}
         dropdownData={dropdownData}
         onValueChange={updateFiltersFromForm}
+        isFlatJson={isFlatJson}
       />
     );
   }

package/src/listing/components/filter/components/main-filter.tsx

@@ -14,6 +14,7 @@ const MainFilter = ({
   onSaveFilterButtonClick,
   onChangeFunction,
   filterComponentOptions,
+  isFlatJson,
 }: FilterFormComponentProps) => {
   const [searchTerm, setSearchTerm] = useState<string>("");
 
@@ -22,10 +23,10 @@ const MainFilter = ({
   useEffect(() => {
     setFilterMaster(
       (prev) =>
-      ({
-        ...prev,
-        activeFilterTabIndex: 0,
-      } as FilterMasterStateProps)
+        ({
+          ...prev,
+          activeFilterTabIndex: 0,
+        } as FilterMasterStateProps)
     );
   }, []);
 
@@ -65,6 +66,7 @@ const MainFilter = ({
         dropdownData={dropdownData}
         onChangeFunction={onChangeFunction}
         filterComponentOptions={filterComponentOptions}
+        isFlatJson={isFlatJson}
       />
     </Box>
   );

package/src/listing/components/filter/components/saved-filter.tsx

@@ -33,6 +33,7 @@ const SavedFilter = ({
   tabValue,
   onChangeFunction,
   filterComponentOptions,
+  isFlatJson,
 }: FilterFormComponentProps) => {
   const { filters, filterMaster, setFilterMaster, setFilterToDelete } =
     tableStates;

package/src/listing/components/filter/index.tsx

@@ -27,6 +27,7 @@ export function TableFilter({
   dropdownData,
   onChangeFunction,
   filterComponentOptions,
+  isFlatJson,
 }: FilterDrawerProps) {
   const [tabValue, setTabValue] = useState(0);
   const [editMode, setEditMode] = useState(false);
@@ -347,6 +348,7 @@ export function TableFilter({
             {...commonProps}
             onSaveFilterButtonClick={handleSaveFilterButtonClick}
             filterComponentOptions={finalComponentOptions}
+            isFlatJson={isFlatJson}
           />
         </CustomTabPanel>
       )}
@@ -362,6 +364,7 @@ export function TableFilter({
             {...savedFilterProps}
             onSaveFilterButtonClick={handleSaveFilterButtonClick}
             filterComponentOptions={finalComponentOptions}
+            isFlatJson={isFlatJson}
           />
         </CustomTabPanel>
       )}
@@ -376,6 +379,7 @@ export function TableFilter({
             {...commonProps}
             {...attributesProps}
             tabValue={tabValue}
+            isFlatJson={isFlatJson}
           />
         </CustomTabPanel>
       )}

package/src/listing/libs/hooks/useEntityTableAPI.tsx

@@ -57,6 +57,7 @@ const entityListingCall = async ({
   ],
   quickFilter = [],
   attributeFilter = [],
+  flatJson,
 }: EntityTableAPIProps): Promise<{
   responseStatus: number;
   data: EntityListingResponse;
@@ -69,6 +70,7 @@ const entityListingCall = async ({
     sortby,
     quickFilter,
     attributeFilter,
+    flatJson,
   };
 
   const params: APIParamsProps = {
@@ -99,6 +101,7 @@ export const useEntityTableAPI = ({
     },
   ],
   attributeFilter = [],
+  flatJson,
 }: EntityTableAPIProps) => {
   const { data, isPending: isTableDataPending } = useQuery({
     queryKey: ["entityTable", page, size, tabs, quickFilter],
@@ -111,6 +114,7 @@ export const useEntityTableAPI = ({
         quickFilter,
         sortby,
         attributeFilter,
+        flatJson,
       }),
   });
 
@@ -272,7 +276,7 @@ export const useCommonFilterDropdownAPI = (
         queryKey: ["commonDropdown", cfg?.dataSourceType],
         queryFn: () =>
           newCommonGetDropdownDataAPI({
-            entity_type: "ROL",
+            entity_type: ENTITY_TYPE,
             attribute_key: cfg?.key,
           }),
         enabled: !!cfg?.dataSourceType,

package/src/listing/libs/utils/common.ts

@@ -78,7 +78,7 @@ export function customDebounce<T extends (...args: any[]) => any>(
 
 //ENTITY TYPE
 const ENVIRONMENT = "adm_dev";
-export const ENTITY_TYPE = "ROL";
+export const ENTITY_TYPE = "SCH";
 export const MAPPED_ENTITY_TYPE = "LYPR"; // LAP OR LYPR
 export const USER_ID = 226;
 

package/src/listing/types/common.ts

@@ -64,6 +64,7 @@ export interface EntityTableAPIProps {
     filter_operator: string;
     filter_value: string[] | string;
   }[];
+  flatJson: boolean;
 }
 
 export interface viewSettingsDropDownAPIProps {

package/src/listing/types/filter.ts

@@ -189,6 +189,7 @@ export interface FilterDrawerProps {
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
   filterComponentOptions?: FilterComponentOptions;
+  isFlatJson: boolean;
 }
 
 export interface FilterCriteria {
@@ -292,6 +293,7 @@ export interface FilterFormComponentProps {
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
   filterComponentOptions?: FilterComponentOptions;
+  isFlatJson: boolean;
 }
 
 export interface SavedFilterSharingPreference {
@@ -328,6 +330,7 @@ export interface AttributesFilterProps {
     updatedFilters,
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
+  isFlatJson: boolean;
 }
 
 export interface AttributesFilterSelectProps {

package/src/view/FIlterWrapper.tsx

@@ -24,6 +24,7 @@ const CraftTableFilterWrapper = ({
   onChangeFunction,
   columnsData,
   filterComponentOptions,
+  isFlatJson,
 }: {
   onClose?: () => void;
   tableStates: CraftTableOptionsProps;
@@ -34,6 +35,7 @@ const CraftTableFilterWrapper = ({
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
   filterComponentOptions?: FilterComponentOptions;
+  isFlatJson: boolean;
 }) => {
   const getNavigationLayoutQuery = useGetNavigationLayoutAPI(ENTITY_TYPE);
 
@@ -199,6 +201,7 @@ const CraftTableFilterWrapper = ({
       onSaveFilter={handleSaveFilter}
       onChangeFunction={onChangeFunction}
       filterComponentOptions={filterComponentOptions}
+      isFlatJson={isFlatJson}
     />
   );
 };

package/src/view/ListingView.tsx

@@ -186,6 +186,7 @@ function ListingView() {
       },
     ],
     attributeFilter: [],
+    flatJson: metaQuery.data?.is_flat_json || false,
   });
 
   const newData = useMemo(
@@ -436,6 +437,7 @@ function ListingView() {
             tableStates={tableStates}
             columnsData={metaQuery.data || {}}
             dropdownData={dropdownFilterData || []}
+            isFlatJson={metaQuery.data?.is_flat_json || false} // Added prop for sending the label instead of value in the dropdown case
             // onUpdateFilter={handleUpdateFilter}
             // onDeleteFilter={handleRemoveFilter}
             // onSaveFilter={handleSaveFilter}