@blaze-cms/plugin-google-maps-fe 0.124.0-alpha.1 → 0.124.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-google-maps-fe",
-  "version": "0.124.0-alpha.1",
+  "version": "0.124.0-alpha.4",
   "description": "Blaze Google maps plugin fe",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,8 +27,8 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/nextjs-components": "^0.124.0-alpha.1",
-    "@blaze-cms/react-page-builder": "^0.124.0-alpha.1",
+    "@blaze-cms/nextjs-components": "^0.124.0-alpha.2",
+    "@blaze-cms/react-page-builder": "^0.124.0-alpha.4",
     "@blaze-cms/setup-ui": "^0.92.0",
     "core-js": "^3.2.1",
     "lodash.isnumber": "^3.0.3",
@@ -44,5 +44,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "797f21d4f5d2291343e2bdb017039cfd3b6290e0"
+  "gitHead": "b64d7bf5579ccdf2cdbd4930ed07f27f8c8658a1"
 }

package/src/GoogleMaps/helpers/build-shapes-configs.js

@@ -39,7 +39,7 @@ const buildFilters = filters => {
 const buiildShapeProps = (shape, shapeKey, dataSummaries, parentId, entityData, entityGroup) => {
   const { displayItems = [], filterBy } = shape;
   const { latProp, lonProp, entity } = entityGroup;
-  const { actions } = entityData;
+  const { actions, relations } = entityData;
   const action = actions ? actions.getAllPublished || actions.getAll : '';
 
   const dataSummaryProps = dataSummaries
@@ -59,7 +59,10 @@ const buiildShapeProps = (shape, shapeKey, dataSummaries, parentId, entityData,
   let propsQuery = dataSummaryProps ? `${dataSummaryProps}` : '';
   propsQuery = getUpdatedPropsQuery(propsQuery, entityData);
   if (latProp && lonProp) {
-    propsQuery = `${propsQuery} ${formatProp(latProp)} ${formatProp(lonProp)}`;
+    propsQuery = `${propsQuery} ${formatProp(latProp, relations)} ${formatProp(
+      lonProp,
+      relations
+    )}`;
   }
   if (ids.length && !propsQuery.includes(ID)) propsQuery = `${propsQuery.trim()} ${ID}`;
 
@@ -73,11 +76,12 @@ const buiildShapeProps = (shape, shapeKey, dataSummaries, parentId, entityData,
   };
 };
 
-const formatProp = prop => {
+const formatProp = (prop, relations = []) => {
   if (!prop.includes('.')) return prop;
 
   const [mainProp, nestedProp] = prop.split('.');
-  return `${mainProp}{${nestedProp}}`;
+  const idProp = relations.find(({ localField }) => localField === mainProp) ? 'id ' : '';
+  return `${mainProp}{${idProp}${nestedProp}}`;
 };
 
 const buildShapesConfig = (schemas, entityGroups, parent) => {

package/src/GoogleMaps/queries.js

@@ -3,10 +3,12 @@ import { gql } from '@apollo/client';
 const GET_ENTITY_SCHEMAS = gql`
   query getEntitySchemas($identifier: String) {
     getEntitySchemas(identifier: $identifier) {
+      id
       identifier
       actions
       dynamicProperties
       properties
+      relations
     }
   }
 `;
@@ -24,12 +26,14 @@ const generateWhereQuery = queryString => gql`
 `;
 const generateQueryString = (action, query, props) => `
   ${query}: ${action}(where: $where){
+    id
     ${props}
   }
 `;
 
 const generateIdsQuery = (query, props, action, ids) => `
   ${query}: ${action}(where: { id: { _in: ${JSON.stringify(ids)} } }){
+    id
     ${props}
   }
 `;
@@ -38,6 +42,7 @@ const generateFiltersQuery = (query, props, rawQUery, filterQueryKey) => `
   ${query}:  searchPublishedContent(rawQueryStringified: ${JSON.stringify(rawQUery)}){
     results {
       ...on ${filterQueryKey} {
+        id
         ${props}
       }
     }