@bindu-dashing/dam-solution-v2 5.8.89 → 5.8.90
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -39,6 +39,8 @@ function ImagePicker({ id, onSelect, url, }) {
|
|
|
39
39
|
try {
|
|
40
40
|
setLoading(true);
|
|
41
41
|
const response = yield api.get(FETCH_IMAGEPICKER_URL.replace(":id", id));
|
|
42
|
+
console.log("## ImagePicker config response:", response);
|
|
43
|
+
console.log("## ImagePicker includeSubFolders:", get(response, "data.includeSubFolders"));
|
|
42
44
|
setPicker(get(response, "data", {}));
|
|
43
45
|
setLoading(false);
|
|
44
46
|
}
|
|
@@ -73,7 +73,9 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
|
|
|
73
73
|
return params;
|
|
74
74
|
};
|
|
75
75
|
console.log('## folderId', parentFolderId);
|
|
76
|
-
|
|
76
|
+
console.log('## imagePicker config:', imagePicker);
|
|
77
|
+
console.log('## imagePicker.includeSubFolders:', get(imagePicker, "includeSubFolders"));
|
|
78
|
+
const folderParams = merge({}, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ page: DEFAULT_PAGE }, (type ? { category: type } : {})), (!!imagePicker
|
|
77
79
|
? {
|
|
78
80
|
includeSubFolders: get(imagePicker, "includeSubFolders", true),
|
|
79
81
|
teamVisibility: get(imagePicker, "teamVisibility", true),
|
|
@@ -82,7 +84,9 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
|
|
|
82
84
|
? { metadataKey: metadataKey, metadataValue: metadataValue }
|
|
83
85
|
: {})), (!!folderSearch ? { name: folderSearch } : {})), (!!globalSearch && ((parentFolderId || folderId || id) === rootFolderId || !(parentFolderId || folderId || id))
|
|
84
86
|
? { globalSearch }
|
|
85
|
-
: {})), { sortBy: sortBy, sortOrder: sortOrder }), Object.assign(Object.assign({}, getDateRangeFromKey(selectedDateKey)), (!!selectedType ? { type: selectedType } : {})))
|
|
87
|
+
: {})), { sortBy: sortBy, sortOrder: sortOrder }), Object.assign(Object.assign({}, getDateRangeFromKey(selectedDateKey)), (!!selectedType ? { type: selectedType } : {})));
|
|
88
|
+
console.log('## folderParams being sent to useFolders:', folderParams);
|
|
89
|
+
const { data: foldersPaginatedData, isLoading, hasNextPage, fetchNextPage, refetch, isFetching, error, } = useFolders(api, generateFoldersQueryKey(type), folderParams,
|
|
86
90
|
// Priority: parentFolderId (from selection) > folderId (from URL params) > id > rootFolderId
|
|
87
91
|
parentFolderId
|
|
88
92
|
? parentFolderId
|