+
@@ -105,20 +99,25 @@ export default {
props: {
project: {
type: Object,
- required: true
+ required: true,
},
fileStructure: {
type: Object,
- required: true
+ required: true,
},
files: {
type: Array,
- default: () => []
+ default: () => [],
},
initialFolder: {
type: Object,
- required: true
- }
+ required: true,
+ },
+ context: {
+ type: String,
+ default: "move",
+ validator: (value) => ["move", "upload"].includes(value),
+ },
},
emits: ["close", "folder-selected"],
setup(props, { emit }) {
@@ -133,21 +132,20 @@ export default {
handler
.children(currentFolder.value)
.filter(
- child =>
- !props.files.some(f => child.id === f.id) &&
- hasAdminPerm(props.project, child)
+ (child) =>
+ !props.files.some((f) => child.id === f.id) && hasAdminPerm(props.project, child),
)
.sort((a, b) => {
if (isFolder(a) && !isFolder(b)) return -1;
if (!isFolder(a) && isFolder(b)) return 1;
return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
- })
+ }),
);
const isAllowedToMoveFile = computed(() => {
const activeFolder = (selectedFolder.value || currentFolder.value).id;
- return props.files.some(f => activeFolder === f.parent_id);
+ return props.files.some((f) => activeFolder === f.parent_id);
});
const set = () => {
@@ -170,7 +168,7 @@ export default {
close();
};
- const enterFolder = folder => {
+ const enterFolder = (folder) => {
if (!isFolder(folder)) return;
folderPath.value.push(currentFolder.value);
@@ -182,7 +180,7 @@ export default {
currentFolder.value = folderPath.value.pop();
};
- const selectFolder = folder => {
+ const selectFolder = (folder) => {
if (!isFolder(folder)) return;
if (selectedFolder.value && selectedFolder.value.id === folder.id) {
@@ -195,7 +193,7 @@ export default {
watch(
() => props.initialFolder,
() => set(),
- { immediate: true }
+ { immediate: true },
);
return {
@@ -211,9 +209,9 @@ export default {
selectFolder,
submit,
isAllowedToMoveFile,
- isFolder
+ isFolder,
};
- }
+ },
};
diff --git a/src/config/viewer.js b/src/config/viewer.js
index f4c3a6ee4..a2a5dc140 100644
--- a/src/config/viewer.js
+++ b/src/config/viewer.js
@@ -30,8 +30,6 @@ const translateIfcType = ENV.VUE_APP_TRANSLATE_IFC_TYPE === "true";
const PLUGINS_CONFIG = {
accessMarketplace: true,
- "anchor-synchronization-window": false,
- "anchor-synchronization": false,
bcfManager: true,
buildingMaker: true,
"drawing-tools": true,
@@ -54,7 +52,6 @@ const PLUGINS_CONFIG = {
merge: true,
translateIfcEntities: translateIfcType,
},
- "viewer2d-background": true,
viewer3d: {
enableDTX: true,
},
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 34c903bab..00fb7f251 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -249,7 +249,8 @@
},
"FolderSelector": {
"selectedFolder": "Selected folder",
- "moveHere": "Move here"
+ "moveHere": "Move here",
+ "uploadHere": "Upload here"
},
"GroupCardActionMenu": {
"changeColorButtonText": "Change color"
@@ -1046,4 +1047,4 @@
"title": "Delete {visasCount} visas",
"message": "You are about to delete the visas on the following files:"
}
-}
\ No newline at end of file
+}
diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
index b4ee5221d..493bfaf17 100644
--- a/src/i18n/lang/fr.json
+++ b/src/i18n/lang/fr.json
@@ -338,7 +338,8 @@
},
"FolderSelector": {
"selectedFolder": "Dossier sélectionné",
- "moveHere": "Déplacer ici"
+ "moveHere": "Déplacer ici",
+ "uploadHere": "Télécharger ici"
},
"GroupCardActionMenu": {
"changeColorButtonText": "Modifier la couleur"
@@ -1071,4 +1072,4 @@
"title": "Suppression de {visasCount} visas",
"message": "Vous êtes sur le point de supprimer les visas sur les fichiers suivants :"
}
-}
\ No newline at end of file
+}
diff --git a/src/views/project-board/project-overview/ProjectOverview.scss b/src/views/project-board/project-overview/ProjectOverview.scss
index edf2259da..e409fd157 100644
--- a/src/views/project-board/project-overview/ProjectOverview.scss
+++ b/src/views/project-board/project-overview/ProjectOverview.scss
@@ -2,9 +2,10 @@
display: flex;
flex-wrap: wrap;
gap: calc(var(--spacing-unit) * 2);
+ position: relative;
&__tooltip-upload {
- font-size: calc(var(--font-size) / 1.2)
+ font-size: calc(var(--font-size) / 1.2);
}
&__block {
@@ -31,6 +32,13 @@
}
}
+ .folder-selector {
+ position: absolute;
+ top: -18px;
+ right: 0;
+ z-index: 10;
+ }
+
.models-overview,
.models-manager,
.project-users-manager {
diff --git a/src/views/project-board/project-overview/ProjectOverview.vue b/src/views/project-board/project-overview/ProjectOverview.vue
index da12a4c56..7dfccd32d 100644
--- a/src/views/project-board/project-overview/ProjectOverview.vue
+++ b/src/views/project-board/project-overview/ProjectOverview.vue
@@ -33,7 +33,7 @@
radius
:icon="isLG"
:disabled="!isUserOrga(space) && isFullTotal(spaceSubInfo)"
- @click="() => (shouldSubscribe ? openSubscriptionModal() : toggleFileUploader())"
+ @click="() => (shouldSubscribe ? openSubscriptionModal() : openFolderSelector())"
>
+
+
+
+
{
+ if (!projectFileStructure.value?.id) {
+ await loadProjectFileStructure(currentProject.value);
+ }
+ showFolderSelector.value = true;
+ };
+
+ const closeFolderSelector = () => {
+ showFolderSelector.value = false;
+ };
+
+ const onUploadFolderSelected = (folder) => {
+ uploadTargetFolder.value = folder;
+ showFolderSelector.value = false;
+ openFileUploader();
+ };
+
const selectTab = (tab) => {
currentTab.value = tab.id;
};
@@ -336,6 +372,9 @@ export default {
selectedRecipientsIds,
shouldSubscribe,
showFileUploader,
+ showFolderSelector,
+ uploadTargetFolder,
+ projectFileStructure,
sidePanelView,
space: currentSpace,
spaceSubInfo,
@@ -347,6 +386,9 @@ export default {
selectTab,
tabs,
// Methods
+ openFolderSelector,
+ closeFolderSelector,
+ onUploadFolderSelected,
closeFileUploader,
closeSidePanel,
closeNotificationPanel,