chore: Add missed files

Author: jfox16

i18n/en-US.properties

@@ -100,6 +100,8 @@ be.collaboratedFolder = Collaborated Folder
 be.collapse = Collapse
 # Label for complete state.
 be.complete = Complete
+# Text shown to indicate the number of files selected
+be.contentExplorer.numFilesSelected =  {numSelected, plural, =0 {0 files selected} one {1 file selected} other {# files selected} } 
 # Text shown to users when opening the content insights flyout and there is an error
 be.contentInsights.contentAnalyticsErrorText = There was a problem loading content insights. Please try again.
 # Message shown when the user does not have access to view content insights anymore
@@ -1066,8 +1068,6 @@ boxui.contentExplorer.move = Move
 boxui.contentExplorer.name = Name
 # Text shown on button used to create a new folder
 boxui.contentExplorer.newFolder = New Folder
-# Text shown to indicate the number of files selected
-boxui.contentExplorer.numFilesSelected =  {numSelected, plural, =0 {0 files selected} one {1 file selected} other {# files selected} } 
 # Text shown to indicate the number of folders selected
 boxui.contentExplorer.numFoldersSelected =  {numSelected, plural, =0 {0 folders selected} one {1 folder selected} other {# folders selected} } 
 # Text shown to indicate the number of items selected with Include Subfolders feature

package.json

@@ -124,33 +124,19 @@
         "@babel/preset-typescript": "^7.24.7",
         "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.7",
-<<<<<<< HEAD
         "@box/blueprint-web": "12.43.0",
         "@box/blueprint-web-assets": "4.61.5",
         "@box/box-ai-agent-selector": "^0.48.5",
-=======
-        "@box/blueprint-web": "^12.41.0",
-        "@box/blueprint-web-assets": "^4.60.9",
-        "@box/box-ai-agent-selector": "^0.41.10",
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
         "@box/box-ai-content-answers": "^0.124.1",
         "@box/box-item-type-selector": "^0.61.12",
         "@box/cldr-data": "^34.2.0",
         "@box/combobox-with-api": "^0.34.9",
         "@box/frontend": "^11.0.1",
-<<<<<<< HEAD
         "@box/item-icon": "^0.17.0",
         "@box/languages": "^1.0.0",
         "@box/metadata-editor": "^0.122.12",
         "@box/metadata-filter": "^1.16.12",
         "@box/metadata-view": "^0.29.4",
-=======
-        "@box/item-icon": "^0.16.3",
-        "@box/languages": "^1.0.0",
-        "@box/metadata-editor": "^0.122.0",
-        "@box/metadata-filter": "^1.16.3",
-        "@box/metadata-view": "^0.28.0",
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
         "@box/react-virtualized": "^9.22.3-rc-box.10",
         "@box/types": "^0.2.1",
         "@cfaester/enzyme-adapter-react-18": "^0.8.0",
@@ -307,31 +293,17 @@
         "webpack-dev-server": "^5.2.1"
     },
     "peerDependencies": {
-<<<<<<< HEAD
         "@box/blueprint-web": "12.43.0",
         "@box/blueprint-web-assets": "4.61.5",
         "@box/box-ai-agent-selector": "^0.48.5",
-=======
-        "@box/blueprint-web": "^12.41.0",
-        "@box/blueprint-web-assets": "^4.60.9",
-        "@box/box-ai-agent-selector": "^0.41.10",
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
         "@box/box-ai-content-answers": "^0.124.1",
         "@box/box-item-type-selector": "^0.61.12",
         "@box/cldr-data": ">=34.2.0",
         "@box/combobox-with-api": "^0.34.9",
-<<<<<<< HEAD
         "@box/item-icon": "^0.17.0",
         "@box/metadata-editor": "^0.122.12",
         "@box/metadata-filter": "^1.16.12",
         "@box/metadata-view": "^0.29.4",
-=======
-        "@box/item-icon": "^0.16.3",
-        "@box/languages": "^1.0.0",
-        "@box/metadata-editor": "^0.122.0",
-        "@box/metadata-filter": "^1.16.3",
-        "@box/metadata-view": "^0.28.0",
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
         "@box/react-virtualized": "^9.22.3-rc-box.10",
         "@box/types": "^0.2.1",
         "@hapi/address": "^2.1.4",

scripts/jest/jest.config.js

@@ -26,10 +26,6 @@ module.exports = {
     testMatch: ['**/__tests__/**/*.test.+(js|jsx|ts|tsx)'],
     testPathIgnorePatterns: ['stories.test.js$', 'stories.test.tsx$', 'stories.test.d.ts'],
     transformIgnorePatterns: [
-<<<<<<< HEAD
         'node_modules/(?!(@box/react-virtualized/dist/es|@box/cldr-data|@box/blueprint-web|@box/blueprint-web-assets|@box/metadata-editor|@box/box-ai-content-answers|@box/box-ai-agent-selector|@box/item-icon|@box/combobox-with-api|@box/tree|@box/metadata-filter|@box/metadata-view|@box/types|@box/box-item-type-selector)/)',
-=======
-        'node_modules/(?!(@box/react-virtualized/dist/es|@box/cldr-data|@box/blueprint-web|@box/blueprint-web-assets|@box/metadata-editor|@box/box-ai-content-answers|@box/box-ai-agent-selector|@box/item-icon|@box/combobox-with-api|@box/tree|@box/metadata-filter|@box/metadata-view|@box/types)/)',
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
     ],
 };

src/common/types/core.js

@@ -34,7 +34,7 @@ import {
     PERMISSION_CAN_DOWNLOAD,
     PERMISSION_CAN_PREVIEW,
 } from '../../constants';
-import type { MetadataType, MetadataTemplate } from './metadata';
+import type { MetadataType } from './metadata';
 
 type Token = null | typeof undefined | string | Function;
 type TokenReadWrite = { read: string, write?: string };
@@ -394,7 +394,6 @@ type Collection = {
     breadcrumbs?: Array<Crumb>,
     id?: string,
     items?: Array<BoxItem>,
-    metadataTemplate?: MetadataTemplate,
     name?: string,
     nextMarker?: ?string,
     offset?: number,

src/elements/common/messages.js

@@ -1090,7 +1090,7 @@ const messages = defineMessages({
         defaultMessage: 'Personal Folder',
     },
     numFilesSelected: {
-        id: 'boxui.contentExplorer.numFilesSelected',
+        id: 'be.contentExplorer.numFilesSelected',
         description: 'Text shown to indicate the number of files selected',
         defaultMessage: `
             {numSelected, plural,

src/elements/common/sub-header/SubHeader.tsx

@@ -25,7 +25,6 @@ export interface SubHeaderProps {
     gridMinColumns?: number;
     isSmall: boolean;
     maxGridColumnCountForWidth?: number;
-    metadataAncestorFolderName?: string | null;
     metadataViewTitle?: string;
     onClearSelectedKeys: () => void;
     onCreate: () => void;
@@ -51,7 +50,6 @@ const SubHeader = ({
     gridMaxColumns = 0,
     gridMinColumns = 0,
     maxGridColumnCountForWidth = 0,
-    metadataAncestorFolderName,
     metadataViewTitle,
     onGridViewSliderChange = noop,
     isSmall,
@@ -96,7 +94,6 @@ const SubHeader = ({
                     <SubheaderLeftMetadataViewV2
                         api={api}
                         currentCollection={currentCollection}
-                        metadataAncestorFolderName={metadataAncestorFolderName}
                         metadataViewTitle={metadataViewTitle}
                         onClearSelectedKeys={onClearSelectedKeys}
                         selectedKeys={selectedKeys}

src/elements/common/sub-header/SubHeaderLeftMetadataViewV2.tsx

@@ -11,15 +11,13 @@ import './SubHeaderLeftMetadataViewV2.scss';
 interface SubHeaderLeftMetadataViewV2Props {
     api?: API;
     currentCollection: Collection;
-    metadataAncestorFolderName?: string | null;
     metadataViewTitle?: string;
     onClearSelectedKeys?: () => void;
     selectedKeys: Selection;
 }
 
 const SubHeaderLeftMetadataViewV2 = (props: SubHeaderLeftMetadataViewV2Props) => {
-    const { currentCollection, metadataAncestorFolderName, metadataViewTitle, onClearSelectedKeys, selectedKeys } =
-        props;
+    const { currentCollection, metadataViewTitle, onClearSelectedKeys, selectedKeys } = props;
     const { formatMessage } = useIntl();
 
     // Generate selected item text based on selected keys
@@ -59,10 +57,10 @@ const SubHeaderLeftMetadataViewV2 = (props: SubHeaderLeftMetadataViewV2Props) =>
         );
     }
 
-    // Case 3: No selected items - show title if provided, otherwise show ancestor folder name
+    // Case 3: No selected items - show title
     return (
         <Text as="h1" variant="titleXLarge">
-            {metadataViewTitle ?? metadataAncestorFolderName}
+            {metadataViewTitle}
         </Text>
     );
 };

src/elements/common/sub-header/__tests__/SubHeaderLeftMetadataViewV2.test.tsx

@@ -9,7 +9,6 @@ import SubHeaderLeftMetadataViewV2 from '../SubHeaderLeftMetadataViewV2';
 interface SubHeaderLeftMetadataViewV2Props {
     api?: API;
     currentCollection: Collection;
-    metadataAncestorFolderName?: string | null;
     metadataQuery?: MetadataQuery;
     metadataViewTitle?: string;
     onClearSelectedKeys?: () => void;
@@ -49,32 +48,10 @@ describe('elements/common/sub-header/SubHeaderLeftMetadataViewV2', () => {
         test('should render metadata view title when provided', () => {
             renderComponent({
                 metadataViewTitle: 'Custom Metadata View',
-                metadataAncestorFolderName: 'Test Folder',
                 selectedKeys: new Set(),
             });
 
-            // Custom title should override ancestor folder name
             expect(screen.getByText('Custom Metadata View')).toBeInTheDocument();
-            expect(screen.queryByText('Test Folder')).not.toBeInTheDocument();
-        });
-
-        test('should render ancestor folder name when no metadata view title is provided', () => {
-            renderComponent({
-                metadataAncestorFolderName: 'Test Folder',
-                selectedKeys: new Set(),
-            });
-
-            expect(screen.getByText('Test Folder')).toBeInTheDocument();
-        });
-
-        test('should handle null ancestor folder name gracefully', () => {
-            renderComponent({
-                metadataAncestorFolderName: null,
-                selectedKeys: new Set(),
-            });
-
-            // Should not crash and should not render any folder name
-            expect(screen.queryByText('Test Folder')).not.toBeInTheDocument();
         });
     });
 

src/elements/content-explorer/Content.tsx

@@ -36,12 +36,8 @@ export interface ContentProps extends Required<ItemEventHandlers>, Required<Item
     isSmall: boolean;
     isTouch: boolean;
     itemActions?: ItemAction[];
-<<<<<<< HEAD
     metadataTemplate?: MetadataTemplate;
     metadataViewProps?: Omit<MetadataViewContainerProps, 'currentCollection'>;
-=======
-    metadataProps?: Omit<MetadataViewContainerProps, 'currentCollection'>;
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
     onMetadataUpdate: (
         item: BoxItem,
         field: string,
@@ -59,12 +55,8 @@ const Content = ({
     features,
     fieldsToShow = [],
     gridColumnCount,
-<<<<<<< HEAD
     metadataTemplate,
     metadataViewProps,
-=======
-    metadataProps,
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
     onMetadataUpdate,
     onSortChange,
     view,
@@ -96,13 +88,8 @@ const Content = ({
                     currentCollection={currentCollection}
                     isLoading={percentLoaded !== 100}
                     hasError={view === VIEW_ERROR}
-<<<<<<< HEAD
                     metadataTemplate={metadataTemplate}
                     {...metadataViewProps}
-=======
-                    onSortChange={onSortChange}
-                    {...metadataProps}
->>>>>>> b49985c8b (feat(metadata-view): Add MetadataView V2)
                 />
             )}
             {!isViewEmpty && isListView && (

src/elements/content-explorer/ContentExplorer.tsx

@@ -1734,8 +1734,6 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
         const hasNextMarker: boolean = !!markers[currentPageNumber + 1];
         const hasPreviousMarker: boolean = currentPageNumber === 1 || !!markers[currentPageNumber - 1];
 
-        console.log({ currentCollection });
-
         const combinedMetadataViewProps = {
             ...metadataViewProps,
             tableProps: {
@@ -1772,6 +1770,7 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
                                 gridMaxColumns={GRID_VIEW_MAX_COLUMNS}
                                 gridMinColumns={GRID_VIEW_MIN_COLUMNS}
                                 maxGridColumnCountForWidth={maxGridColumnCount}
+                                metadataViewTitle={metadataViewTitle || metadataAncestorFolderName}
                                 onUpload={this.upload}
                                 onCreate={this.createFolder}
                                 onGridViewSliderChange={this.onGridViewSliderChange}
@@ -1781,8 +1780,6 @@ class ContentExplorer extends Component<ContentExplorerProps, State> {
                                 portalElement={this.rootElement}
                                 selectedKeys={this.state.selectedKeys}
                                 onClearSelectedKeys={this.handleClearSelectedKeys}
-                                metadataAncestorFolderName={metadataAncestorFolderName}
-                                metadataViewTitle={metadataViewTitle}
                             />
 
                             <Content