remove new from filenames and add tooltip to branch name

Author: selfcontained

components/dashboard/src/admin/WorkspaceDetail.tsx

@@ -10,7 +10,7 @@ import dayjs from "dayjs";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import { getGitpodService } from "../service/service";
-import { getProjectPath } from "../workspaces/WorkspaceEntryNew";
+import { getProjectPath } from "../workspaces/WorkspaceEntry";
 import { WorkspaceStatusIndicator } from "../workspaces/WorkspaceStatusIndicator";
 import { getAdminLinks } from "./gcp-info";
 import Property from "./Property";

components/dashboard/src/admin/WorkspacesSearch.tsx

@@ -21,7 +21,7 @@ import { useLocation } from "react-router";
 import { Link } from "react-router-dom";
 import Pagination from "../Pagination/Pagination";
 import { getGitpodService } from "../service/service";
-import { getProjectPath } from "../workspaces/WorkspaceEntryNew";
+import { getProjectPath } from "../workspaces/WorkspaceEntry";
 import WorkspaceDetail from "./WorkspaceDetail";
 import { AdminPageHeader } from "./AdminPageHeader";
 import Alert from "../components/Alert";

components/dashboard/src/app/AppRoutes.tsx

@@ -46,7 +46,7 @@ import { WebsocketClients } from "./WebsocketClients";
 import { OrgRequiredRoute } from "./OrgRequiredRoute";
 
 const Setup = React.lazy(() => import(/* webpackPrefetch: true */ "../Setup"));
-const WorkspacesNew = React.lazy(() => import(/* webpackPrefetch: true */ "../workspaces/WorkspacesNew"));
+const Workspaces = React.lazy(() => import(/* webpackPrefetch: true */ "../workspaces/Workspaces"));
 const Account = React.lazy(() => import(/* webpackPrefetch: true */ "../user-settings/Account"));
 const Notifications = React.lazy(() => import(/* webpackPrefetch: true */ "../user-settings/Notifications"));
 const Billing = React.lazy(() => import(/* webpackPrefetch: true */ "../user-settings/Billing"));
@@ -170,7 +170,7 @@ export const AppRoutes: FunctionComponent<AppRoutesProps> = ({ user, teams }) =>
                     <Route path={projectsPathNew} exact component={NewProject} />
                     <Route path="/open" exact component={Open} />
                     <Route path="/setup" exact component={Setup} />
-                    <Route path={workspacesPathMain} exact component={WorkspacesNew} />
+                    <Route path={workspacesPathMain} exact component={Workspaces} />
                     <Route path={settingsPathAccount} exact component={Account} />
                     <Route path={usagePathMain} exact component={Usage} />
                     <Route path={settingsPathIntegrations} exact component={Integrations} />

components/dashboard/src/components/Tooltip.tsx

@@ -47,8 +47,10 @@ function Tooltip(props: TooltipProps) {
     }, [showTooltipTimeout]);
 
     return (
-        <div onMouseLeave={handleMouseLeave} onMouseEnter={handleMouseEnter} className="relative">
-            <div ref={setTriggerEl}>{props.children}</div>
+        <>
+            <span onMouseLeave={handleMouseLeave} onMouseEnter={handleMouseEnter} ref={setTriggerEl}>
+                {props.children}
+            </span>
             {expanded ? (
                 <Portal>
                     <div
@@ -64,7 +66,7 @@ function Tooltip(props: TooltipProps) {
                     </div>
                 </Portal>
             ) : null}
-        </div>
+        </>
     );
 }
 

components/dashboard/src/workspaces/WorkspaceEntryNew.tsx renamed to components/dashboard/src/workspaces/WorkspaceEntry.tsx

@@ -74,7 +74,9 @@ export const WorkspaceEntry: FunctionComponent<Props> = ({ info }) => {
                 </a>
             </ItemField>
             <ItemField className="w-2/12 flex flex-col my-auto">
-                <div className="text-gray-500 dark:text-gray-400 overflow-ellipsis truncate">{currentBranch}</div>
+                <div className="text-gray-500 dark:text-gray-400 overflow-ellipsis truncate">
+                    <Tooltip content={currentBranch}>{currentBranch}</Tooltip>
+                </div>
                 <div className="mr-auto">
                     <PendingChangesDropdown workspaceInstance={info.latestInstance} />
                 </div>

components/dashboard/src/workspaces/WorkspacesNew.tsx renamed to components/dashboard/src/workspaces/Workspaces.tsx

@@ -6,7 +6,7 @@
 
 import { FunctionComponent, useCallback, useMemo, useState } from "react";
 import Header from "../components/Header";
-import { WorkspaceEntry } from "./WorkspaceEntryNew";
+import { WorkspaceEntry } from "./WorkspaceEntry";
 import { ItemsList } from "../components/ItemsList";
 import { useCurrentUser } from "../user-context";
 import { User, WorkspaceInfo } from "@gitpod/gitpod-protocol";