@contentful/field-editor-reference 5.1.5 → 5.1.8

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.1.8](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.1.7...@contentful/field-editor-reference@5.1.8) (2022-09-12)
+
+### Bug Fixes
+
+- **reference-editor:** re-introduce entity refetch when slide-in is closed ([#1233](https://github.com/contentful/field-editors/issues/1233)) ([7026521](https://github.com/contentful/field-editors/commit/7026521d3c1885dbe61acd9dfc7a1e091a036565))
+
+## [5.1.7](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.1.6...@contentful/field-editor-reference@5.1.7) (2022-09-09)
+
+**Note:** Version bump only for package @contentful/field-editor-reference
+
+## [5.1.6](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.1.5...@contentful/field-editor-reference@5.1.6) (2022-09-07)
+
+### Bug Fixes
+
+- **reference-editor:** accept pubsub messages from alias and non-alias environments ([#1227](https://github.com/contentful/field-editors/issues/1227)) ([2d7d93a](https://github.com/contentful/field-editors/commit/2d7d93a2d3aa089f7ecdfec48c53c7839856ba0d))
+
 ## [5.1.5](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.1.4...@contentful/field-editor-reference@5.1.5) (2022-09-06)
 
 **Note:** Version bump only for package @contentful/field-editor-reference

package/dist/__fixtures__/FakeSdk.d.ts

@@ -1,5 +1,5 @@
+import { FieldExtensionSDK } from '@contentful/app-sdk';
 import { Emitter } from 'mitt';
-import { FieldExtensionSDK } from '../types';
 export declare type ReferenceEditorSdkProps = {
     initialValue?: any;
     validations?: any;

package/dist/__fixtures__/asset/index.d.ts

@@ -0,0 +1,6 @@
+import changed from './changed_asset.json';
+import created from './created_asset.json';
+import empty from './empty_asset.json';
+import invalid from './invalid_asset.json';
+import published from './published_asset.json';
+export { changed, empty, published, invalid, created };

package/dist/__fixtures__/content-type/index.d.ts

@@ -0,0 +1,2 @@
+import published from './published_content_type.json';
+export { published };

package/dist/__fixtures__/entry/index.d.ts

@@ -0,0 +1,5 @@
+import changed from './changed_entry.json';
+import empty from './empty_entry.json';
+import invalid from './invalid_entry.json';
+import published from './published_entry.json';
+export { changed, empty, published, invalid };

package/dist/__fixtures__/fixtures.d.ts

@@ -0,0 +1,6 @@
+import * as assets from './asset';
+import * as contentTypes from './content-type';
+import * as entries from './entry';
+import * as locales from './locale';
+import * as spaces from './space';
+export { assets, contentTypes, entries, locales, spaces };

package/dist/__fixtures__/locale/index.d.ts

@@ -0,0 +1,42 @@
+import englishDefault from './english_default_locale.json';
+import german from './german_locale.json';
+declare const list: {
+    sys: {
+        type: string;
+    };
+    total: number;
+    skip: number;
+    limit: number;
+    items: {
+        sys: {
+            id: string;
+            type: string;
+            createdAt: string;
+            updatedAt: string;
+            version: number;
+            space: {
+                sys: {
+                    type: string;
+                    linkType: string;
+                    id: string;
+                };
+            };
+            environment: {
+                sys: {
+                    id: string;
+                    type: string;
+                    linkType: string;
+                };
+            };
+        };
+        name: string;
+        code: string;
+        internal_code: string;
+        fallbackCode: null;
+        contentDeliveryApi: boolean;
+        contentManagementApi: boolean;
+        default: boolean;
+        optional: boolean;
+    }[];
+};
+export { englishDefault, german, list };

package/dist/__fixtures__/space/index.d.ts

@@ -0,0 +1,2 @@
+import indifferent from './indifferent_space.json';
+export { indifferent };

package/dist/field-editor-reference.cjs.development.js

@@ -1967,13 +1967,13 @@ function _fetchContentfulEntry() {
             _resourceId$split = resourceId.split('/'), spaceId = _resourceId$split[1], entryId = _resourceId$split[3];
             environmentId = 'master';
             _context3.next = 6;
-            return Promise.all([fetch(['space', spaceId], function (_ref9) {
-              var cmaClient = _ref9.cmaClient;
+            return Promise.all([fetch(['space', spaceId], function (_ref10) {
+              var cmaClient = _ref10.cmaClient;
               return cmaClient.space.get({
                 spaceId: spaceId
               });
-            }, options), fetch(['entry', spaceId, environmentId, entryId], function (_ref10) {
-              var cmaClient = _ref10.cmaClient;
+            }, options), fetch(['entry', spaceId, environmentId, entryId], function (_ref11) {
+              var cmaClient = _ref11.cmaClient;
               return cmaClient.entry.get({
                 spaceId: spaceId,
                 environmentId: environmentId,
@@ -1987,15 +1987,15 @@ function _fetchContentfulEntry() {
             entry = _yield$Promise$all[1];
             contentTypeId = entry.sys.contentType.sys.id;
             _context3.next = 12;
-            return Promise.all([fetch(['contentType', spaceId, environmentId, contentTypeId], function (_ref11) {
-              var cmaClient = _ref11.cmaClient;
+            return Promise.all([fetch(['contentType', spaceId, environmentId, contentTypeId], function (_ref12) {
+              var cmaClient = _ref12.cmaClient;
               return cmaClient.contentType.get({
                 contentTypeId: contentTypeId,
                 spaceId: spaceId,
                 environmentId: environmentId
               });
             }, options), fetch(['defaultLocale', spaceId, environmentId], /*#__PURE__*/function () {
-              var _ref13 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(_ref12) {
+              var _ref14 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(_ref13) {
                 var _locales$items$find;
 
                 var cmaClient, locales, defaultLocaleCode;
@@ -2003,7 +2003,7 @@ function _fetchContentfulEntry() {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        cmaClient = _ref12.cmaClient;
+                        cmaClient = _ref13.cmaClient;
                         _context2.next = 3;
                         return cmaClient.locale.getMany({
                           spaceId: spaceId,
@@ -2029,7 +2029,7 @@ function _fetchContentfulEntry() {
               }));
 
               return function (_x3) {
-                return _ref13.apply(this, arguments);
+                return _ref14.apply(this, arguments);
               };
             }(), options)]);
 
@@ -2059,6 +2059,9 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
 
   var currentSpaceId = props.sdk.ids.space;
   var currentEnvironmentId = (_props$sdk$ids$enviro = props.sdk.ids.environmentAlias) != null ? _props$sdk$ids$enviro : props.sdk.ids.environment;
+  var environmentIds = React.useMemo(function () {
+    return [props.sdk.ids.environmentAlias, props.sdk.ids.environment];
+  }, [props.sdk.ids.environmentAlias, props.sdk.ids.environment]);
   var queryClient = reactQuery.useQueryClient();
   var queryCache = queryClient.getQueryCache();
   var entityChangeUnsubscribers = React.useRef({});
@@ -2213,20 +2216,40 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
   }, [fetch]);
   var isSameSpaceEntityQueryKey = React.useCallback(function (queryKey) {
     var isEntityKey = isEntityQueryKey(queryKey);
-    var isSameSpaceEntityKey = isEntityKey && queryKey[2] === currentSpaceId && queryKey[3] === currentEnvironmentId;
+    var isSameSpaceEntityKey = isEntityKey && queryKey[2] === currentSpaceId && environmentIds.includes(queryKey[3]);
     return isSameSpaceEntityKey;
-  }, [currentSpaceId, currentEnvironmentId]); // @ts-expect-error ...
+  }, [currentSpaceId, environmentIds]); // @ts-expect-error ...
 
   // @ts-expect-error ...
   var onEntityChanged = props.sdk.space.onEntityChanged;
+  var onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
   React.useEffect(function () {
+    function findSameSpaceQueries() {
+      return queryCache.findAll({
+        type: 'active',
+        predicate: function predicate(query) {
+          return isSameSpaceEntityQueryKey(query.queryKey);
+        }
+      });
+    }
+
     if (typeof onEntityChanged !== 'function') {
-      return;
+      return onSlideInNavigation(function (_ref4) {
+        var oldSlideLevel = _ref4.oldSlideLevel,
+            newSlideLevel = _ref4.newSlideLevel;
+
+        if (oldSlideLevel > newSlideLevel) {
+          findSameSpaceQueries().forEach(function (query) {
+            // automatically refetches the query
+            void queryClient.invalidateQueries(query.queryKey);
+          });
+        }
+      });
     }
 
-    var subscribeQuery = function subscribeQuery(_ref4) {
-      var queryKey = _ref4.queryKey,
-          queryHash = _ref4.queryHash;
+    var subscribeQuery = function subscribeQuery(_ref5) {
+      var queryKey = _ref5.queryKey,
+          queryHash = _ref5.queryHash;
       var entityType = queryKey[0],
           entityId = queryKey[1];
       entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, function (data) {
@@ -2234,13 +2257,7 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
       });
     };
 
-    var queries = queryCache.findAll({
-      type: 'active',
-      predicate: function predicate(query) {
-        return isSameSpaceEntityQueryKey(query.queryKey);
-      }
-    });
-    queries.forEach(subscribeQuery);
+    findSameSpaceQueries().forEach(subscribeQuery);
     var unsubscribe = queryCache.subscribe(function (event) {
       if (!event) {
         return;
@@ -2273,30 +2290,35 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
       });
       entityChangeUnsubscribers.current = {};
     };
-  }, [onEntityChanged, queryCache, isSameSpaceEntityQueryKey, queryClient]);
+  }, [onEntityChanged, queryCache, isSameSpaceEntityQueryKey, queryClient, getEntity, onSlideInNavigation]);
   return {
+    ids: props.sdk.ids,
     cmaClient: cmaClient,
     fetch: fetch,
     getResource: getResource,
     getEntity: getEntity,
-    ids: props.sdk.ids,
     getEntityScheduledActions: getEntityScheduledActions
   };
-}, function (_ref5) {
-  var fetch = _ref5.fetch;
-  return fetch;
 }, function (_ref6) {
-  var getResource = _ref6.getResource,
-      getEntity = _ref6.getEntity,
-      getEntityScheduledActions = _ref6.getEntityScheduledActions;
+  var fetch = _ref6.fetch;
+  return fetch;
+}, function (_ref7) {
+  var getResource = _ref7.getResource,
+      getEntity = _ref7.getEntity,
+      getEntityScheduledActions = _ref7.getEntityScheduledActions;
   return {
     getResource: getResource,
     getEntity: getEntity,
     getEntityScheduledActions: getEntityScheduledActions
   };
-}, function (_ref7) {
-  var ids = _ref7.ids;
-  return ids;
+}, function (_ref8) {
+  var _ids$environmentAlias;
+
+  var ids = _ref8.ids;
+  return {
+    environment: (_ids$environmentAlias = ids.environmentAlias) != null ? _ids$environmentAlias : ids.environment,
+    space: ids.space
+  };
 }),
     InternalServiceProvider = _constate[0],
     useEntityLoader = _constate[2],
@@ -2349,9 +2371,9 @@ function useResource(resourceType, urn, options) {
   };
 }
 
-function EntityProvider(_ref8) {
-  var children = _ref8.children,
-      props = _objectWithoutPropertiesLoose(_ref8, _excluded2);
+function EntityProvider(_ref9) {
+  var children = _ref9.children,
+      props = _objectWithoutPropertiesLoose(_ref9, _excluded2);
 
   var reactQueryClient = React.useMemo(function () {
     var queryCache = new reactQuery.QueryCache();