@bindu-dashing/dam-solution-v2 5.8.31 → 5.8.32
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.
|
@@ -80,12 +80,14 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
|
|
|
80
80
|
}
|
|
81
81
|
: {})), (!!searchKey && !!searchValue ? getSearchParams() : {})), (!!metadataKey && !!metadataValue
|
|
82
82
|
? { metadataKey: metadataKey, metadataValue: metadataValue }
|
|
83
|
-
: {})), (!!folderSearch ? { name: folderSearch } : {})), (!!globalSearch && (folderId === rootFolderId || !folderId)
|
|
83
|
+
: {})), (!!folderSearch ? { name: folderSearch } : {})), (!!globalSearch && ((parentFolderId || folderId || id) === rootFolderId || !(parentFolderId || folderId || id))
|
|
84
84
|
? { globalSearch }
|
|
85
|
-
: {})), { sortBy: sortBy, sortOrder: sortOrder }), Object.assign(Object.assign({}, getDateRangeFromKey(selectedDateKey)), (!!selectedType ? { type: selectedType } : {}))),
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
85
|
+
: {})), { sortBy: sortBy, sortOrder: sortOrder }), Object.assign(Object.assign({}, getDateRangeFromKey(selectedDateKey)), (!!selectedType ? { type: selectedType } : {}))),
|
|
86
|
+
// Priority: parentFolderId (from selection) > folderId (from URL params) > id > rootFolderId
|
|
87
|
+
parentFolderId
|
|
88
|
+
? parentFolderId
|
|
89
|
+
: folderId
|
|
90
|
+
? folderId
|
|
89
91
|
: id
|
|
90
92
|
? id
|
|
91
93
|
: rootFolderId);
|
|
@@ -170,7 +172,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
|
|
|
170
172
|
});
|
|
171
173
|
const response = yield api.post(UPLOAD_IMAGE_PICKER_LOCAL_FILE_URL, {
|
|
172
174
|
brandId,
|
|
173
|
-
folderId: folderId || rootFolderId,
|
|
175
|
+
folderId: parentFolderId || folderId || rootFolderId,
|
|
174
176
|
name: file.name,
|
|
175
177
|
size: file.size,
|
|
176
178
|
});
|
|
@@ -186,7 +188,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
|
|
|
186
188
|
// setSelectedFile()
|
|
187
189
|
const fileResponse = yield api.post(FETCH_IMAGE_PCIKER_THUMBNAIL_URL, {
|
|
188
190
|
brandId,
|
|
189
|
-
folderId: folderId || rootFolderId,
|
|
191
|
+
folderId: parentFolderId || folderId || rootFolderId,
|
|
190
192
|
name: file.name,
|
|
191
193
|
mimetype: `image/${extension}`,
|
|
192
194
|
s3Path: filePath,
|