Skip to content

fix(content-explorer): Fix flaky SubheaderV2 folder title #4229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Aug 15, 2025
Merged

fix(content-explorer): Fix flaky SubheaderV2 folder title #4229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 23 additions & 25 deletions src/elements/content-explorer/ContentExplorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
* @return {void}
*/
componentDidMount() {
const { currentFolderId, defaultView, metadataQuery }: ContentExplorerProps = this.props;
const { currentFolderId, defaultView }: ContentExplorerProps = this.props;
this.rootElement = document.getElementById(this.id) as HTMLElement;
this.appElement = this.rootElement.firstElementChild as HTMLElement;

Expand All @@ -348,7 +348,6 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
break;
case DEFAULT_VIEW_METADATA:
this.showMetadataQueryResults();
this.fetchFolderName(metadataQuery?.ancestor_folder_id);
break;
default:
this.fetchFolder(currentFolderId);
Expand Down Expand Up @@ -390,20 +389,40 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
metadataTemplate: MetadataTemplate,
): void => {
const { nextMarker } = metadataQueryCollection;
const { metadataQuery, features } = this.props;
const { currentCollection, currentPageNumber, markers }: State = this.state;
const cloneMarkers = [...markers];
if (nextMarker) {
cloneMarkers[currentPageNumber + 1] = nextMarker;
}
this.setState({

const nextState = {
currentCollection: {
...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({
...nextState,
rootName: name || '',
});
},
this.errorCallback,
{ fields: [FIELD_NAME] },
);
} else {
// No folder name to fetch, update state immediately with just metadata
this.setState(nextState);
}
Comment on lines +409 to +425
Copy link
Contributor

@tjuanitas tjuanitas Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to get to this point in the code, there already needs to exist a ancestor_folder_id since it's a required field on the metadata request. i.e. this callback wouldn't have been called if the ancestor id was missing so you don't need to check for it

let's reverse the if clause so we can remove the extra indents:

if (title || !isFeatureEnabled(features, 'contentExplorer.metadataViewV2')) {
    this.setState(nextState);
    return;
}

this.api.getFolderAPI().getFolderFields(
    metadataQuery.ancestor_folder_id,
    ({ name }) => {
        this.setState({ ..nextState, rootName: name });
     },
     this.errorCallback,
     { fields: [FIELD_NAME] },
);

you shouldn't need to set an empty string for name || '' since name is a required property a folder

Copy link
Contributor Author

@jfox-box jfox-box Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry branch merged before I had a chance to respond to this, will address this in a future PR

};

/**
Expand Down Expand Up @@ -1628,27 +1647,6 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
this.setState({ selectedItemIds: new Set() });
};

/**
* Fetches the folder name and stores it in state rootName if successful
*
* @private
* @return {void}
*/
fetchFolderName = (folderId?: string) => {
if (!folderId) {
return;
}

this.api.getFolderAPI(false).getFolderFields(
folderId,
({ name }) => {
this.setState({ rootName: name });
},
this.errorCallback,
{ fields: [FIELD_NAME] },
);
};

/**
* Renders the file picker
*
Expand Down
4 changes: 4 additions & 0 deletions src/elements/content-explorer/stories/MetadataView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import ContentExplorer from '../ContentExplorer';
import { DEFAULT_HOSTNAME_API } from '../../../constants';
import { mockMetadata, mockSchema } from '../../common/__mocks__/mockMetadata';
import { mockRootFolder } from '../../common/__mocks__/mockRootFolder';

const EID = '0';
const templateName = 'templateName';
Expand Down Expand Up @@ -120,6 +121,9 @@ const meta: Meta<typeof ContentExplorer> = {
http.get(`${DEFAULT_HOSTNAME_API}/2.0/metadata_templates/enterprise/templateName/schema`, () => {
return HttpResponse.json(mockSchema);
}),
http.get(`${DEFAULT_HOSTNAME_API}/2.0/folders/:id`, () => {
return HttpResponse.json(mockRootFolder);
}),
],
},
},
Expand Down
4 changes: 4 additions & 0 deletions src/elements/content-explorer/stories/tests/MetadataView-visual.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import noop from 'lodash/noop';
import ContentExplorer from '../../ContentExplorer';
import { DEFAULT_HOSTNAME_API } from '../../../../constants';
import { mockMetadata, mockSchema } from '../../../common/__mocks__/mockMetadata';
import { mockRootFolder } from '../../../common/__mocks__/mockRootFolder';

// The intent behind relying on mockMetadata is to allow a developer to paste in their own metadata template schema for use with live API calls.
const { scope: templateScope, templateKey } = mockSchema;
Expand Down Expand Up @@ -180,6 +181,9 @@ const meta: Meta<typeof ContentExplorer> = {
http.get(`${DEFAULT_HOSTNAME_API}/2.0/metadata_templates/enterprise/templateName/schema`, () => {
return HttpResponse.json(mockSchema);
}),
http.get(`${DEFAULT_HOSTNAME_API}/2.0/folders/:id`, () => {
return HttpResponse.json(mockRootFolder);
}),
],
},
},
Expand Down