Skip to content

Commit aceac39

Browse files
aswallaceaswallace
committed
refactor filters property to remove isFolder
1 parent c16c1ae commit aceac39

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

‎packages/core/components/DirectoryTree/DirectoryTreeNodeHeader.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default React.memo(function DirectoryTreeNodeHeader(props: DirectoryTreeN
5757
const onDismiss = () => {
5858
setContextMenuActive(false);
5959
};
60-
const onFileHeaderContextMenu = useFileAccessContextMenu(fileSet.filters, onDismiss, true);
60+
const onFileHeaderContextMenu = useFileAccessContextMenu(fileSet.filters, onDismiss);
6161
const onContextMenu = (evt: React.MouseEvent) => {
6262
evt.preventDefault();
6363
onFileHeaderContextMenu(evt);

‎packages/core/hooks/useFileAccessContextMenu.ts

+17-18
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import { interaction, selection } from "../state";
1414
* previously saved applications. Can be supplied an array of filters to use
1515
* to find files to access instead of the currently selected files.
1616
*/
17-
export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boolean) => {
17+
export default (folderFilters?: FileFilter[], onDismiss?: () => void) => {
1818
const dispatch = useDispatch();
1919
const isOnWeb = useSelector(interaction.selectors.isOnWeb);
2020
const fileSelection = useSelector(selection.selectors.getFileSelection);
2121
const isQueryingAicsFms = useSelector(selection.selectors.isQueryingAicsFms);
2222

2323
const [fileDetails, setFileDetails] = React.useState<FileDetail>();
2424

25-
const openWithSubMenuItems = useOpenWithMenuItems(fileDetails, filters);
25+
const openWithSubMenuItems = useOpenWithMenuItems(fileDetails, folderFilters);
2626

2727
fileSelection.fetchFocusedItemDetails().then((fileDetails) => {
2828
setFileDetails(fileDetails);
@@ -33,7 +33,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
3333
evt.preventDefault();
3434

3535
const contextMenuItems: IContextualMenuItem[] = [
36-
...(!isFolder
36+
...(!folderFilters
3737
? []
3838
: [
3939
{
@@ -67,10 +67,10 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
6767
iconProps: {
6868
iconName: "OpenInNewWindow",
6969
},
70-
disabled: !filters && fileSelection.count() === 0,
70+
disabled: !folderFilters && fileSelection.count() === 0,
7171
onClick() {
72-
if (filters) {
73-
dispatch(interaction.actions.openWithDefault(filters));
72+
if (folderFilters) {
73+
dispatch(interaction.actions.openWithDefault(folderFilters));
7474
} else if (fileDetails) {
7575
dispatch(
7676
interaction.actions.openWithDefault(undefined, [
@@ -84,7 +84,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
8484
{
8585
key: "open-with",
8686
text: "Open with",
87-
disabled: !filters && fileSelection.count() === 0,
87+
disabled: !folderFilters && fileSelection.count() === 0,
8888
iconProps: {
8989
iconName: "OpenInNewWindow",
9090
},
@@ -95,7 +95,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
9595
{
9696
key: "save-as",
9797
text: "Save metadata as",
98-
disabled: !filters && fileSelection.count() === 0,
98+
disabled: !folderFilters && fileSelection.count() === 0,
9999
iconProps: {
100100
iconName: "Saveas",
101101
},
@@ -110,13 +110,13 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
110110
{
111111
key: "csv",
112112
text: "CSV",
113-
disabled: !filters && fileSelection.count() === 0,
113+
disabled: !folderFilters && fileSelection.count() === 0,
114114
title: "Download a CSV of the metadata of the selected files",
115115
onClick() {
116116
dispatch(
117117
interaction.actions.showManifestDownloadDialog(
118118
"csv",
119-
filters
119+
folderFilters
120120
)
121121
);
122122
},
@@ -128,29 +128,29 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
128128
{
129129
key: "json",
130130
text: "JSON",
131-
disabled: !filters && fileSelection.count() === 0,
131+
disabled: !folderFilters && fileSelection.count() === 0,
132132
title:
133133
"Download a JSON file of the metadata of the selected files",
134134
onClick() {
135135
dispatch(
136136
interaction.actions.showManifestDownloadDialog(
137137
"json",
138-
filters
138+
folderFilters
139139
)
140140
);
141141
},
142142
},
143143
{
144144
key: "parquet",
145145
text: "Parquet",
146-
disabled: !filters && fileSelection.count() === 0,
146+
disabled: !folderFilters && fileSelection.count() === 0,
147147
title:
148148
"Download a Parquet file of the metadata of the selected files",
149149
onClick() {
150150
dispatch(
151151
interaction.actions.showManifestDownloadDialog(
152152
"parquet",
153-
filters
153+
folderFilters
154154
)
155155
);
156156
},
@@ -165,7 +165,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
165165
key: "copy-to-cache",
166166
text: "Copy to vast",
167167
title: "Copy selected files to NAS Cache (VAST)",
168-
disabled: !filters && fileSelection.count() === 0,
168+
disabled: !folderFilters && fileSelection.count() === 0,
169169
iconProps: { iconName: "MoveToFolder" },
170170
onClick() {
171171
dispatch(interaction.actions.showCopyFileManifest());
@@ -177,7 +177,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
177177
key: "download",
178178
text: "Download",
179179
title: "Download selected files to a specific directory",
180-
disabled: !filters && fileSelection.count() === 0,
180+
disabled: !folderFilters && fileSelection.count() === 0,
181181
iconProps: {
182182
iconName: "Download",
183183
},
@@ -195,8 +195,7 @@ export default (filters?: FileFilter[], onDismiss?: () => void, isFolder?: boole
195195
dispatch,
196196
fileDetails,
197197
fileSelection,
198-
filters,
199-
isFolder,
198+
folderFilters,
200199
isOnWeb,
201200
isQueryingAicsFms,
202201
onDismiss,

0 commit comments

Comments
 (0)