Skip to content

fix the opening of modelActionsCell #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LrxGaelle wants to merge 1 commit into
base: develop
Choose a base branch
from
+105 −97
Open

fix the opening of modelActionsCell #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/components/specific/models/models-table/ModelsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
</template>
<template #cell-actions="{ row: model }">
<ModelActionsCell
:parent="modelsTable"
:project="project"
:model="model"
@archive="$emit('archive', $event)"
Expand Down Expand Up @@ -150,11 +151,11 @@ export default {
let filteredColumns = columnsDef;
if (isLG.value) {
filteredColumns = filteredColumns.filter((col) =>
["name", "status", "actions"].includes(col.id)
["name", "status", "actions"].includes(col.id),
);
} else if (isXL.value) {
filteredColumns = filteredColumns.filter((col) =>
["name", "creator", "lastupdate", "status", "actions"].includes(col.id)
["name", "creator", "lastupdate", "status", "actions"].includes(col.id),
);
}
return filteredColumns.map((col) => ({
Expand All @@ -170,7 +171,7 @@ export default {
nameEditMode = reactive({});
props.models.forEach((model) => (nameEditMode[model.id] = false));
},
{ immediate: true }
{ immediate: true },
);
const getFoldersInFolder = (folder) => collectDescendants(folder, isFolder);
Expand All @@ -183,7 +184,7 @@ export default {
} else {
return [];
}
})
}),
);
const allFiles = computed(() =>
projectFileStructure.value.children.flatMap((file) => {
Expand All @@ -192,7 +193,7 @@ export default {
} else {
return file;
}
})
}),
);
const tagsByModelId = computed(() => {
Expand All @@ -216,7 +217,7 @@ export default {
props.models.map((model) => ({
...model,
tags: tagsByModelId.value[model.id] ?? [],
}))
})),
);
return {
Expand Down
189 changes: 98 additions & 91 deletions src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<template>
<div class="model-actions-cell" v-click-away="closeMenu">
<template v-if="model.type === MODEL_TYPE.META_BUILDING">
<BIMDataButton
color="primary"
outline
radius
icon
@click="onClick('view-metaBuilding')"
>
<BIMDataButton color="primary" outline radius icon @click="onClick('view-metaBuilding')">
<BIMDataIconStructure size="s" />
</BIMDataButton>
</template>
Expand Down Expand Up @@ -84,8 +78,7 @@

<template
v-else-if="
model.type === MODEL_TYPE.PHOTOSPHERE ||
model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING
model.type === MODEL_TYPE.PHOTOSPHERE || model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING
"
>
<ViewerButton
Expand Down Expand Up @@ -118,52 +111,54 @@
ripple
rounded
icon
@click="toggleMenu"
@click="() => (isOpen ? closeMenu() : openMenu())"
>
<BIMDataIconEllipsis size="l" />
</BIMDataButton>

<transition name="fade">
<BIMDataMenu
:menuItems="menuItems"
class="model-actions-cell__menu"
v-show="showMenu"
width="180px"
>
<template #item="{ item }">
<BIMDataIcon :name="item.icon" size="xs" margin="0 12px 0 0" />
<span :data-test-id="item.dataTestId">
{{ $t(item.text) }}
</span>
</template>
</BIMDataMenu>
</transition>
<BIMDataMenu
ref="menu"
:menuItems="menuItems"
class="model-actions-cell__menu"
v-show="isOpen"
width="180px"
>
<template #item="{ item }">
<BIMDataIcon :name="item.icon" size="xs" margin="0 12px 0 0" />
<span :data-test-id="item.dataTestId">
{{ $t(item.text) }}
</span>
</template>
</BIMDataMenu>
</template>
</div>
</template>

<script>
import { computed } from "vue";
import { useToggle } from "../../../../../composables/toggle.js";
import { ref, computed, nextTick } from "vue";
import { MODEL_STATUS, MODEL_TYPE } from "../../../../../config/models.js";
import { WINDOWS } from "../../../../../config/viewer.js";
import { useUser } from "../../../../../state/user.js";
import { dropdownPositioner } from "../../../../../utils/positioner.js";
// Components
import ViewerButton from "./ViewerButton.vue";
export default {
components: {
ViewerButton
ViewerButton,
},
props: {
parent: {
type: Object,
},
project: {
type: Object,
required: true
required: true,
},
model: {
type: Object,
required: true
}
required: true,
},
},
emits: [
"archive",
Expand All @@ -178,91 +173,103 @@ export default {
setup(props, { emit }) {
const { isProjectGuest, hasAdminPerm } = useUser();
const {
isOpen: showMenu,
close: closeMenu,
toggle: toggleMenu
} = useToggle();
const menu = ref(null);
const isOpen = ref(false);
const isModelReady = computed(() => MODEL_STATUS.COMPLETED === props.model.status);
const isModelReady = computed(
() => MODEL_STATUS.COMPLETED === props.model.status
);
const menuItems = ref([]);
const openMenu = () => {
if (!props.parent) return;
const onClick = event => {
closeMenu();
emit(event, props.model);
};
isOpen.value = true;
if (props.model.document) {
menuItems.value.push({
key: 1,
text: "t.rename",
icon: "edit",
action: () => onClick("update"),
color: "var(--color-primary)",
dataTestId: "btn-update-model",
});
}
if (props.model.type === MODEL_TYPE.META_BUILDING) {
menuItems.value.push({
key: 3,
text: "t.edit",
icon: "edit",
action: () => onClick("edit-metaBuilding"),
color: "var(--color-primary)",
});
}
const menuItems = [];
if (props.model.document) {
menuItems.push({
key: 1,
text: "t.rename",
icon: "edit",
action: () => onClick("update"),
if (props.model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING) {
menuItems.value.push({
key: 3,
text: "t.edit",
icon: "edit",
action: () => onClick("edit-photosphereBuilding"),
color: "var(--color-primary)",
});
}
menuItems.value.push({
key: 2,
text: props.model.archived ? "t.unarchive" : "t.archive",
icon: props.model.archived ? "unarchive" : "archive",
action: () => onClick(props.model.archived ? "unarchive" : "archive"),
color: "var(--color-primary)",
dataTestId: "btn-update-model"
dataTestId: "btn-archive-model",
});
}
if (props.model.type === MODEL_TYPE.META_BUILDING) {
menuItems.push({
key: 3,
text: "t.edit",
icon: "edit",
action: () => onClick("edit-metaBuilding"),
color: "var(--color-primary)"
menuItems.value.push({
divider: true,
});
}
if (props.model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING) {
menuItems.push({
key: 3,
text: "t.edit",
icon: "edit",
action: () => onClick("edit-photosphereBuilding"),
color: "var(--color-primary)"
menuItems.value.push({
key: 4,
text: "t.delete",
icon: "delete",
action: () => onClick("delete"),
color: "var(--color-high)",
background: "var(--color-high-lighter)",
dataTestId: "btn-delete-model",
});
}
menuItems.push({
key: 2,
text: props.model.archived ? "t.unarchive" : "t.archive",
icon: props.model.archived ? "unarchive" : "archive",
action: () => onClick(props.model.archived ? "unarchive" : "archive"),
color: "var(--color-primary)",
dataTestId: "btn-archive-model"
});
nextTick(() => {
if (props.parent) {
menu.value.$el.style.top = dropdownPositioner(props.parent.$el, menu.value.$el);
}
});
};
menuItems.push({
divider: true
});
const closeMenu = () => {
isOpen.value = false;
menuItems.value = [];
nextTick(() => (menu.value.$el.style.top = ""));
};
menuItems.push({
key: 4,
text: "t.delete",
icon: "delete",
action: () => onClick("delete"),
color: "var(--color-high)",
background: "var(--color-high-lighter)",
dataTestId: "btn-delete-model"
});
const onClick = (event) => {
closeMenu();
emit(event, props.model);
};
return {
// References
menu,
isOpen,
hasAdminPerm,
isModelReady,
menuItems,
MODEL_TYPE,
showMenu,
WINDOWS,
// Methods
closeMenu,
isProjectGuest,
onClick,
toggleMenu
openMenu,
};
}
},
};
</script>

Expand Down