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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.126.0",
+  "version": "0.127.0-project-admin-customisations.1",
   "description": "Blaze plugin data ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,12 +27,12 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "^0.125.0",
+    "@blaze-cms/admin-ui-utils": "0.127.0-project-admin-customisations.0",
     "@blaze-cms/core-errors": "^0.118.0",
-    "@blaze-cms/react-form-builder": "^0.125.0",
-    "@blaze-cms/react-page-builder": "^0.126.0",
+    "@blaze-cms/react-form-builder": "0.127.0-project-admin-customisations.0",
+    "@blaze-cms/react-page-builder": "0.127.0-project-admin-customisations.0",
     "@blaze-cms/setup-ui": "^0.92.0",
-    "@blaze-cms/versioning-ui": "^0.124.0",
+    "@blaze-cms/versioning-ui": "0.127.0-project-admin-customisations.0",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/more": "0.5.19",
     "@blaze-react/multiselect": "0.6.6",
@@ -65,5 +65,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "3426eb3c15ca8bf9c601ebfccff00ad695b9a83a"
+  "gitHead": "e4b28ef61ef99924bfbd026fd76159d6d5e27e50"
 }

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

@@ -34,6 +34,7 @@ import {
   checkFulfilConditions
 } from '../utils/entity';
 import useToggle from '../../../utils/hooks/useToggle';
+import InfoBoxes from '../../InfoBoxes/InfoBoxes';
 
 const Entity = ({
   formData,
@@ -403,68 +404,71 @@ const Entity = ({
 
   return (
     <div className="page">
-      <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}
-                />
-              </Tabs>
+      <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">
+                <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>
+              </div>
             </div>
           </div>
         </div>
-        <div className="column column--one-third">
+
+        <div className="column column--one-third page-sidebar">
           {showSideBarRelations && (
             <SideBarRelations
               entity={entity}

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

@@ -4,16 +4,21 @@ 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 Badge from '@blaze-react/badge';
+import classnames from 'classnames';
 import { VersionsList } from '@blaze-cms/versioning-ui';
-import { PUBLISHED } from '../../../../constants';
+import { PUBLISHED, UNPUBLISHED } from '../../../../constants';
 
 const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { relation: RelationComponent } = formFieldTypes;
-  const { formattedStatus, formattedUpdated, formattedCreated, formattedPublished } = formData;
+  const {
+    formattedStatus,
+    formattedUpdated,
+    formattedCreated,
+    formattedPublished,
+    status
+  } = formData;
   const client = useApolloClient();
   const [relationsComponents, setRelationsComponents] = useState(null);
-
   useEffect(
     () => {
       (async () => {
@@ -51,17 +56,26 @@ 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">
         {formattedCreated && (
           <div className="sidebar__status">
-            {formattedStatus && (
-              <Badge type="status" modifiers={formattedStatus}>
-                {formattedStatus}
-                {formattedStatus === PUBLISHED && `: ${formattedPublished}`}
-              </Badge>
+            <div className="sidebar__status__wrapper">
+              <b>Status</b>
+              <span className={statusClassName}>{formattedStatus}</span>
+            </div>
+            {formattedStatus === PUBLISHED && (
+              <p>
+                {formattedStatus} on: <span> {formattedPublished}</span>
+              </p>
             )}
+
             <p>
               Created: <span>{formattedCreated}</span>
             </p>

package/src/components/InfoBoxes/InfoBoxes.js

@@ -0,0 +1,24 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import InfoBoxContainer from './container/InfoBoxContainer';
+
+const InfoBoxes = ({ id, schema }) => {
+  const {
+    displayProperties: { adminInfoBoxes = [] }
+  } = schema;
+
+  if (adminInfoBoxes.length <= 0) {
+    return null;
+  }
+
+  return adminInfoBoxes.map(infoBox => (
+    <InfoBoxContainer id={id} schema={schema} key={infoBox.key} infoBox={infoBox} />
+  ));
+};
+
+export default InfoBoxes;
+
+InfoBoxes.propTypes = {
+  id: PropTypes.string.isRequired,
+  schema: PropTypes.object.isRequired
+};

package/src/components/InfoBoxes/container/InfoBoxContainer.js

@@ -0,0 +1,22 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import useData from '../hooks/useData';
+import InfoBox from '../presentational/InfoBox';
+
+const InfoBoxContainer = ({ id, schema, infoBox }) => {
+  const { data } = useData({ id, schema, infoBox });
+
+  if (!data || !Object.keys(data) || Object.keys(data).length === 0) return null;
+
+  const items = Object.values(data).flatMap(item => Object.values(item));
+
+  return <InfoBox items={items} infoBoxKey={infoBox.key} />;
+};
+
+export default InfoBoxContainer;
+
+InfoBoxContainer.propTypes = {
+  id: PropTypes.string.isRequired,
+  infoBox: PropTypes.object.isRequired,
+  schema: PropTypes.object.isRequired
+};

package/src/components/InfoBoxes/helpers/build-dynamic-query.js

@@ -0,0 +1,24 @@
+import { gql } from '@apollo/client';
+import { BlazeError } from '@blaze-cms/core-errors';
+
+export default function buildDynamicQuery({ id, schema, infoBox }) {
+  if (!schema || !schema.actions || !schema.actions.get || !schema.properties) {
+    throw new BlazeError(
+      'DataEntity query requires get action, properties and fields from entity schema'
+    );
+  }
+
+  const fields = `${infoBox.property} {
+      label
+      value
+    }`;
+
+  return {
+    query: gql`query getInfoBoxData($id: String!){
+    ${schema.actions.get}( id: $id ) {
+     ${fields}
+     __typename
+    }
+  }`
+  };
+}

package/src/components/InfoBoxes/hooks/useData.js

@@ -0,0 +1,20 @@
+import { useQuery, gql } from '@apollo/client';
+import useInfoBoxData from './useInfoBox';
+
+function useData({ id, schema, infoBox }) {
+  const { query } = useInfoBoxData({ id, schema, infoBox });
+
+  const infoBoxQuery =
+    query ||
+    gql`
+      query {
+        __typename
+      }
+    `;
+
+  const { data = {}, loading, error } = useQuery(infoBoxQuery, { variables: { id }, skip: !query });
+
+  return { data: data.__typename !== 'Query' ? data : null, loading, error };
+}
+
+export default useData;

package/src/components/InfoBoxes/hooks/useInfoBox.js

@@ -0,0 +1,13 @@
+import buildDynamicQuery from '../helpers/build-dynamic-query';
+
+function useInfoBox({ id, schema, infoBox }) {
+  const { query } = buildDynamicQuery({
+    id,
+    schema,
+    infoBox
+  });
+
+  return { query: query || null };
+}
+
+export default useInfoBox;

package/src/components/InfoBoxes/index.js

@@ -0,0 +1,3 @@
+import InfoBoxes from './InfoBoxes';
+
+export default InfoBoxes;

package/src/components/InfoBoxes/presentational/InfoBox.js

@@ -0,0 +1,34 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+
+const InfoBox = ({ items, infoBoxKey }) => {
+  if (!items) return null;
+
+  const infoBoxItems = items.map(item =>
+    Object.values(item)
+      .map(info => {
+        if (!info.label || !info.value) return null;
+
+        return (
+          <div className="info-box--item" key={`${infoBoxKey}-${info.label.toLowerCase()}`}>
+            <div className="info-box--label">{info.label}: </div>
+            <div className="info-box--value">{info.value}</div>
+          </div>
+        );
+      })
+      .filter(Boolean)
+  );
+
+  return (
+    <div className="info-box" key={infoBoxKey}>
+      <div className="info-box--container">{infoBoxItems}</div>
+    </div>
+  );
+};
+
+export default InfoBox;
+
+InfoBox.propTypes = {
+  infoBoxKey: PropTypes.string.isRequired,
+  items: PropTypes.array.isRequired
+};