cloudera · ramprasadagarwal · Feb 12, 2025 · Feb 18, 2025 · Feb 18, 2025 · Feb 18, 2025
diff --git a/apps/filebrowser/src/filebrowser/api.py b/apps/filebrowser/src/filebrowser/api.py
@@ -165,7 +165,7 @@ def get_all_filesystems(request):
     user_home_dir = fs_home_dir_mapping[fs](request.user)
     config = _get_config(fs, request)
 
-    filesystems.append({'file_system': fs, 'user_home_directory': user_home_dir, 'config': config})
+    filesystems.append({'name': fs, 'user_home_directory': user_home_dir, 'config': config})
 
   return JsonResponse(filesystems, safe=False)
 

diff --git a/apps/filebrowser/src/filebrowser/api_test.py b/apps/filebrowser/src/filebrowser/api_test.py
@@ -748,8 +748,8 @@ def test_get_all_filesystems_without_hdfs(self):
 
           assert response.status_code == 200
           assert response_data == [
-            {'file_system': 's3a', 'user_home_directory': 's3a://test-bucket/test-user-home-dir/', 'config': {}},
-            {'file_system': 'ofs', 'user_home_directory': 'ofs://', 'config': {}},
+            {'name': 's3a', 'user_home_directory': 's3a://test-bucket/test-user-home-dir/', 'config': {}},
+            {'name': 'ofs', 'user_home_directory': 'ofs://', 'config': {}},
           ]
 
   def test_get_all_filesystems_success(self):
@@ -776,7 +776,7 @@ def test_get_all_filesystems_success(self):
               assert response.status_code == 200
               assert response_data == [
                 {
-                  'file_system': 'hdfs',
+                  'name': 'hdfs',
                   'user_home_directory': '/user/test-user',
                   'config': {
                     'is_trash_enabled': False,
@@ -787,8 +787,8 @@ def test_get_all_filesystems_success(self):
                     'supergroup': 'test-supergroup',
                   },
                 },
-                {'file_system': 's3a', 'user_home_directory': 's3a://test-bucket/test-user-home-dir/', 'config': {}},
-                {'file_system': 'ofs', 'user_home_directory': 'ofs://', 'config': {}},
+                {'name': 's3a', 'user_home_directory': 's3a://test-bucket/test-user-home-dir/', 'config': {}},
+                {'name': 'ofs', 'user_home_directory': 'ofs://', 'config': {}},
               ]
 
 

diff --git a/desktop/core/src/desktop/api_public.py b/desktop/core/src/desktop/api_public.py
@@ -360,7 +360,7 @@ def storage_trash_bulk_restore(request):
   return filebrowser_api.bulk_op(django_request, filebrowser_api.trash_restore)
 
 
-@api_view(["DELETE"])
+@api_view(["POST"])
 def storage_trash_purge(request):
   django_request = get_django_request(request)
   return filebrowser_api.trash_purge(django_request)

diff --git a/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.test.tsx b/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.test.tsx
@@ -24,12 +24,12 @@ import useLoadData from '../../../utils/hooks/useLoadData/useLoadData';
 
 const mockData = jest.fn().mockReturnValue({
   logs: ['Log entry 1', 'Log entry 2'],
-  hue_hostname: 'test-hostname'
+  hueHostname: 'test-hostname'
 });
 
 const emptyMockData = jest.fn().mockReturnValue({
   logs: [],
-  hue_hostname: 'test-hostname'
+  hueHostname: 'test-hostname'
 });
 
 jest.mock('../../../utils/hooks/useLoadData/useLoadData');

diff --git a/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.tsx b/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsTab.tsx
@@ -25,18 +25,14 @@ import './ServerLogsTab.scss';
 
 interface ServerLogsData {
   logs: string[];
-  hue_hostname: string;
+  hueHostname: string;
 }
 
 const ServerLogs: React.FC = (): JSX.Element => {
   const [filter, setFilter] = useState<string>('');
   const [wrapLogs, setWrapLogs] = useState(true);
   const { t } = i18nReact.useTranslation();
-  const {
-    data: logsData,
-    loading,
-    error
-  } = useLoadData<ServerLogsData>(SERVER_LOGS_API_URL, {
+  const { data, loading, error } = useLoadData<ServerLogsData>(SERVER_LOGS_API_URL, {
     params: {
       reverse: true
     }
@@ -62,15 +58,15 @@ const ServerLogs: React.FC = (): JSX.Element => {
             <ServerLogsHeader
               onFilterChange={setFilter}
               onWrapLogsChange={setWrapLogs}
-              hostName={logsData?.hue_hostname ?? ''}
+              hostName={data?.hueHostname ?? ''}
             />
-            {logsData && (logsData.logs.length === 0 || logsData.logs[0] === '') && (
+            {data && (data.logs.length === 0 || data.logs[0] === '') && (
               <pre className="server__no-logs-found">No logs found!</pre>
             )}
 
-            {logsData && logsData.logs.length > 0 && logsData.logs[0] !== '' && (
+            {data && data.logs.length > 0 && data.logs[0] !== '' && (
               <div className="server__display-logs">
-                {logsData.logs.map((line, index) => (
+                {data.logs.map((line, index) => (
                   <div
                     className={`server__log-line ${wrapLogs ? 'server_wrap' : ''}`}
                     key={'logs_' + index}

diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.scss b/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.scss
@@ -29,12 +29,7 @@ $icon-margin: 5px;
   .hue-filechooser-modal__path-browser-panel {
     display: flex;
     align-items: center;
-    gap: vars.$fluidx-spacing-xs;
-  }
-
-  .hue-filechooser-modal__destPath {
-    flex: 0 0 auto;
-    font-weight: 600;
+    gap: 2px;
   }
 
   .hue-filechooser-modal__search {
@@ -65,6 +60,7 @@ $icon-margin: 5px;
   .hue-filechooser-modal__table-cell-icon {
     color: vars.$fluidx-blue-700;
     margin-right: 6px;
+    vertical-align: middle;
   }
 
   .hue-filechooser-modal__table-row {

diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.test.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.test.tsx
@@ -65,7 +65,6 @@ describe('FileChooserModal', () => {
     );
     await waitFor(() => {
       expect(screen.getByText('Select File')).toBeInTheDocument();
-      expect(screen.getByText('Destination Path:')).toBeInTheDocument();
       expect(screen.getByText('Cancel')).toBeInTheDocument();
       expect(screen.getByText('Submit')).toBeInTheDocument();
     });

diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/FileChooserModal/FileChooserModal.tsx
@@ -146,7 +146,6 @@ const FileChooserModal = ({
     >
       <div className="hue-filechooser-modal__body">
         <div className="hue-filechooser-modal__path-browser-panel">
-          <span className="hue-filechooser-modal__destPath">{t('Destination Path:')}</span>
           <PathBrowser
             filePath={destPath}
             onFilepathChange={setDestPath}

diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage.tsx
@@ -55,11 +55,11 @@ const StorageBrowserPage = (): JSX.Element => {
         <Tabs
           className="hue-storage-browser__tab"
           destroyInactiveTabPane
-          defaultActiveKey={urlFileSystem ?? data?.[0]?.file_system}
-          items={data?.map(fs => ({
-            label: fs.file_system.toUpperCase(),
-            key: fs.file_system,
-            children: <StorageBrowserTab fileSystem={fs} />
+          defaultActiveKey={urlFileSystem ?? data?.[0]?.name}
+          items={data?.map(fileSystem => ({
+            label: fileSystem.name.toUpperCase(),
+            key: fileSystem.name,
+            children: <StorageBrowserTab fileSystem={fileSystem} />
           }))}
         />
       </LoadingErrorWrapper>

diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.scss b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.scss
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @use 'variables' as vars;
+@use 'mixins';
 
 .antd.cuix {
   .hue-storage-browser-tab-content {
@@ -24,8 +25,43 @@
   }
 
   .hue-storage-browser__title-bar {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .hue-storage-browser__title {
     display: flex;
     gap: vars.$fluidx-spacing-xs;
+    max-width: 70%;
+  }
+
+  .hue-path-browser__refresh-btn {
+    padding: vars.$fluidx-spacing-xxs;;
+
+    &:hover {
+      background-color: transparent;
+    }
+
+    &:focus {
+      background-color: transparent;
+    }
+  }
+
+  .hue-path-browser__home-btn {
+    padding: vars.$fluidx-spacing-xxs;
+
+    &:hover {
+      background-color: transparent;
+    }
+
+    &:focus {
+      background-color: transparent;
+    }
+  }
+
+  .hue-storage-browser__home-bar-right {
+    display: flex;
+    gap: vars.$fluidx-spacing-s;
   }
 
   .hue-storage-browser__icon {
@@ -38,16 +74,16 @@
     font-size: vars.$fluidx-heading-h3-size;
     line-height: vars.$fluidx-heading-h3-line-height;
     font-weight: vars.$fluidx-heading-h3-weight;
+    width: 100%;
+    @include mixins.nowrap-ellipsis;
+
+    display: inline;
   }
 
   .hue-storage-browser__path-browser-panel {
     display: flex;
     align-items: center;
-    gap: vars.$fluidx-spacing-xs;
-  }
-
-  .hue-storage-browser__filePath {
-    flex: 0 0 auto;
-    font-weight: 600;
+    gap: 2px;
+    margin-left: vars.$fluidx-spacing-xxs;
   }
 }
diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx
@@ -21,15 +21,19 @@ import BucketIcon from '@cloudera/cuix-core/icons/react/BucketIcon';
 
 import PathBrowser from '../../../reactComponents/PathBrowser/PathBrowser';
 import StorageDirectoryPage from '../StorageDirectoryPage/StorageDirectoryPage';
-import { FILE_STATS_API_URL } from '../api';
-import { BrowserViewType, FileStats, FileSystem } from '../types';
+import { FILE_STATS_API_URL, TRASH_PATH } from '../api';
+import { BrowserViewType, FileStats, FileSystem, TrashPath } from '../types';
 import useLoadData from '../../../utils/hooks/useLoadData/useLoadData';
+import { BorderlessButton } from 'cuix/dist/components/Button';
 
 import './StorageBrowserTab.scss';
 import StorageFilePage from '../StorageFilePage/StorageFilePage';
 import changeURL from '../../../utils/url/changeURL';
 import LoadingErrorWrapper from '../../../reactComponents/LoadingErrorWrapper/LoadingErrorWrapper';
 import { getFileSystemAndPath } from '../../../reactComponents/PathBrowser/PathBrowser.util';
+import RefreshIcon from '@cloudera/cuix-core/icons/react/RefreshIcon';
+import HomeIcon from '@cloudera/cuix-core/icons/react/HomeIcon';
+import DeleteIcon from '@cloudera/cuix-core/icons/react/DeleteIcon';
 
 interface StorageBrowserTabProps {
   fileSystem: FileSystem;
@@ -46,13 +50,19 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
   const urlFilePath = decodeURIComponent(urlSearchParams.get('path') ?? '');
   const { fileSystem: urlFileSystem } = getFileSystemAndPath(urlFilePath);
   const initialFilePath =
-    urlFileSystem === fileSystem.file_system ? urlFilePath : fileSystem.user_home_directory;
+    urlFileSystem === fileSystem.name ? urlFilePath : fileSystem.userHomeDirectory;
 
   const [filePath, setFilePath] = useState<string>(initialFilePath);
-  const fileName = filePath.split('/').pop() ?? '';
+  const fileName =
+    filePath.split('/').pop() !== '' ? filePath.split('/').pop() : filePath.split('://')[0];
 
   const { t } = i18nReact.useTranslation();
 
+  const { data: trash, reloadData: reloadTrashData } = useLoadData<TrashPath>(TRASH_PATH, {
+    params: { path: fileSystem.userHomeDirectory },
+    skip: !fileSystem.config?.isTrashEnabled || !fileSystem.userHomeDirectory
+  });
+
   const {
     data: fileStats,
     loading,
@@ -80,12 +90,12 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
       enabled: error?.response?.status === 404,
       message: t('Error: Path "{{path}}" not found.', { path: filePath }),
       action: t('Go to home directory'),
-      onClick: () => setFilePath(fileSystem.user_home_directory)
+      onClick: () => setFilePath(fileSystem.userHomeDirectory)
     },
     {
       enabled: !!error && error?.response?.status !== 404,
       message: t('An error occurred while fetching filesystem "{{fileSystem}}".', {
-        fileSystem: fileSystem.file_system.toUpperCase()
+        fileSystem: fileSystem.name.toUpperCase()
       }),
       action: t('Retry'),
       onClick: reloadData
@@ -96,16 +106,51 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
     <LoadingErrorWrapper loading={loading} errors={errorConfig}>
       <div className="hue-storage-browser-tab-content" data-testid={testId}>
         <div className="hue-storage-browser__title-bar" data-testid={`${testId}-title-bar`}>
-          <BucketIcon className="hue-storage-browser__icon" data-testid={`${testId}-icon`} />
-          <h3 className="hue-storage-browser__folder-name" data-testid={`${testId}-folder-namer`}>
-            {fileName}
-          </h3>
+          <div className="hue-storage-browser__title">
+            <BucketIcon className="hue-storage-browser__icon" data-testid={`${testId}-icon`} />
+            <h3 className="hue-storage-browser__folder-name" data-testid={`${testId}-folder-namer`}>
+              {fileName}
+            </h3>
+          </div>
+          <div className="hue-storage-browser__home-bar-right">
+            <BorderlessButton
+              onClick={() => {
+                setFilePath(fileSystem.userHomeDirectory);
+              }}
+              className="hue-path-browser__home-btn"
+              data-event={''}
+              title={t('Home')}
+              icon={<HomeIcon />}
+            >
+              {t('Home')}
+            </BorderlessButton>
+            {fileSystem.config?.isTrashEnabled && (
+              <BorderlessButton
+                onClick={() => setFilePath(trash?.trashPath ?? '')}
+                className="hue-path-browser__home-btn"
+                data-event={''}
+                title={t('Trash')}
+                icon={<DeleteIcon />}
+                disabled={!trash?.trashPath}
+              >
+                {t('Trash')}
+              </BorderlessButton>
+            )}
+            <BorderlessButton
+              onClick={() => reloadData()}
+              className="hue-path-browser__refresh-btn"
+              data-event={''}
+              title={t('Refresh')}
+              icon={<RefreshIcon />}
+            >
+              {t('Refresh')}
+            </BorderlessButton>
+          </div>
         </div>
         <div
           className="hue-storage-browser__path-browser-panel"
           data-testid={`${testId}-path-browser-panel`}
         >
-          <span className="hue-storage-browser__filePath">{t('File Path:')}</span>
           <PathBrowser
             filePath={filePath}
             onFilepathChange={setFilePath}
@@ -117,7 +162,8 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
           <StorageDirectoryPage
             fileStats={fileStats}
             onFilePathChange={setFilePath}
-            config={fileSystem.config}
+            fileSystem={fileSystem}
+            reloadTrashData={reloadTrashData}
           />
         )}
         {fileStats?.type === BrowserViewType.file && !loading && (

diff --git a/...ndUploadAction/CreateAndUploadAction.scss → ...reateAndUpload/CreateAndUploadAction.scss b/...ndUploadAction/CreateAndUploadAction.scss → ...reateAndUpload/CreateAndUploadAction.scss
diff --git a/...loadAction/CreateAndUploadAction.test.tsx → ...eAndUpload/CreateAndUploadAction.test.tsx b/...loadAction/CreateAndUploadAction.test.tsx → ...eAndUpload/CreateAndUploadAction.test.tsx