@blaze-cms/plugin-data-ui 0.131.0-project-admin-customisations.1 → 0.131.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.131.0-project-admin-customisations.1",
+  "version": "0.131.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.0",
-    "@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.1",
-    "@blaze-cms/react-page-builder": "0.131.0-project-admin-customisations.0",
-    "@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.131.0",
+    "@blaze-cms/core-errors": "^0.131.0",
+    "@blaze-cms/react-form-builder": "^0.131.0",
+    "@blaze-cms/react-page-builder": "^0.131.0",
+    "@blaze-cms/setup-ui": "^0.131.0",
+    "@blaze-cms/versioning-ui": "^0.131.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.131.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -66,5 +65,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "2d356fae5eb8ddda415ce16557d35c5a1c28ed1b"
+  "gitHead": "8448393caa59dd524bd263a07d7bb263550cda13"
 }

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,
@@ -405,77 +403,68 @@ const Entity = ({
 
   return (
     <div className="page">
-      <EntityHeader
-        entityData={entityData}
-        entityIdentifier={entityIdentifier}
-        pageTitle={pageTitle}
-        pageName={pageName}
-        onSubmit={onSubmit}
-        handlePublishAndUnpublish={handlePublishAndUnpublish}
-        isSaveButtonAvailable={isSaveButtonAvailable}
-        isEnablePublishButton={isEnablePublishButton}
-        isEnablePreviewButton={isEnablePreviewButton}
-        toggleCopyModal={setCopyModalStatus}
-        toggleModal={setModalStatus}
-        formData={formData}
-        onViewUrl={onViewUrlHandler}
-        saveButtonText={saveButtonText}
-      />
-      <div className="page-wrapper__content">
-        <div className="tabs-wrapper tabs-wrapper__tab">
-          <Prompt when={hasToDisplayPrompt} message={LEAVE_PAGE_MESSAGE} />
-          {showModal && (
-            <DeleteAction
-              onClose={setModalStatus}
-              deleteAction={onDelete}
-              itemName={formData.values.name}
-            />
-          )}
-          {copyModalStatus && (
-            <CopyDataFromAction
-              onClose={handleCopyDataFromClose}
-              copyAction={onCopy}
-              getFormData={getFormData}
-            />
-          )}
-
-          <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 => {
-                    client.writeQuery({
-                      query: GET_CURRENT_TAB_ID,
-                      data: { currentTabId: tabId }
-                    });
-                    setCurrentTabId(tabId);
-                  }}>
-                  <FormBuilder
-                    getIsFormValid={setIsFormValid}
-                    getFormValues={getFormValues}
-                    schema={schema}
-                    data={clonedFormData}
-                    onChange={onChangeFormValues}
-                    shouldCopyData={shouldCopyData}
-                    updateCopyData={updateCopyData}
-                    formValues={formValues}
-                    isNewEntity={isNewEntity}
-                  />
-                </Tabs>
-                <RenderHook
-                  hookKey={`entity:${action}:main:bottom`}
-                  entity={entity}
+      <Prompt when={hasToDisplayPrompt} message={LEAVE_PAGE_MESSAGE} />
+      {showModal && (
+        <DeleteAction
+          onClose={setModalStatus}
+          deleteAction={onDelete}
+          itemName={formData.values.name}
+        />
+      )}
+      {copyModalStatus && (
+        <CopyDataFromAction
+          onClose={handleCopyDataFromClose}
+          copyAction={onCopy}
+          getFormData={getFormData}
+        />
+      )}
+
+      <div className="row row--display-row">
+        <div className="column column--three-quarters">
+          <EntityHeader
+            entityData={entityData}
+            entityIdentifier={entityIdentifier}
+            pageTitle={pageTitle}
+            pageName={pageName}
+            onSubmit={onSubmit}
+            handlePublishAndUnpublish={handlePublishAndUnpublish}
+            isSaveButtonAvailable={isSaveButtonAvailable}
+            isEnablePublishButton={isEnablePublishButton}
+            isEnablePreviewButton={isEnablePreviewButton}
+            toggleCopyModal={setCopyModalStatus}
+            toggleModal={setModalStatus}
+            formData={formData}
+            onViewUrl={onViewUrlHandler}
+            saveButtonText={saveButtonText}
+          />
+
+          <div className="page__content">
+            <div className="content">
+              <Tabs
+                enabled={showPageBuilderTabs}
+                onTabChange={tabId => {
+                  client.writeQuery({
+                    query: GET_CURRENT_TAB_ID,
+                    data: { currentTabId: tabId }
+                  });
+                  setCurrentTabId(tabId);
+                }}>
+                <FormBuilder
+                  getIsFormValid={setIsFormValid}
+                  getFormValues={getFormValues}
                   schema={schema}
+                  data={clonedFormData}
+                  onChange={onChangeFormValues}
+                  shouldCopyData={shouldCopyData}
+                  updateCopyData={updateCopyData}
+                  formValues={formValues}
+                  isNewEntity={isNewEntity}
                 />
-              </div>
+              </Tabs>
             </div>
           </div>
         </div>
-
-        <div className="column column--one-third page-sidebar page-sidebar--relations">
+        <div className="column column--one-third">
           {showSideBarRelations && (
             <SideBarRelations
               entity={entity}

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

@@ -4,23 +4,14 @@ import uuidv1 from 'uuid/v1';
 import { useApolloClient } from '@apollo/client';
 import { getQuery } from '@blaze-cms/admin-ui-utils';
 import { formFieldTypes } from '@blaze-cms/react-form-builder';
-import classnames from 'classnames';
+import Badge from '@blaze-react/badge';
 import { VersionsList } from '@blaze-cms/versioning-ui';
-import { PUBLISHED, UNPUBLISHED } from '../../../../constants';
-import CustomSidebarInfoContainer from './container/CustomSidebarInfoContainer';
-import EntityNavLinks from '../EntitiyNavLinks';
+import { PUBLISHED } from '../../../../constants';
 
 const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { relation: RelationComponent } = formFieldTypes;
-  const {
-    formattedStatus,
-    formattedUpdated,
-    formattedCreated,
-    formattedPublished,
-    status
-  } = formData;
+  const { formattedStatus, formattedUpdated, formattedCreated, formattedPublished } = formData;
   const client = useApolloClient();
-
   const [relationsComponents, setRelationsComponents] = useState(null);
 
   useEffect(
@@ -60,50 +51,27 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { id: itemId } = entity;
   const { identifier: itemEntity, interfaces } = schema;
 
-  const statusClassName = classnames('sidebar__status__badge', {
-    'sidebar__status__badge--published': status === PUBLISHED,
-    'sidebar__status__badge--unpublished': status === UNPUBLISHED
-  });
-
   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>
-              )}
-            </div>
-          )}
-
-          {!schema.displayProperties.adminMainInfoProperty && (
-            <>
-              <p>
-                Created: <span>{formattedCreated}</span>
-              </p>
-              <p>
-                Updated: <span>{formattedUpdated}</span>
-              </p>
-            </>
-          )}
-
-          <CustomSidebarInfoContainer
-            id={itemId}
-            schema={schema}
-            displayProperties={schema.displayProperties}
-          />
-        </div>
+        {formattedCreated && (
+          <div className="sidebar__status">
+            {formattedStatus && (
+              <Badge type="status" modifiers={formattedStatus}>
+                {formattedStatus}
+                {formattedStatus === PUBLISHED && `: ${formattedPublished}`}
+              </Badge>
+            )}
+            <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,18 +3,18 @@ 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({});
@@ -23,6 +23,7 @@ const ListingTable = ({ match, entitySchema }) => {
   const [verifiedRanges, setVerifiedRanges] = useState([]);
   const queryParamsDefault = getDefaultQueryParams({ schema: entitySchema });
   const [queryParams, setQueryParams] = useState(queryParamsDefault);
+  const { menuItems, setMenuItems } = useMainContext(MainContext);
   const client = useApolloClient();
   const { addToast } = useToasts();
 
@@ -46,7 +47,6 @@ const ListingTable = ({ match, entitySchema }) => {
             entitySchema,
             rows: data
           });
-
           setTableData(populatedTable);
           setPreviousSchema({ id: entitySchema.id });
         }
@@ -55,7 +55,17 @@ const ListingTable = ({ match, entitySchema }) => {
     [client, entitySchema, match.url, previousSchema.id, queryParams] // eslint-disable-line react-hooks/exhaustive-deps
   );
 
-  const onCloseCardPrompt = () => null;
+  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 toggleModal = item => {
     setModalStatus(!!item);
@@ -99,19 +109,13 @@ const ListingTable = ({ match, entitySchema }) => {
         queryParams: sortQueryParams
       }
     });
-    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 })
     });
   };
 
@@ -133,12 +137,7 @@ const ListingTable = ({ match, entitySchema }) => {
       });
       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]);
@@ -152,7 +151,6 @@ const ListingTable = ({ match, entitySchema }) => {
   };
 
   if (!tableData || !tableData.rows) return 'loading';
-  const showAddButton = !!tableData.rows.length && !tableData.isEnquiry;
 
   return (
     <div className="page">
@@ -164,7 +162,7 @@ const ListingTable = ({ match, entitySchema }) => {
         />
       )}
       <PageHeader title={entitySchema.displayName} subtitle="">
-        {showAddButton && (
+        {(!selectedMenuItem.isDisplayedPrompt || !!tableData.rows.length) && (
           <Fragment>
             <Link
               data-testid="addEntity"
@@ -183,13 +181,13 @@ const ListingTable = ({ match, entitySchema }) => {
           </Fragment>
         )}
       </PageHeader>
-      <RenderHook hookKey="entity:listing:main:top" schema={entitySchema} />
       <ListingTableContent
         overScanBuffer={OVER_SCAN_BUFFER}
         onSort={handleSort}
         onRenderItems={handleRenderedItems}
         tableData={tableData}
         onCloseCardPrompt={onCloseCardPrompt}
+        selectedMenuItem={selectedMenuItem}
         scrollToIndex={scrollToIndex}
       />
     </div>
@@ -197,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,7 +1,8 @@
 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,
@@ -16,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}
@@ -31,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>
+        )
       )}
     </>
   );
@@ -45,7 +55,7 @@ const ListingTableContent = ({
 ListingTableContent.propTypes = {
   tableData: PropTypes.object.isRequired,
   onCloseCardPrompt: PropTypes.func.isRequired,
-  selectedMenuItem: PropTypes.object,
+  selectedMenuItem: PropTypes.object.isRequired,
   match: PropTypes.shape({
     url: PropTypes.string
   }).isRequired,
@@ -63,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 };