Skip to content

Commit e8eba5d

Browse files
committed
- Fixed several minor issues in the File Asset Manager (zip upload now limited to local folders, case-insensitive restricted extension check, corrected move folder error message).
1 parent 3fc0165 commit e8eba5d

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

Rock.JavaScript.Obsidian.Blocks/src/Cms/fileAssetManager.obs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
:browseMode="config?.browseMode as 'image' | 'doc' | undefined ?? 'doc'"
99
:enableAssetManager="config?.enableAssetProviders ?? false"
1010
:enableFileManager="config?.enableFileManager ?? true"
11-
:enableZipUpload="config?.enableZipUploader ?? true"
11+
:enableZipUpload="config?.enableZipUploader ?? false"
1212
:encryptedRootFolder="config?.rootFolder ?? undefined"
1313
:editFilePage="config?.fileEditorPage ?? undefined" />
1414
</div>

Rock.JavaScript.Obsidian/Framework/Controls/fileAssetManager.obs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
});
361361

362362
const emit = defineEmits<{
363-
(e: "update:modelValue", value: ListItemBag): void
363+
(e: "update:modelValue", value: FileAsset[] | undefined): void
364364
(e: "update:openFolders", value: string[]): void
365365
(e: "update:selectedFolder", value: string | null): void
366366
}>();
@@ -571,8 +571,6 @@
571571
isMoveFolderModalLoading.value = true;
572572
moveFolderModalError.value = "";
573573

574-
parseFolderName;
575-
576574
try {
577575
const options: AssetManagerGetListOfAllFoldersOptionsBag = {
578576
encryptedRoot: props.encryptedRootFolder,
@@ -638,7 +636,7 @@
638636
isMoveFolderModalVisible.value = false;
639637
}
640638
catch (e) {
641-
moveFolderModalError.value = (e as Error)?.message || "An unknown error occurred while renaming the folder.";
639+
moveFolderModalError.value = (e as Error)?.message || "An unknown error occurred while moving the folder.";
642640
}
643641
finally {
644642
isMoveFolderModalLoading.value = false;
@@ -863,7 +861,7 @@
863861
const zipFileInputElement = ref<HTMLInputElement | null>(null);
864862

865863
const isUploadDisabled = computed(() => !isFolderSelected.value || isUploadingFile.value || isLoadingFiles.value);
866-
const isZipUploadDisabled = computed(() => isUploadDisabled.value || isUploadRestricted.value);
864+
const isZipUploadDisabled = computed(() => isUploadDisabled.value || isUploadRestricted.value || !isFolderLocal.value);
867865

868866
const isFilePaneActionLoading = ref(false);
869867

@@ -1101,7 +1099,7 @@
11011099

11021100
function getFileDropDownMenuItems(file: FileAsset): MenuAction[] {
11031101
const actions: MenuAction[] = [];
1104-
if (isFolderLocal.value && !!props.editFilePage && !restrictedFileExtensions.includes(Path.getExtension(file.key))) {
1102+
if (isFolderLocal.value && !!props.editFilePage && !restrictedFileExtensions.includes(Path.getExtension(file.key).toLowerCase())) {
11051103
actions.push({
11061104
title: "Edit",
11071105
type: "default",

0 commit comments

Comments
 (0)