Merge remote-tracking branch 'upstream/feature/new-dashboard--1' into…

… ahmed/DAPI-707/feat--add-account-swticher-on-api-explorer

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) => {

src/features/dashboard/components/api-token-table/api-table.module.scss

@@ -27,7 +27,6 @@
 
   @include tablet-lg {
     border: none;
-    gap: 3rem;
   }
 
   table {

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' }),

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;
+        }
       }
     }
   }

src/features/dashboard/components/apps-table/apps-table.tsx

@@ -180,7 +180,8 @@ const AppsTableSortColumn: React.FC<IAppsTableSortColumnProps> = ({
 
   return (
     <div className='sortColumn' onClick={() => onPressSort(id)} data-testid={id}>
-      {columnName} {getColumnIcon()}
+      <Heading.H5>{columnName}</Heading.H5>
+      {getColumnIcon()}
     </div>
   );
 };

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;

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]);