diff --git a/src/components/AccountSwitcher/index.tsx b/src/components/AccountSwitcher/index.tsx index 1d1e1f963..584da5b89 100644 --- a/src/components/AccountSwitcher/index.tsx +++ b/src/components/AccountSwitcher/index.tsx @@ -42,7 +42,7 @@ const AccountSwitcher = ({ onChange }: AccountSwitcherProps) => { label={translate({ message: 'Account type' })} options={options} leftIcon={} - placeholder={currentLoginAccount.name} + value={currentLoginAccount.name} variant='outline' className={`${isToggleDropdown ? styles.active : styles.inactive}`} onSelectOption={() => { diff --git a/src/contexts/app-manager/app-manager.provider.tsx b/src/contexts/app-manager/app-manager.provider.tsx index 2a5693708..f77bf25ba 100644 --- a/src/contexts/app-manager/app-manager.provider.tsx +++ b/src/contexts/app-manager/app-manager.provider.tsx @@ -25,6 +25,9 @@ const AppManagerContextProvider = ({ children }: TAppManagerContextProps) => { const updateCurrentTab = useCallback((updatedTab: TDashboardTab) => { setCurrentTab(updatedTab); + + const bodySelector = document.querySelector('body'); + if(bodySelector) { bodySelector.scrollTop = 0; } }, []); const handleCurrentUpdatingItem = useCallback((item: ApplicationObject) => { diff --git a/src/features/dashboard/components/api-token-table/api-table.module.scss b/src/features/dashboard/components/api-token-table/api-table.module.scss index 0aafb8fd2..1406c4d0c 100644 --- a/src/features/dashboard/components/api-token-table/api-table.module.scss +++ b/src/features/dashboard/components/api-token-table/api-table.module.scss @@ -27,7 +27,6 @@ @include tablet-lg { border: none; - gap: 3rem; } table { diff --git a/src/features/dashboard/components/api-token-table/api-token-table.tsx b/src/features/dashboard/components/api-token-table/api-token-table.tsx index bddff0243..a9b68a67f 100644 --- a/src/features/dashboard/components/api-token-table/api-token-table.tsx +++ b/src/features/dashboard/components/api-token-table/api-token-table.tsx @@ -25,13 +25,13 @@ const tableColumns: TTokenColumn[] = [ { Header: translate({ message: 'Name' }), accessor: 'display_name', - width: '25%', + width: '20%', minWidth: 200, }, { Header: translate({ message: 'Account Type' }), Cell: AccountTypeCell, - width: '15%', + width: '20%', }, { Header: translate({ message: 'Token' }), @@ -43,14 +43,14 @@ const tableColumns: TTokenColumn[] = [ Header: translate({ message: 'Token scopes' }), accessor: 'scopes', Cell: ScopesCell, - width: '20%', + width: '25%', maxWidth: 300, }, { Header: translate({ message: 'Last used' }), accessor: 'last_used', Cell: ApiLastUsedCell, - width: '15%', + width: '20%', }, { Header: translate({ message: 'Actions' }), diff --git a/src/features/dashboard/components/apps-table/apps-table.scss b/src/features/dashboard/components/apps-table/apps-table.scss index c48f5951a..346fd1140 100644 --- a/src/features/dashboard/components/apps-table/apps-table.scss +++ b/src/features/dashboard/components/apps-table/apps-table.scss @@ -66,6 +66,16 @@ justify-content: space-between; align-items: center; cursor: pointer; + margin-right: 1rem; + + h5 { + width: 100%; + } + + svg { + width: 10px; + height: 24px; + } } } } diff --git a/src/features/dashboard/components/apps-table/apps-table.tsx b/src/features/dashboard/components/apps-table/apps-table.tsx index f16f41705..82351bda0 100644 --- a/src/features/dashboard/components/apps-table/apps-table.tsx +++ b/src/features/dashboard/components/apps-table/apps-table.tsx @@ -180,7 +180,8 @@ const AppsTableSortColumn: React.FC = ({ return (
onPressSort(id)} data-testid={id}> - {columnName} {getColumnIcon()} + {columnName} + {getColumnIcon()}
); }; diff --git a/src/features/dashboard/components/common-table/cell-copy-text.module.scss b/src/features/dashboard/components/common-table/cell-copy-text.module.scss index a47a37394..993e4a5f6 100644 --- a/src/features/dashboard/components/common-table/cell-copy-text.module.scss +++ b/src/features/dashboard/components/common-table/cell-copy-text.module.scss @@ -5,7 +5,6 @@ cursor: pointer; p { - width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/src/features/dashboard/update-app/index.tsx b/src/features/dashboard/update-app/index.tsx index 41e7c0551..54c57546a 100644 --- a/src/features/dashboard/update-app/index.tsx +++ b/src/features/dashboard/update-app/index.tsx @@ -8,8 +8,9 @@ import useWS from '@site/src/hooks/useWs'; import RegisterAppDialogError from '../components/dialogs/register-app-dialog-error'; export default function UpdateApp() { - const { current_updating_item, updateCurrentTab } = useAppManager(); + const { current_updating_item, updateCurrentTab, getApps } = useAppManager(); const { send: updateApp, is_loading, error, data, clear } = useWS('app_update'); + const initialValues = { ...current_updating_item, @@ -24,6 +25,7 @@ export default function UpdateApp() { useEffect(() => { if (data?.app_id && !error) { + getApps(); updateCurrentTab(TDashboardTab.MANAGE_APPS); } }, [data, error, updateCurrentTab]);