projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14433_properties_i...
[arvados.git]
/
src
/
views-components
/
projects-tree-picker
/
projects-tree-picker.tsx
diff --git
a/src/views-components/projects-tree-picker/projects-tree-picker.tsx
b/src/views-components/projects-tree-picker/projects-tree-picker.tsx
index 550f0851751f85229f90e5be800184086d40b7a7..ae98cf00896a3978c137a5593fdadc977c7978e0 100644
(file)
--- a/
src/views-components/projects-tree-picker/projects-tree-picker.tsx
+++ b/
src/views-components/projects-tree-picker/projects-tree-picker.tsx
@@
-3,12
+3,11
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Dispatch } from 'redux';
-import { connect } from 'react-redux';
+import { values, memoize, pipe, pick } from 'lodash/fp';
import { HomeTreePicker } from '~/views-components/projects-tree-picker/home-tree-picker';
import { SharedTreePicker } from '~/views-components/projects-tree-picker/shared-tree-picker';
import { FavoritesTreePicker } from '~/views-components/projects-tree-picker/favorites-tree-picker';
import { HomeTreePicker } from '~/views-components/projects-tree-picker/home-tree-picker';
import { SharedTreePicker } from '~/views-components/projects-tree-picker/shared-tree-picker';
import { FavoritesTreePicker } from '~/views-components/projects-tree-picker/favorites-tree-picker';
-import { getProjectsTreePickerIds,
treePickerActions
} from '~/store/tree-picker/tree-picker-actions';
+import { getProjectsTreePickerIds,
SHARED_PROJECT_ID, FAVORITES_PROJECT_ID
} from '~/store/tree-picker/tree-picker-actions';
import { TreeItem } from '~/components/tree/tree';
import { ProjectsTreePickerItem } from './generic-projects-tree-picker';
import { TreeItem } from '~/components/tree/tree';
import { ProjectsTreePickerItem } from './generic-projects-tree-picker';
@@
-16,18
+15,25
@@
export interface ProjectsTreePickerProps {
pickerId: string;
includeCollections?: boolean;
includeFiles?: boolean;
pickerId: string;
includeCollections?: boolean;
includeFiles?: boolean;
- rootItemSelection?: boolean;
- projectsSelection?: boolean;
- collectionsSelection?: boolean;
- filesSelection?: boolean;
+ showSelection?: boolean;
toggleItemActive?: (event: React.MouseEvent<HTMLElement>, item: TreeItem<ProjectsTreePickerItem>, pickerId: string) => void;
toggleItemActive?: (event: React.MouseEvent<HTMLElement>, item: TreeItem<ProjectsTreePickerItem>, pickerId: string) => void;
+ toggleItemSelection?: (event: React.MouseEvent<HTMLElement>, item: TreeItem<ProjectsTreePickerItem>, pickerId: string) => void;
}
export const ProjectsTreePicker = ({ pickerId, ...props }: ProjectsTreePickerProps) => {
const { home, shared, favorites } = getProjectsTreePickerIds(pickerId);
}
export const ProjectsTreePicker = ({ pickerId, ...props }: ProjectsTreePickerProps) => {
const { home, shared, favorites } = getProjectsTreePickerIds(pickerId);
+ const relatedTreePickers = getRelatedTreePickers(pickerId);
+ const p = {
+ ...props,
+ relatedTreePickers,
+ disableActivation
+ };
return <div>
return <div>
- <HomeTreePicker pickerId={home} {...p
rops
} />
- <SharedTreePicker pickerId={shared} {...p
rops
} />
- <FavoritesTreePicker pickerId={favorites} {...p
rops
} />
+ <HomeTreePicker pickerId={home} {...p} />
+ <SharedTreePicker pickerId={shared} {...p} />
+ <FavoritesTreePicker pickerId={favorites} {...p} />
</div>;
};
</div>;
};
+
+const getRelatedTreePickers = memoize(pipe(getProjectsTreePickerIds, values));
+const disableActivation = [SHARED_PROJECT_ID, FAVORITES_PROJECT_ID];