@blaze-cms/plugin-data-ui 0.131.0-project-admin-customisations.2 → 0.132.0-admin-updates.0

package/lib-es/utils/get-default-query-params.js

@@ -1,4 +1,6 @@
-const getDefaultQueryParams = schema => {
+const getDefaultQueryParams = ({
+  schema
+}) => {
   const updated = schema.properties && schema.properties.updated;
   const {
     adminDefaultListingFilter: where

package/lib-es/utils/get-default-query-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","displayProperties","limit","offset","sort","property","direction"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = schema => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where } = schema.displayProperties || {};\n\n  return {\n    where,\n    limit: 40,\n    offset: 0,\n    sort: updated\n      ? [\n          {\n            property: 'updated',\n            direction: 'desc'\n          }\n        ]\n      : []\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGC,MAAM,IAAI;EACtC,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC;EAAM,CAAC,GAAGJ,MAAM,CAACK,iBAAiB,IAAI,CAAC,CAAC;EAE3E,OAAO;IACLD,KAAK;IACLE,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAEP,OAAO,GACT,CACE;MACEQ,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF,GACD;EACN,CAAC;AACH,CAAC;AAED,SAASX,qBAAqB"}
+{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","displayProperties","limit","offset","sort","property","direction"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = ({ schema }) => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where } = schema.displayProperties || {};\n\n  return {\n    where,\n    limit: 40,\n    offset: 0,\n    sort: updated\n      ? [\n          {\n            property: 'updated',\n            direction: 'desc'\n          }\n        ]\n      : []\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC;AAAO,CAAC,KAAK;EAC5C,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC;EAAM,CAAC,GAAGJ,MAAM,CAACK,iBAAiB,IAAI,CAAC,CAAC;EAE3E,OAAO;IACLD,KAAK;IACLE,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAEP,OAAO,GACT,CACE;MACEQ,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF,GACD;EACN,CAAC;AACH,CAAC;AAED,SAASX,qBAAqB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.131.0-project-admin-customisations.2",
+  "version": "0.132.0-admin-updates.0",
   "description": "Blaze plugin data ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,13 +27,12 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "0.131.0-project-admin-customisations.2",
-    "@blaze-cms/core-errors": "0.131.0-project-admin-customisations.0",
-    "@blaze-cms/plugin-render-hooks-ui": "0.131.0-project-admin-customisations.0",
-    "@blaze-cms/react-form-builder": "0.131.0-project-admin-customisations.2",
-    "@blaze-cms/react-page-builder": "0.131.0-project-admin-customisations.2",
-    "@blaze-cms/setup-ui": "0.131.0-project-admin-customisations.0",
-    "@blaze-cms/versioning-ui": "0.131.0-project-admin-customisations.0",
+    "@blaze-cms/admin-ui-utils": "0.132.0-admin-updates.0",
+    "@blaze-cms/core-errors": "0.132.0-admin-updates.0",
+    "@blaze-cms/react-form-builder": "0.132.0-admin-updates.0",
+    "@blaze-cms/react-page-builder": "0.132.0-admin-updates.0",
+    "@blaze-cms/setup-ui": "0.132.0-admin-updates.0",
+    "@blaze-cms/versioning-ui": "0.132.0-admin-updates.0",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/more": "0.5.19",
     "@blaze-react/multiselect": "0.6.6",
@@ -54,7 +53,7 @@
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@blaze-cms/core-ui": "0.131.0-project-admin-customisations.0"
+    "@blaze-cms/core-ui": "0.132.0-admin-updates.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -66,5 +65,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "afa5f3dedb77eefe1ca4d1e043a8c88d4771e982"
+  "gitHead": "fd6ece22f357131c0b0e5201e5e1df825389b860"
 }

package/src/components/EntityDataListing/EntityDataListing.js

@@ -6,22 +6,31 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 import ListingTable from '../ListingTable/ListingTable';
 import { withContext } from '../../utils/hoc/withContext';
 
-const EntityDataListing = ({ match }) => {
+const EntityDataListing = ({ match, menuItems }) => {
   const {
     params: { entityIdentifier: identifier }
   } = match;
 
+  const [[selectedMenuItem]] = menuItems
+    .map(([_, { items }]) => {
+      const item = items.filter(({ uri }) => uri.endsWith(`/${identifier}`));
+
+      return item.length ? item : null;
+    })
+    .filter(Boolean);
+
   const { data: { getEntitySchemas = [] } = {} } = useQuery(getQuery('GET_ENTITY_SCHEMA'), {
     variables: { identifier }
   });
 
   if (!getEntitySchemas.length) return '';
 
-  return <ListingTable entitySchema={getEntitySchemas[0]} />;
+  return <ListingTable entitySchema={getEntitySchemas[0]} selectedMenuItem={selectedMenuItem} />;
 };
 
 EntityDataListing.propTypes = {
-  match: PropTypes.object.isRequired
+  match: PropTypes.object.isRequired,
+  menuItems: PropTypes.array.isRequired
 };
 
 export default withContext(EntityDataListing);

package/src/components/EntityManager/Entity/Entity.js

@@ -3,7 +3,6 @@ import React, { useEffect, useState, useRef } from 'react';
 import { withRouter, Prompt } from 'react-router-dom';
 import { useApolloClient } from '@apollo/client';
 import PropTypes from 'prop-types';
-import { RenderHook } from '@blaze-cms/plugin-render-hooks-ui';
 import { getQuery, GET_CURRENT_TAB_ID } from '@blaze-cms/admin-ui-utils';
 import { FormBuilder, parseFormValues } from '@blaze-cms/react-form-builder';
 import { DeleteAction, CopyDataFromAction } from '@blaze-cms/admin';
@@ -35,7 +34,6 @@ import {
   checkFulfilConditions
 } from '../utils/entity';
 import useToggle from '../../../utils/hooks/useToggle';
-import InfoBoxes from '../../InfoBoxes/InfoBoxes';
 
 const Entity = ({
   formData,
@@ -442,8 +440,6 @@ const Entity = ({
           <div className="page__content--fixed">
             <div className="page__content">
               <div className="content">
-                <RenderHook hookKey={`entity:${action}:main:top`} entity={entity} schema={schema} />
-                <InfoBoxes id={entity.id} schema={schema} />
                 <Tabs
                   enabled={showPageBuilderTabs}
                   onTabChange={tabId => {
@@ -465,17 +461,12 @@ const Entity = ({
                     isNewEntity={isNewEntity}
                   />
                 </Tabs>
-                <RenderHook
-                  hookKey={`entity:${action}:main:bottom`}
-                  entity={entity}
-                  schema={schema}
-                />
               </div>
             </div>
           </div>
         </div>
 
-        <div className="column column--one-third page-sidebar page-sidebar--relations">
+        <div className="column column--one-third page-sidebar">
           {showSideBarRelations && (
             <SideBarRelations
               entity={entity}

package/src/components/EntityManager/Entity/SideBarRelations/index.js

@@ -7,8 +7,6 @@ import { formFieldTypes } from '@blaze-cms/react-form-builder';
 import classnames from 'classnames';
 import { VersionsList } from '@blaze-cms/versioning-ui';
 import { PUBLISHED, UNPUBLISHED } from '../../../../constants';
-import CustomSidebarInfoContainer from './container/CustomSidebarInfoContainer';
-import EntityNavLinks from '../EntitiyNavLinks';
 
 const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { relation: RelationComponent } = formFieldTypes;
@@ -20,9 +18,7 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
     status
   } = formData;
   const client = useApolloClient();
-
   const [relationsComponents, setRelationsComponents] = useState(null);
-
   useEffect(
     () => {
       (async () => {
@@ -68,42 +64,28 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   return (
     <div className="sidebar" data-testid="sideBarRelations-main-div">
       <div className="sidebar__content">
-        <div className="sidebar__status">
-          {formattedCreated && (
-            <div className="sidebar__top">
-              <div className="sidebar__status__wrapper">
-                <b>Status</b>
-                <span className={statusClassName}>{formattedStatus}</span>
-              </div>
-              {formattedStatus === PUBLISHED && (
-                <p>
-                  {formattedStatus} on: <span> {formattedPublished}</span>
-                </p>
-              )}
+        {formattedCreated && (
+          <div className="sidebar__status">
+            <div className="sidebar__status__wrapper">
+              <b>Status</b>
+              <span className={statusClassName}>{formattedStatus}</span>
             </div>
-          )}
-
-          {!schema.displayProperties.adminMainInfoProperty && (
-            <>
+            {formattedStatus === PUBLISHED && (
               <p>
-                Created: <span>{formattedCreated}</span>
+                {formattedStatus} on: <span> {formattedPublished}</span>
               </p>
-              <p>
-                Updated: <span>{formattedUpdated}</span>
-              </p>
-            </>
-          )}
+            )}
 
-          <CustomSidebarInfoContainer
-            id={itemId}
-            schema={schema}
-            displayProperties={schema.displayProperties}
-          />
-        </div>
+            <p>
+              Created: <span>{formattedCreated}</span>
+            </p>
+            <p>
+              Updated: <span>{formattedUpdated}</span>
+            </p>
+          </div>
+        )}
 
         <VersionsList itemEntity={itemEntity} itemId={itemId} interfaces={interfaces} />
-        <EntityNavLinks schema={schema} />
-
         {relationsComponents &&
           relationsComponents.map(({ id, staticData, schema: entitySchema }) => (
             <RelationComponent

package/src/components/ListingTable/ListingTable.js

@@ -3,27 +3,27 @@ import React, { useEffect, useState, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, Link } from 'react-router-dom';
 import More from '@blaze-react/more';
+import { MainContext, useMainContext } from '@blaze-cms/admin-ui-utils';
 import { PageHeader, DeleteAction } from '@blaze-cms/admin';
 import { useToasts } from '@blaze-react/toaster';
-import { RenderHook } from '@blaze-cms/plugin-render-hooks-ui';
 import ListingTableContent from './ListingTableContent';
 import availableActions from '../EntityManager/Entity/actions-handlers';
 import { fetchData } from './service';
-import { populateRows, formatRows, getParsedRowData } from './mappers/populate-rows';
+import { populateRows, formatRows } from './mappers/populate-rows';
 import { getDefaultQueryParams } from '../../utils/get-default-query-params';
 
 const OVER_SCAN_BUFFER = 10;
 
-const ListingTable = ({ match, entitySchema }) => {
+const ListingTable = ({ match, entitySchema, selectedMenuItem }) => {
   const [tableData, setTableData] = useState({});
   const [modalStatus, setModalStatus] = useState(false);
   const [itemToDelete, setItemToDelete] = useState({});
   const [previousSchema, setPreviousSchema] = useState({ id: null });
   const [scrollToIndex, setScrollToIndex] = useState(0);
   const [verifiedRanges, setVerifiedRanges] = useState([]);
-  const queryParamsDefault = getDefaultQueryParams(entitySchema);
+  const queryParamsDefault = getDefaultQueryParams({ schema: entitySchema });
   const [queryParams, setQueryParams] = useState(queryParamsDefault);
-  const [listFilters, setListFilters] = useState([]);
+  const { menuItems, setMenuItems } = useMainContext(MainContext);
   const client = useApolloClient();
   const { addToast } = useToasts();
 
@@ -34,7 +34,20 @@ const ListingTable = ({ match, entitySchema }) => {
           entitySchema.id !== previousSchema.id ||
           (previousSchema.id === null && entitySchema.id)
         ) {
-          await doQuery();
+          const data = await fetchData({
+            client,
+            querySettings: {
+              entitySchema,
+              queryParams: queryParamsDefault
+            }
+          });
+          const populatedTable = populateRows({
+            toggleModal,
+            url: match.url,
+            entitySchema,
+            rows: data
+          });
+          setTableData(populatedTable);
           setPreviousSchema({ id: entitySchema.id });
         }
       })();
@@ -42,33 +55,18 @@ const ListingTable = ({ match, entitySchema }) => {
     [client, entitySchema, match.url, previousSchema.id, queryParams] // eslint-disable-line react-hooks/exhaustive-deps
   );
 
-  const doQuery = async (filters = listFilters) => {
-    const data = await fetchData({
-      client,
-      querySettings: {
-        entitySchema,
-        queryParams: queryParamsDefault
-      },
-      listFilters: filters
-    });
-
-    const populatedTable = populateRows({
-      toggleModal,
-      url: match.url,
-      entitySchema,
-      rows: data
-    });
-
-    setTableData(populatedTable);
-  };
-
-  const updateListingFilters = async filters => {
-    await doQuery(filters);
-    setListFilters(filters);
+  const onCloseCardPrompt = () => {
+    const updatedSelectedMenuItem = {
+      ...selectedMenuItem,
+      isDisplayedPrompt: false
+    };
+    const [{ header, items }] = menuItems;
+    const updatedItems = items.map(
+      item => (item.name === selectedMenuItem.name ? updatedSelectedMenuItem : item)
+    );
+    setMenuItems([{ header, items: updatedItems }]);
   };
 
-  const onCloseCardPrompt = () => null;
-
   const toggleModal = item => {
     setModalStatus(!!item);
     setItemToDelete(item || {});
@@ -109,22 +107,15 @@ const ListingTable = ({ match, entitySchema }) => {
       querySettings: {
         entitySchema,
         queryParams: sortQueryParams
-      },
-      listFilters
+      }
     });
-    const { columns, isEnquiry } = tableData;
+    const { columns } = tableData;
     const [firstColumn] = columns;
 
     setTableData({
       ...tableData,
       appliedSort: { [property]: direction },
-      rows: formatRows({
-        rows: getParsedRowData(data),
-        url: match.url,
-        toggleModal,
-        firstColumn,
-        isEnquiry
-      })
+      rows: formatRows({ rows: data, url: match.url, toggleModal, firstColumn })
     });
   };
 
@@ -142,17 +133,11 @@ const ListingTable = ({ match, entitySchema }) => {
         querySettings: {
           entitySchema,
           queryParams: updatedQueryParams
-        },
-        listFilters
+        }
       });
       const updatedRows = [
         ...tableData.rows,
-        ...formatRows({
-          rows: getParsedRowData(data),
-          url: match.url,
-          toggleModal,
-          isEnquiry: tableData.isEnquiry
-        })
+        ...formatRows({ rows: data, url: match.url, toggleModal })
       ];
 
       setVerifiedRanges([...verifiedRanges, loadIndex]);
@@ -166,7 +151,6 @@ const ListingTable = ({ match, entitySchema }) => {
   };
 
   if (!tableData || !tableData.rows) return 'loading';
-  const showAddButton = !!tableData.rows.length && !tableData.isEnquiry;
 
   return (
     <div className="page">
@@ -178,7 +162,7 @@ const ListingTable = ({ match, entitySchema }) => {
         />
       )}
       <PageHeader title={entitySchema.displayName} subtitle="">
-        {showAddButton && (
+        {(!selectedMenuItem.isDisplayedPrompt || !!tableData.rows.length) && (
           <Fragment>
             <Link
               data-testid="addEntity"
@@ -197,17 +181,13 @@ const ListingTable = ({ match, entitySchema }) => {
           </Fragment>
         )}
       </PageHeader>
-      <RenderHook
-        hookKey="entity:listing:main:top"
-        schema={entitySchema}
-        setListFilters={updateListingFilters}
-      />
       <ListingTableContent
         overScanBuffer={OVER_SCAN_BUFFER}
         onSort={handleSort}
         onRenderItems={handleRenderedItems}
         tableData={tableData}
         onCloseCardPrompt={onCloseCardPrompt}
+        selectedMenuItem={selectedMenuItem}
         scrollToIndex={scrollToIndex}
       />
     </div>
@@ -215,7 +195,8 @@ const ListingTable = ({ match, entitySchema }) => {
 };
 ListingTable.propTypes = {
   entitySchema: PropTypes.object.isRequired,
-  match: PropTypes.object.isRequired
+  match: PropTypes.object.isRequired,
+  selectedMenuItem: PropTypes.object.isRequired
 };
 
 export default withRouter(ListingTable);

package/src/components/ListingTable/ListingTableContent/ListingTableContent.js

@@ -1,11 +1,15 @@
 import React from 'react';
 import Table from '@blaze-react/table';
 import PropTypes from 'prop-types';
-import { withRouter } from 'react-router-dom';
+import { CardPrompt } from '@blaze-cms/admin';
+import { Link, withRouter } from 'react-router-dom';
 
 const ListingTableContent = ({
   tableData,
   handleSelect,
+  onCloseCardPrompt,
+  selectedMenuItem,
+  match,
   onSort,
   onClickRow,
   overScanBuffer,
@@ -13,14 +17,12 @@ const ListingTableContent = ({
   scrollToIndex
 }) => {
   const displayTable = tableData && tableData.rows && !!tableData.rows.length;
-  const { isEnquiry } = tableData;
-  const className = `page__content${isEnquiry ? ' array-table' : ''}`;
 
   return (
     <>
-      {displayTable && (
+      {displayTable ? (
         <>
-          <div className={className}>
+          <div className="page__content">
             <Table
               scrollToIndex={scrollToIndex}
               onSort={onSort}
@@ -28,12 +30,23 @@ const ListingTableContent = ({
               overScanBuffer={overScanBuffer}
               onRenderItems={onRenderItems}
               data={tableData}
-              checkboxes={!isEnquiry}
+              checkboxes
               onSelect={handleSelect}
               data-testid="listing-table-content"
             />
           </div>
         </>
+      ) : (
+        selectedMenuItem.isDisplayedPrompt && (
+          <CardPrompt onClose={onCloseCardPrompt} data-testid="card-prompt">
+            <Link
+              className="button button--rounded button--cta"
+              to={`${match.url}/create`}
+              data-testid="add-button">
+              Add
+            </Link>
+          </CardPrompt>
+        )
       )}
     </>
   );
@@ -41,6 +54,8 @@ const ListingTableContent = ({
 
 ListingTableContent.propTypes = {
   tableData: PropTypes.object.isRequired,
+  onCloseCardPrompt: PropTypes.func.isRequired,
+  selectedMenuItem: PropTypes.object.isRequired,
   match: PropTypes.shape({
     url: PropTypes.string
   }).isRequired,
@@ -58,8 +73,7 @@ ListingTableContent.defaultProps = {
   onClickRow: () => {},
   overScanBuffer: 0,
   scrollToIndex: 0,
-  onRenderItems: () => {},
-  selectedMenuItem: null
+  onRenderItems: () => {}
 };
 
 export default withRouter(ListingTableContent);

package/src/components/ListingTable/mappers/populate-rows.js

@@ -3,22 +3,18 @@ import { Link } from 'react-router-dom';
 import TableActions from '../TableActions';
 import { ACTIONS } from '../../../constants';
 
-const formatRows = ({ rows, url, toggleModal, label, firstColumn = 'name', isEnquiry }) =>
+const formatRows = ({ rows, url, toggleModal, label, firstColumn = 'name' }) =>
   rows.map(data => {
     const editUrl = `${url}/update/${data.id}`;
-    const rowProps = {
+    return {
       ...data,
       [firstColumn]: (
         <Link to={editUrl} role="button">
           {data[firstColumn]}
         </Link>
-      )
+      ),
+      actions: <TableActions editUrl={editUrl} data={data} showDeleteModal={toggleModal} />
     };
-    if (!isEnquiry)
-      rowProps.actions = (
-        <TableActions editUrl={editUrl} data={data} showDeleteModal={toggleModal} />
-      );
-    return rowProps;
   });
 
 const getSanitizedColumnLabel = columnProp => {
@@ -32,82 +28,22 @@ const getSanitizedColumnLabel = columnProp => {
   return sanitizedChar;
 };
 
-const buildArrayRowContent = rowData => (
-  <div className="table-row-list">
-    {rowData.map(rowGroup => (
-      <div className="table-row-list__group">
-        {rowGroup.map(({ label, value, url }) => (
-          <div className="table-row-list__group__item">
-            <span className="table-row-list__group__item__label"> {label}:</span>
-            {url ? (
-              <Link to={url} role="button" className="table-row-list__group__item__value">
-                {value}
-              </Link>
-            ) : (
-              <span className="table-row-list__group__item__value"> {value}</span>
-            )}
-          </div>
-        ))}
-      </div>
-    ))}
-  </div>
-);
-
-const buildArrayRowData = rowData => {
-  const dataGroups = [];
-  const groups = Math.ceil(rowData.length / 3) || 1;
-  for (let index = 0; index < groups; index += 1) {
-    const currentStart = index * groups;
-    dataGroups[index] = rowData.slice(currentStart, currentStart + 3);
-  }
-
-  return buildArrayRowContent(dataGroups);
-};
-
-const getParsedRowData = rows =>
-  rows.map(rowData =>
-    Object.keys(rowData).reduce((acc, key) => {
-      const parsedData = Array.isArray(rowData[key])
-        ? buildArrayRowData(rowData[key])
-        : rowData[key];
-      return { ...acc, [key]: parsedData };
-    }, {})
-  );
-
-const getColumnsAndLabels = (listingProperties, allProperties, rows) => {
-  const columns = [];
-  const labels = {};
-
-  listingProperties.forEach(listingProperty => {
-    const propKey = listingProperty.includes(' ') ? listingProperty.split(' ')[0] : listingProperty;
-    const { label } = allProperties[propKey] || {};
-    columns.push(propKey);
-    labels[propKey] = label || getSanitizedColumnLabel(propKey);
-  });
-  const parsedRowData = getParsedRowData(rows);
-
-  return { columns, labels, parsedRowData };
+const getColumnLabels = (listingProperties, properties, dynamicProperties) => {
+  const allProperties = { ...properties, ...dynamicProperties };
+  return listingProperties.reduce((acc, listingProperty) => {
+    const label = allProperties[listingProperty].label || getSanitizedColumnLabel(listingProperty);
+    return { ...acc, ...{ [listingProperty]: label } };
+  }, {});
 };
 
 const populateRows = ({ toggleModal, url, entitySchema, rows }) => {
-  const {
-    id: schemaId,
-    listingProperties,
-    properties,
-    dynamicProperties = {},
-    formProperties
-  } = entitySchema;
-
-  const isEnquiry = schemaId === 'enquiry';
-  const columnOptions = !isEnquiry ? [...listingProperties, ACTIONS] : [...listingProperties];
-
-  const allProperties = { ...properties, ...dynamicProperties };
-  const { columns, labels, parsedRowData } = getColumnsAndLabels(
-    columnOptions,
-    allProperties,
-    rows
-  );
+  const { listingProperties, properties, dynamicProperties = {}, formProperties } = entitySchema;
+  const columns = [...listingProperties, ACTIONS];
   const [firstColumn] = columns;
+  const labels = {
+    ...getColumnLabels(listingProperties, properties, dynamicProperties),
+    [ACTIONS]: ACTIONS
+  };
 
   return {
     identification: 'id',
@@ -115,9 +51,8 @@ const populateRows = ({ toggleModal, url, entitySchema, rows }) => {
     columns,
     labels,
     orderBy: [...formProperties],
-    rows: formatRows({ firstColumn, rows: parsedRowData, url, toggleModal, isEnquiry }),
-    isEnquiry
+    rows: formatRows({ firstColumn, rows, url, toggleModal })
   };
 };
 
-export { populateRows, formatRows, getParsedRowData };
+export { populateRows, formatRows };

package/src/components/ListingTable/service/index.js

@@ -1,49 +1,12 @@
 import buildListingQuery from '../../../utils/build-listing-query';
 
-function buildVariables({ entitySchema, isSearchQuery, listFilters = [], queryParams = {} }) {
-  const { identifier } = entitySchema;
-  const { sort, offset, limit, where } = queryParams;
-  const [{ property, direction }] = sort;
-  const parsedOffset = `${property}:${direction}`;
-
-  if (!isSearchQuery)
-    return {
-      ...queryParams,
-      where: !Array.isArray(listFilters) ? listFilters : where
-    };
-
-  const rawQuery = {
-    bool: {
-      must: listFilters || [],
-      filter: [
-        {
-          term: {
-            entityIdentifier: identifier
-          }
-        }
-      ]
-    }
-  };
-
-  return {
-    limit,
-    offset,
-    sort: parsedOffset,
-    where: JSON.stringify(rawQuery)
-  };
-}
-
-const fetchData = async ({ client, querySettings: { entitySchema, queryParams }, listFilters }) => {
+const fetchData = async ({ client, querySettings: { entitySchema, queryParams } }) => {
+  const query = buildListingQuery(entitySchema);
   const {
-    displayProperties: { adminListings: { dataSource: { source } = {} } = {} } = {}
-  } = entitySchema;
-
-  const isSearchQuery = source === 'search';
-  const query = buildListingQuery(entitySchema, isSearchQuery);
-  const variables = buildVariables({ entitySchema, listFilters, queryParams, isSearchQuery });
-  const { data = {} } = await client.query({ query, variables, fetchPolicy: 'network-only' });
+    data: { listingData }
+  } = await client.query({ query, variables: queryParams, fetchPolicy: 'network-only' });
 
-  return data.searchResults ? data.searchResults.results : data.listingData;
+  return listingData;
 };
 
 export { fetchData };