box-ui-elements 23.5.0-beta.1 → 23.5.0-beta.2

package/es/elements/content-explorer/ContentExplorer.js

@@ -70,6 +70,10 @@ class ContentExplorer extends Component {
       const {
         nextMarker
       } = metadataQueryCollection;
+      const {
+        metadataQuery,
+        features
+      } = this.props;
       const {
         currentCollection,
         currentPageNumber,
@@ -79,13 +83,29 @@ class ContentExplorer extends Component {
       if (nextMarker) {
         cloneMarkers[currentPageNumber + 1] = nextMarker;
       }
-      this.setState({
+      const nextState = {
         currentCollection: _objectSpread(_objectSpread(_objectSpread({}, currentCollection), metadataQueryCollection), {}, {
           percentLoaded: 100
         }),
         markers: cloneMarkers,
         metadataTemplate
-      });
+      };
+
+      // if v2, fetch folder name and add to state
+      if (metadataQuery?.ancestor_folder_id && isFeatureEnabled(features, 'contentExplorer.metadataViewV2')) {
+        this.api.getFolderAPI().getFolderFields(metadataQuery.ancestor_folder_id, ({
+          name
+        }) => {
+          this.setState(_objectSpread(_objectSpread({}, nextState), {}, {
+            rootName: name || ''
+          }));
+        }, this.errorCallback, {
+          fields: [FIELD_NAME]
+        });
+      } else {
+        // No folder name to fetch, update state immediately with just metadata
+        this.setState(nextState);
+      }
     });
     /**
      * Network error callback
@@ -1143,26 +1163,6 @@ class ContentExplorer extends Component {
         selectedItemIds: new Set()
       });
     });
-    /**
-     * Fetches the folder name and stores it in state rootName if successful
-     *
-     * @private
-     * @return {void}
-     */
-    _defineProperty(this, "fetchFolderName", folderId => {
-      if (!folderId) {
-        return;
-      }
-      this.api.getFolderAPI(false).getFolderFields(folderId, ({
-        name
-      }) => {
-        this.setState({
-          rootName: name
-        });
-      }, this.errorCallback, {
-        fields: [FIELD_NAME]
-      });
-    });
     const {
       apiHost,
       initialPage,
@@ -1248,8 +1248,7 @@ class ContentExplorer extends Component {
   componentDidMount() {
     const {
       currentFolderId,
-      defaultView,
-      metadataQuery
+      defaultView
     } = this.props;
     this.rootElement = document.getElementById(this.id);
     this.appElement = this.rootElement.firstElementChild;
@@ -1259,7 +1258,6 @@ class ContentExplorer extends Component {
         break;
       case DEFAULT_VIEW_METADATA:
         this.showMetadataQueryResults();
-        this.fetchFolderName(metadataQuery?.ancestor_folder_id);
         break;
       default:
         this.fetchFolder(currentFolderId);