[arvados] updated: 2.7.0-6003-gc08ec9f261

git repository hosting git at public.arvados.org
Mon Feb 12 21:10:19 UTC 2024


Summary of changes:
 .../src/components/data-table/data-table.tsx       | 18 ++---------
 .../src/views/project-panel/project-panel.tsx      | 36 +++++++++++++++++-----
 2 files changed, 31 insertions(+), 23 deletions(-)

       via  c08ec9f2612ffa2ceef5405d357e5c5b8cb608c9 (commit)
      from  af8d161b1c3466d2d6fdfb3b1ce94ca73d8fea86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c08ec9f2612ffa2ceef5405d357e5c5b8cb608c9
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Mon Feb 12 16:10:14 2024 -0500

    21386: removed old loading view, css tweaks Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/components/data-table/data-table.tsx b/services/workbench2/src/components/data-table/data-table.tsx
index d3bbab5077..bbbc7bb012 100644
--- a/services/workbench2/src/components/data-table/data-table.tsx
+++ b/services/workbench2/src/components/data-table/data-table.tsx
@@ -24,7 +24,7 @@ import { DataTableFilters } from "../data-table-filters/data-table-filters-tree"
 import { DataTableMultiselectPopover } from "../data-table-multiselect-popover/data-table-multiselect-popover";
 import { DataTableFiltersPopover } from "../data-table-filters/data-table-filters-popover";
 import { countNodes, getTreeDirty } from "models/tree";
-import { IconType, PendingIcon } from "components/icon/icon";
+import { IconType } from "components/icon/icon";
 import { SvgIconProps } from "@material-ui/core/SvgIcon";
 import ArrowDownwardIcon from "@material-ui/icons/ArrowDownward";
 import { createTree } from "models/tree";
@@ -69,8 +69,7 @@ type CssRules =
     | "tableCell"
     | "arrow"
     | "arrowButton"
-    | "tableCellWorkflows"
-    | "loader";
+    | "tableCellWorkflows";
 
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     root: {
@@ -83,11 +82,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     tableBody: {
         background: theme.palette.background.paper,
     },
-    loader: {
-        left: "50%",
-        marginLeft: "-84px",
-        position: "absolute",
-    },
     noItemsInfo: {
         textAlign: "center",
         padding: theme.spacing.unit,
@@ -303,14 +297,6 @@ export const DataTable = withStyles(styles)(
                             </TableHead>
                             <TableBody className={classes.tableBody}>{!working && items.map(this.renderBodyRow)}</TableBody>
                         </Table>
-                        {!!working && (
-                            <div className={classes.loader}>
-                                <DataTableDefaultView
-                                    icon={PendingIcon}
-                                    messages={["Loading data, please wait."]}
-                                />
-                            </div>
-                        )}
                         {items.length === 0 && !working && this.renderNoItemsPlaceholder(this.props.columns)}
                     </div>
                 </div>
diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index 9e42513e06..112f09968a 100644
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -53,8 +53,10 @@ import { resourceIsFrozen } from 'common/frozen-resources';
 import { ProjectResource } from 'models/project';
 import { NotFoundView } from 'views/not-found-panel/not-found-panel';
 import { deselectAllOthers, toggleOne } from 'store/multiselect/multiselect-actions';
+import { PendingIcon } from 'components/icon/icon';
+import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
 
-type CssRules = 'root' | 'button';
+type CssRules = 'root' | 'button' | 'loader' | 'notFoundView';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     root: {
@@ -63,6 +65,18 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     button: {
         marginLeft: theme.spacing.unit,
     },
+    loader: {
+        top: "25%",
+        left: "46.5%",
+        marginLeft: "-84px",
+        position: "absolute",
+    },
+    notFoundView: {
+        top: "30%",
+        left: "50%",
+        marginLeft: "-84px",
+        position: "absolute",
+    },
 });
 
 export enum ProjectPanelColumnNames {
@@ -299,12 +313,20 @@ export const ProjectPanel = withStyles(styles)(
                             defaultViewMessages={DEFAULT_VIEW_MESSAGES}
                         />
                     </div>
-                    : this.state.isLoaded ?
-                    <NotFoundView
-                        icon={ProjectIcon}
-                        messages={["Project not found"]}
-                    />
-                    : null
+                : this.state.isLoaded ?
+                    <div className={classes.notFoundView}>
+                        <NotFoundView
+                            icon={ProjectIcon}
+                            messages={["Project not found"]}
+                            />
+                    </div>
+                    :   
+                    <div className={classes.loader}>
+                        <DataTableDefaultView
+                            icon={PendingIcon}
+                            messages={["Loading data, please wait."]}
+                        />
+                    </div>
             }
 
             isCurrentItemChild = (resource: Resource) => {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list