@blaze-cms/plugin-data-ui 0.146.0-alpha.56 → 0.146.0-alpha.57

package/lib-es/utils/build-listing-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-listing-query.js","names":["gql","BlazeError","getDynamicQuery","buildAdminSearchQuery","entitySchema","index","listingProperties","parsedProperties","join","buildListingQuery","isSearchQuery","actions","getAll","sortType","toUpperCase","substr","countAll"],"sources":["../../src/utils/build-listing-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\nimport { getDynamicQuery } from '@blaze-cms/admin-ui-utils';\n\nconst buildAdminSearchQuery = (entitySchema, index) => {\n  const { listingProperties = [] } = entitySchema || {};\n  const parsedProperties = `id, ${listingProperties.join(' ') || 'id name'}`;\n\n  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true, index);\n};\n\nfunction buildListingQuery(entitySchema, index, isSearchQuery) {\n  if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {\n    throw new BlazeError(\n      'Listing query requires getAll action and listingProperties from entity schema'\n    );\n  }\n\n  if (isSearchQuery) return buildAdminSearchQuery(entitySchema, index);\n\n  const sortType =\n    entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);\n\n  return gql`\n    query ${\n      entitySchema.actions.getAll\n    }($where: JSON, $limit: Int, $offset:Int, $sort: [${sortType}SortItem]) {\n      listingData: ${\n        entitySchema.actions.getAll\n      }(where: $where, limit: $limit, offset:$offset, sort:$sort){\n        id,\n        ${entitySchema.listingProperties.join(',\\n')}\n      }\n      totalRecords: ${entitySchema.actions.countAll}(where: $where)\n    }\n  `;\n}\n\nexport default buildListingQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,eAAe,QAAQ,2BAA2B;AAE3D,MAAMC,qBAAqB,GAAGA,CAACC,YAAY,EAAEC,KAAK,KAAK;EACrD,MAAM;IAAEC,iBAAiB,GAAG;EAAG,CAAC,GAAGF,YAAY,IAAI,CAAC,CAAC;EACrD,MAAMG,gBAAgB,GAAI,OAAMD,iBAAiB,CAACE,IAAI,CAAC,GAAG,CAAC,IAAI,SAAU,EAAC;EAE1E,OAAON,eAAe,CAAC,cAAc,CAAC,CAAC,CAACE,YAAY,CAAC,EAAEG,gBAAgB,EAAE,IAAI,EAAEF,KAAK,CAAC;AACvF,CAAC;AAED,SAASI,iBAAiBA,CAACL,YAAY,EAAEC,KAAK,EAAEK,aAAa,EAAE;EAC7D,IAAI,CAACN,YAAY,CAACO,OAAO,IAAI,CAACP,YAAY,CAACO,OAAO,CAACC,MAAM,IAAI,CAACR,YAAY,CAACE,iBAAiB,EAAE;IAC5F,MAAM,IAAIL,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,IAAIS,aAAa,EAAE,OAAOP,qBAAqB,CAACC,YAAY,EAAEC,KAAK,CAAC;EAEpE,MAAMQ,QAAQ,GACZT,YAAY,CAACO,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACE,WAAW,CAAC,CAAC,GAAGV,YAAY,CAACO,OAAO,CAACC,MAAM,CAACG,MAAM,CAAC,CAAC,CAAC;EAEtF,OAAOf,GAAI;AACb,YACMI,YAAY,CAACO,OAAO,CAACC,MACtB,oDAAmDC,QAAS;AACjE,qBACQT,YAAY,CAACO,OAAO,CAACC,MACtB;AACP;AACA,UAAUR,YAAY,CAACE,iBAAiB,CAACE,IAAI,CAAC,KAAK,CAAE;AACrD;AACA,sBAAsBJ,YAAY,CAACO,OAAO,CAACK,QAAS;AACpD;AACA,GAAG;AACH;AAEA,eAAeP,iBAAiB","ignoreList":[]}
+{"version":3,"file":"build-listing-query.js","names":["gql","BlazeError","getDynamicQuery","buildAdminSearchQuery","entitySchema","index","listingProperties","parsedProperties","join","buildListingQuery","isSearchQuery","actions","getAll","sortType","toUpperCase","substr","countAll"],"sources":["../../src/utils/build-listing-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\nimport { getDynamicQuery } from '@blaze-cms/admin-ui-utils';\n\nconst buildAdminSearchQuery = (entitySchema, index) => {\n  const { listingProperties = [] } = entitySchema || {};\n  const parsedProperties = `id, ${listingProperties.join(' ') || 'id name'}`;\n\n  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true, index);\n};\n\nfunction buildListingQuery(entitySchema, index, isSearchQuery) {\n  if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {\n    throw new BlazeError(\n      'Listing query requires getAll action and listingProperties from entity schema'\n    );\n  }\n\n  if (isSearchQuery) return buildAdminSearchQuery(entitySchema, index);\n\n  const sortType =\n    entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);\n\n  return gql`\n    query ${\n      entitySchema.actions.getAll\n    }($where: JSON, $limit: Int, $offset:Int, $sort: [${sortType}SortItem]) {\n      listingData: ${\n        entitySchema.actions.getAll\n      }(where: $where, limit: $limit, offset:$offset, sort:$sort){\n        id,\n        ${entitySchema.listingProperties.join(',\\n')}\n      }\n      totalRecords: ${entitySchema.actions.countAll}(where: $where)\n    }\n  `;\n}\n\nexport default buildListingQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,eAAe,QAAQ,2BAA2B;AAE3D,MAAMC,qBAAqB,GAAGA,CAACC,YAAY,EAAEC,KAAK,KAAK;EACrD,MAAM;IAAEC,iBAAiB,GAAG;EAAG,CAAC,GAAGF,YAAY,IAAI,CAAC,CAAC;EACrD,MAAMG,gBAAgB,GAAG,OAAOD,iBAAiB,CAACE,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,EAAE;EAE1E,OAAON,eAAe,CAAC,cAAc,CAAC,CAAC,CAACE,YAAY,CAAC,EAAEG,gBAAgB,EAAE,IAAI,EAAEF,KAAK,CAAC;AACvF,CAAC;AAED,SAASI,iBAAiBA,CAACL,YAAY,EAAEC,KAAK,EAAEK,aAAa,EAAE;EAC7D,IAAI,CAACN,YAAY,CAACO,OAAO,IAAI,CAACP,YAAY,CAACO,OAAO,CAACC,MAAM,IAAI,CAACR,YAAY,CAACE,iBAAiB,EAAE;IAC5F,MAAM,IAAIL,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,IAAIS,aAAa,EAAE,OAAOP,qBAAqB,CAACC,YAAY,EAAEC,KAAK,CAAC;EAEpE,MAAMQ,QAAQ,GACZT,YAAY,CAACO,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACE,WAAW,CAAC,CAAC,GAAGV,YAAY,CAACO,OAAO,CAACC,MAAM,CAACG,MAAM,CAAC,CAAC,CAAC;EAEtF,OAAOf,GAAG;AACZ,YACMI,YAAY,CAACO,OAAO,CAACC,MAAM,oDACuBC,QAAQ;AAChE,qBACQT,YAAY,CAACO,OAAO,CAACC,MAAM;AACnC;AACA,UACUR,YAAY,CAACE,iBAAiB,CAACE,IAAI,CAAC,KAAK,CAAC;AACpD;AACA,sBAAsBJ,YAAY,CAACO,OAAO,CAACK,QAAQ;AACnD;AACA,GAAG;AACH;AAEA,eAAeP,iBAAiB","ignoreList":[]}

package/lib-es/utils/build-update-data-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-update-data-query.js","names":["gql","BlazeError","upperfirst","getDataProperties","buildUpdateDataQuery","entitySchema","actions","update","properties","actionInput","dataProperties","join"],"sources":["../../src/utils/build-update-data-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\nimport upperfirst from 'lodash.upperfirst';\nimport { getDataProperties } from '@blaze-cms/admin-ui-utils';\n\nfunction buildUpdateDataQuery(entitySchema) {\n  if (!entitySchema.actions || !entitySchema.actions.update || !entitySchema.properties) {\n    throw new BlazeError(\n      'Update DataEntity query requires get action and properties from entity schema'\n    );\n  }\n\n  const actionInput = upperfirst(`${entitySchema.actions.update}Input`);\n  const dataProperties = getDataProperties(entitySchema);\n\n  return gql`\n  mutation updateEntity($input:  ${actionInput}) {\n    updateEntity: ${entitySchema.actions.update}(input: $input){\n        result {\n          id,\n          ${dataProperties.join(',\\n')},\n          updated\n      }\n    }\n  }\n  `;\n}\n\nexport default buildUpdateDataQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,OAAOC,UAAU,MAAM,mBAAmB;AAC1C,SAASC,iBAAiB,QAAQ,2BAA2B;AAE7D,SAASC,oBAAoBA,CAACC,YAAY,EAAE;EAC1C,IAAI,CAACA,YAAY,CAACC,OAAO,IAAI,CAACD,YAAY,CAACC,OAAO,CAACC,MAAM,IAAI,CAACF,YAAY,CAACG,UAAU,EAAE;IACrF,MAAM,IAAIP,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,MAAMQ,WAAW,GAAGP,UAAU,CAAE,GAAEG,YAAY,CAACC,OAAO,CAACC,MAAO,OAAM,CAAC;EACrE,MAAMG,cAAc,GAAGP,iBAAiB,CAACE,YAAY,CAAC;EAEtD,OAAOL,GAAI;AACb,mCAAmCS,WAAY;AAC/C,oBAAoBJ,YAAY,CAACC,OAAO,CAACC,MAAO;AAChD;AACA;AACA,YAAYG,cAAc,CAACC,IAAI,CAAC,KAAK,CAAE;AACvC;AACA;AACA;AACA;AACA,GAAG;AACH;AAEA,eAAeP,oBAAoB","ignoreList":[]}
+{"version":3,"file":"build-update-data-query.js","names":["gql","BlazeError","upperfirst","getDataProperties","buildUpdateDataQuery","entitySchema","actions","update","properties","actionInput","dataProperties","join"],"sources":["../../src/utils/build-update-data-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\nimport upperfirst from 'lodash.upperfirst';\nimport { getDataProperties } from '@blaze-cms/admin-ui-utils';\n\nfunction buildUpdateDataQuery(entitySchema) {\n  if (!entitySchema.actions || !entitySchema.actions.update || !entitySchema.properties) {\n    throw new BlazeError(\n      'Update DataEntity query requires get action and properties from entity schema'\n    );\n  }\n\n  const actionInput = upperfirst(`${entitySchema.actions.update}Input`);\n  const dataProperties = getDataProperties(entitySchema);\n\n  return gql`\n  mutation updateEntity($input:  ${actionInput}) {\n    updateEntity: ${entitySchema.actions.update}(input: $input){\n        result {\n          id,\n          ${dataProperties.join(',\\n')},\n          updated\n      }\n    }\n  }\n  `;\n}\n\nexport default buildUpdateDataQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,OAAOC,UAAU,MAAM,mBAAmB;AAC1C,SAASC,iBAAiB,QAAQ,2BAA2B;AAE7D,SAASC,oBAAoBA,CAACC,YAAY,EAAE;EAC1C,IAAI,CAACA,YAAY,CAACC,OAAO,IAAI,CAACD,YAAY,CAACC,OAAO,CAACC,MAAM,IAAI,CAACF,YAAY,CAACG,UAAU,EAAE;IACrF,MAAM,IAAIP,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,MAAMQ,WAAW,GAAGP,UAAU,CAAC,GAAGG,YAAY,CAACC,OAAO,CAACC,MAAM,OAAO,CAAC;EACrE,MAAMG,cAAc,GAAGP,iBAAiB,CAACE,YAAY,CAAC;EAEtD,OAAOL,GAAG;AACZ,mCAAmCS,WAAW;AAC9C,oBAAoBJ,YAAY,CAACC,OAAO,CAACC,MAAM;AAC/C;AACA;AACA,YAAYG,cAAc,CAACC,IAAI,CAAC,KAAK,CAAC;AACtC;AACA;AACA;AACA;AACA,GAAG;AACH;AAEA,eAAeP,oBAAoB","ignoreList":[]}

package/lib-es/utils/build-update-publish-unpublish-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-update-publish-unpublish-mutation.js","names":["gql","BlazeError","buildUpdatePublishUnpublishMutation","entitySchema","id","action","cache","actions","publish","withClient"],"sources":["../../src/utils/build-update-publish-unpublish-mutation.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\n\nfunction buildUpdatePublishUnpublishMutation(entitySchema, id, action, cache) {\n  if (!entitySchema || !entitySchema.actions || !entitySchema.actions.publish || !id || !action) {\n    throw new BlazeError(\n      'Update DataEntity query requires publish action from entity schema and id'\n    );\n  }\n\n  const withClient = `${cache ? '@client' : ''}`;\n\n  return gql`\n    mutation {\n      response: ${entitySchema.actions[action]} ${withClient}(input: {\n        id: \"${id}\"\n      }){\n        result {\n          id,\n          status\n        }\n      }\n    }\n  `;\n}\n\nexport default buildUpdatePublishUnpublishMutation;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,mCAAmCA,CAACC,YAAY,EAAEC,EAAE,EAAEC,MAAM,EAAEC,KAAK,EAAE;EAC5E,IAAI,CAACH,YAAY,IAAI,CAACA,YAAY,CAACI,OAAO,IAAI,CAACJ,YAAY,CAACI,OAAO,CAACC,OAAO,IAAI,CAACJ,EAAE,IAAI,CAACC,MAAM,EAAE;IAC7F,MAAM,IAAIJ,UAAU,CAClB,2EACF,CAAC;EACH;EAEA,MAAMQ,UAAU,GAAI,GAAEH,KAAK,GAAG,SAAS,GAAG,EAAG,EAAC;EAE9C,OAAON,GAAI;AACb;AACA,kBAAkBG,YAAY,CAACI,OAAO,CAACF,MAAM,CAAE,IAAGI,UAAW;AAC7D,eAAeL,EAAG;AAClB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AAEA,eAAeF,mCAAmC","ignoreList":[]}
+{"version":3,"file":"build-update-publish-unpublish-mutation.js","names":["gql","BlazeError","buildUpdatePublishUnpublishMutation","entitySchema","id","action","cache","actions","publish","withClient"],"sources":["../../src/utils/build-update-publish-unpublish-mutation.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\n\nfunction buildUpdatePublishUnpublishMutation(entitySchema, id, action, cache) {\n  if (!entitySchema || !entitySchema.actions || !entitySchema.actions.publish || !id || !action) {\n    throw new BlazeError(\n      'Update DataEntity query requires publish action from entity schema and id'\n    );\n  }\n\n  const withClient = `${cache ? '@client' : ''}`;\n\n  return gql`\n    mutation {\n      response: ${entitySchema.actions[action]} ${withClient}(input: {\n        id: \"${id}\"\n      }){\n        result {\n          id,\n          status\n        }\n      }\n    }\n  `;\n}\n\nexport default buildUpdatePublishUnpublishMutation;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,mCAAmCA,CAACC,YAAY,EAAEC,EAAE,EAAEC,MAAM,EAAEC,KAAK,EAAE;EAC5E,IAAI,CAACH,YAAY,IAAI,CAACA,YAAY,CAACI,OAAO,IAAI,CAACJ,YAAY,CAACI,OAAO,CAACC,OAAO,IAAI,CAACJ,EAAE,IAAI,CAACC,MAAM,EAAE;IAC7F,MAAM,IAAIJ,UAAU,CAClB,2EACF,CAAC;EACH;EAEA,MAAMQ,UAAU,GAAG,GAAGH,KAAK,GAAG,SAAS,GAAG,EAAE,EAAE;EAE9C,OAAON,GAAG;AACZ;AACA,kBAAkBG,YAAY,CAACI,OAAO,CAACF,MAAM,CAAC,IAAII,UAAU;AAC5D,eAAeL,EAAE;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AAEA,eAAeF,mCAAmC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.146.0-alpha.56",
+  "version": "0.146.0-alpha.57",
   "description": "Blaze plugin data ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,11 +27,11 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "0.146.0-alpha.56",
+    "@blaze-cms/admin-ui-utils": "0.146.0-alpha.57",
     "@blaze-cms/core-errors": "0.146.0-alpha.42",
     "@blaze-cms/plugin-render-hooks-ui": "^0.140.3",
-    "@blaze-cms/react-form-builder": "0.146.0-alpha.56",
-    "@blaze-cms/react-page-builder": "0.146.0-alpha.56",
+    "@blaze-cms/react-form-builder": "0.146.0-alpha.57",
+    "@blaze-cms/react-page-builder": "0.146.0-alpha.57",
     "@blaze-cms/setup-ui": "^0.140.3",
     "@blaze-cms/versioning-ui": "0.146.0-alpha.2",
     "@blaze-react/button": "0.8.0-alpha.82",
@@ -68,5 +68,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "eaaeadb33fd0b215b136a9c6fbdb1c634bd294a3"
+  "gitHead": "152c5b312424d02ad461b7ac5bca798ca557d4ed"
 }

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

@@ -41,7 +41,7 @@ const EntityHeader = ({
       <PageHeader.Actions>
         {!saveOnChange && (
           <Button onClick={onSubmit} modifiers={SaveButtonModifiers} data-testid="button-save">
-            {saveButtonText === 'save' ? 'Apply' : saveButtonText}
+            {saveButtonText}
           </Button>
         )}
         <More disabled={shouldDisableMoreMenu}>

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

@@ -17,6 +17,7 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
     formattedUpdated,
     formattedCreated,
     formattedPublished,
+    updatedBy,
     status
   } = formData;
   const client = useApolloClient();
@@ -92,6 +93,11 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
                   <p>
                     Updated: <span>{formattedUpdated}</span>
                   </p>
+                  {updatedBy && (
+                    <p>
+                      Updated by: <span>{updatedBy.name}</span>
+                    </p>
+                  )}
                 </>
               </>
             )}

package/src/components/ListingTable/ListingTable.js

@@ -39,7 +39,7 @@ const ListingTable = ({ match, entitySchema, history }) => {
             ...queryParams,
             offset: currentPage * queryParamsDefault.limit - queryParamsDefault.limit
           };
-          await doQuery(listFilters, updatedQueryParams);
+          await doQuery([], updatedQueryParams);
           setPreviousSchema({ id: entitySchema.id });
         }
       })();

package/src/components/ListingTable/SearchFilter/SearchContainer.js

@@ -199,17 +199,22 @@ const SearchContainer = ({
 
       {displaySelectFilters &&
         selectOptions.map(({ id, options, label }) => (
-          <div className="search-container__select-wrapper">
-            <Select
-              label={label}
-              id={id}
-              name={id}
-              onChange={event => handleSelect(id, event)}
-              options={options}
-              value={selectedFilters[id]}
-              defaultTextValue={DEFAULT_FILTER_OPTION_LABEL}
-            />
-          </div>
+          <>
+            {options &&
+              !!options.length && (
+                <div className="search-container__select-wrapper">
+                  <Select
+                    label={label}
+                    id={id}
+                    name={id}
+                    onChange={event => handleSelect(id, event)}
+                    options={options}
+                    value={selectedFilters[id]}
+                    defaultTextValue={DEFAULT_FILTER_OPTION_LABEL}
+                  />
+                </div>
+              )}
+          </>
         ))}
 
       <div className="search-container__reset-button">

package/src/components/ListingTable/SearchFilter/SearchFilter.js

@@ -21,6 +21,7 @@ const SearchFilter = ({ schema, setListFilters }) => {
   return (
     <SearchContainer
       index={index}
+      key={schema.id}
       setListFilters={setListFilters}
       keywordFiltersToUse={keywordFiltersToUse}
       selectFiltersToDisplay={selectFiltersToDisplay}

package/src/components/ListingTable/SearchFilter/helpers.js

@@ -2,21 +2,24 @@ import { DEFAULT_FILTER_OPTION_LABEL } from '../../../constants';
 
 const updateListFilters = (searchTerm, selectedFilters, setListFilters, fields = []) => {
   const filters = [];
+
   if (searchTerm) {
     filters.push({
       simple_query_string: {
-        query: `${searchTerm}*`,
-        fields
+        query: `${searchTerm}`,
+        default_operator: 'AND',
+        fields: fields.map(field => field)
       }
     });
   }
 
-  Object.keys(selectedFilters).forEach(filterKey => {
-    const filterValue = selectedFilters[filterKey];
+  Object.entries(selectedFilters).forEach(([filterKey, filterValue]) => {
     if (!filterValue || filterValue === DEFAULT_FILTER_OPTION_LABEL) return;
     filters.push({
       match: {
-        [filterKey]: filterValue
+        [`${filterKey}.keyword`]: {
+          query: filterValue
+        }
       }
     });
   });