[arvados] updated: 2.7.0-6059-gfe65b9e7f4
git repository hosting
git at public.arvados.org
Tue Feb 27 15:42:38 UTC 2024
Summary of changes:
.../src/components/data-explorer/data-explorer.tsx | 36 ----------------------
.../src/store/search-bar/search-bar-actions.ts | 1 -
.../data-explorer/data-explorer.tsx | 4 +--
.../src/views/project-panel/project-panel.tsx | 14 +--------
4 files changed, 3 insertions(+), 52 deletions(-)
via fe65b9e7f45f69ccd9c73ca6cf220cd544512d0a (commit)
from a8915904f23325c5c6e465164bc032e0dabc4229 (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 fe65b9e7f45f69ccd9c73ca6cf220cd544512d0a
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Feb 27 10:42:32 2024 -0500
21224: removed dataexplorer component state Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 4e89b752a6..36ae5fd6ed 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -84,7 +84,6 @@ interface DataExplorerDataProps<T> {
defaultViewIcon?: IconType;
defaultViewMessages?: string[];
working?: boolean;
- currentRefresh?: string;
currentRoute?: string;
hideColumnSelector?: boolean;
paperProps?: PaperProps;
@@ -119,50 +118,15 @@ interface DataExplorerActionProps<T> {
type DataExplorerProps<T> = DataExplorerDataProps<T> & DataExplorerActionProps<T> & WithStyles<CssRules> & MPVPanelProps;
-type DataExplorerState = {
- prevRefresh: string;
- prevRoute: string;
-};
-
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
- state: DataExplorerState = {
- prevRefresh: "",
- prevRoute: "",
- };
multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
- componentDidUpdate(prevProps: DataExplorerProps<T>) {
- const currentRefresh = this.props.currentRefresh || "";
- const currentRoute = this.props.currentRoute || "";
-
- if (currentRoute !== this.state.prevRoute) {
- // Component already mounted, but the user comes from a route change,
- // like browsing through a project hierarchy.
- this.setState({
- prevRoute: currentRoute,
- });
- }
-
- if (currentRefresh !== this.state.prevRefresh) {
- // Component already mounted, but the user just clicked the
- // refresh button.
- this.setState({
- prevRefresh: currentRefresh,
- });
- }
- }
-
componentDidMount() {
if (this.props.onSetColumns) {
this.props.onSetColumns(this.props.columns);
}
- // Component just mounted, so we need to show the loading indicator.
- this.setState({
- prevRefresh: this.props.currentRefresh || "",
- prevRoute: this.props.currentRoute || "",
- });
}
render() {
diff --git a/services/workbench2/src/store/search-bar/search-bar-actions.ts b/services/workbench2/src/store/search-bar/search-bar-actions.ts
index a34ab02d6e..396c2dfaae 100644
--- a/services/workbench2/src/store/search-bar/search-bar-actions.ts
+++ b/services/workbench2/src/store/search-bar/search-bar-actions.ts
@@ -39,7 +39,6 @@ export const searchBarActions = unionize({
MOVE_UP: ofType<{}>(),
MOVE_DOWN: ofType<{}>(),
SELECT_FIRST_ITEM: ofType<{}>(),
- SET_IS_SEARCHING: ofType<boolean>(),
});
export type SearchBarActions = UnionOf<typeof searchBarActions>;
diff --git a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
index e74897ce41..fe85a41905 100644
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@ -27,7 +27,7 @@ const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect,
const working = !!progressIndicator.some(p => p.id === id && p.working);
const dataExplorerState = getDataExplorer(dataExplorer, id);
const currentRoute = router.location ? router.location.pathname : "";
- const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || "";
+ // const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || "";
const isDetailsResourceChecked = multiselect.checkedList[detailsPanel.resourceUuid]
const isOnlyOneSelected = Object.values(multiselect.checkedList).filter(x => x === true).length === 1;
const currentItemUuid =
@@ -35,7 +35,7 @@ const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect,
const isMSToolbarVisible = multiselect.isVisible;
return {
...dataExplorerState,
- currentRefresh: currentRefresh,
+ // currentRefresh: currentRefresh,
currentRoute: currentRoute,
paperKey: currentRoute,
currentItemUuid,
diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index f6daeddf13..2ddfca8178 100644
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -53,7 +53,7 @@ import { resourceIsFrozen } from 'common/frozen-resources';
import { ProjectResource } from 'models/project';
import { deselectAllOthers, toggleOne } from 'store/multiselect/multiselect-actions';
-type CssRules = 'root' | 'button' | 'loader' | 'notFoundView';
+type CssRules = 'root' | 'button' ;
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
@@ -62,18 +62,6 @@ 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 {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list