Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
justify-content: flex-start;
}

&__type,
&__created-by,
&__tags {
position: relative;
Expand Down
122 changes: 68 additions & 54 deletions src/components/specific/files/all-files-table/AllFilesTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,36 @@
@update:modelValue="onMainSelectionCheckboxClick"
/>
</div>
<div class="files-list__header__type" v-if="columns.some((column) => column.id === 'type')">
{{ $t(columnsDef[0].text) }}
<ColumnSorting
:sortOrder="
!sortObject.order || sortObject.column !== columnsDef[0] ? 'asc' : sortObject.order
"
:index="0"
:active="activeHeadercolumnKey === 0"
@click="toggleSorting(columnsDef[0])"
@set-active="activeHeadercolumnKey = $event"
/>
<div class="files-list__header__type" v-if="visibleColumnIds.includes('type')">
<span>
{{ $t(columnsDef[0].text) }}
</span>

<div v-if="columnsDef[0].filter" v-click-away="() => awayFromFilter(columnsDef[0])">
<BIMDataButton
color="primary"
ghost
rounded
icon
class="m-l-6"
:class="{
active: filters.some((filter) => filter.columnKey === columnsDef[0].id),
}"
@click.stop="toggleFiltersMenu(columnsDef[0])"
>
<BIMDataIconCaret size="xxxs" fill color="default" />
</BIMDataButton>

<ColumnFilters
v-if="displayedColumnFilterId === columnsDef[0].id"
:column="columnsDef[0]"
:columnData="formattedAllFiles.map((file) => file[columnsDef[0].id])"
:filters="
filters.find((filter) => filter.columnKey === columnsDef[0].id)?.columnFilters ?? []
"
@filter="updateFilters(columnsDef[0], $event)"
/>
</div>
</div>
<div class="files-list__header__name">
{{ $t(columnsDef[1].text) }}
Expand All @@ -31,10 +50,7 @@
@set-active="activeHeadercolumnKey = $event"
/>
</div>
<div
class="files-list__header__created-by"
v-if="columns.some((column) => column.id === 'created_by')"
>
<div class="files-list__header__created-by" v-if="visibleColumnIds.includes('created_by')">
{{ $t(columnsDef[2].text) }}
<div v-if="columnsDef[2].filter" v-click-away="() => awayFromFilter(columnsDef[2])">
<BIMDataButton
Expand All @@ -53,7 +69,7 @@
<ColumnFilters
v-if="displayedColumnFilterId === columnsDef[2].id"
:column="columnsDef[2]"
:columnData="allFiles.map((file) => file[columnsDef[2].id])"
:columnData="formattedAllFiles.map((file) => file[columnsDef[2].id])"
:filters="
filters.find((filter) => filter.columnKey === columnsDef[2].id)?.columnFilters ?? []
"
Expand All @@ -65,10 +81,7 @@
</ColumnFilters>
</div>
</div>
<div
class="files-list__header__last-update"
v-if="columns.some((column) => column.id === 'lastupdate')"
>
<div class="files-list__header__last-update" v-if="visibleColumnIds.includes('lastupdate')">
{{ $t(columnsDef[3].text) }}
<ColumnSorting
:sortOrder="
Expand All @@ -80,13 +93,10 @@
@set-active="activeHeadercolumnKey = $event"
/>
</div>
<div
class="files-list__header__location"
v-if="columns.some((column) => column.id === 'location')"
>
{{ $t(columnsDef[4].text) }}
<div class="files-list__header__location" v-if="visibleColumnIds.includes('location')">
{{ $t(columnsDef[4].text) }}
</div>
<div class="files-list__header__size" v-if="columns.some((column) => column.id === 'size')">
<div class="files-list__header__size" v-if="visibleColumnIds.includes('size')">
{{ $t(columnsDef[5].text) }}
<ColumnSorting
:sortOrder="
Expand All @@ -98,7 +108,7 @@
@set-active="activeHeadercolumnKey = $event"
/>
</div>
<div class="files-list__header__tags" v-if="columns.some((column) => column.id === 'tags')">
<div class="files-list__header__tags" v-if="visibleColumnIds.includes('tags')">
{{ $t(columnsDef[6].text) }}
<div v-if="columnsDef[6].filter" v-click-away="() => awayFromFilter(columnsDef[6])">
<BIMDataButton
Expand All @@ -117,7 +127,7 @@
<ColumnFilters
v-if="displayedColumnFilterId === columnsDef[6].id"
:column="columnsDef[6]"
:columnData="allFiles.map((file) => file[columnsDef[6].id])"
:columnData="formattedAllFiles.map((file) => file[columnsDef[6].id])"
:filters="
filters.find((filter) => filter.columnKey === columnsDef[6].id)?.columnFilters ?? []
"
Expand Down Expand Up @@ -149,14 +159,11 @@
<div class="files-list__element" :class="{ 'files-list__element--even': index % 2 === 0 }">
<div class="files-list__element__select">
<BIMDataCheckbox
:modelValue="selection.includes(file)"
:modelValue="selection.some((f) => f.id === file.id)"
@update:modelValue="onFileSelectionChange(file)"
/>
</div>
<div
class="files-list__element__type"
v-if="columns.some((column) => column.id === 'type')"
>
<div class="files-list__element__type" v-if="visibleColumnIds.includes('type')">
<FileTypeCell :project="project" :file="file" />
</div>
<div class="files-list__element__name">
Expand All @@ -171,39 +178,30 @@
</div>
<div
class="files-list__element__created-by"
v-if="columns.some((column) => column.id === 'created_by')"
v-if="visibleColumnIds.includes('created_by')"
>
{{
file.created_by ? `${file.created_by.firstname} ${file.created_by.lastname[0]}.` : "?"
}}
</div>
<div
class="files-list__element__last-update"
v-if="columns.some((column) => column.id === 'lastupdate')"
v-if="visibleColumnIds.includes('lastupdate')"
>
{{ $d(file.updated_at, "long") }}
</div>
<div
class="files-list__element__location"
v-if="columns.some((column) => column.id === 'location')"
>
<div class="files-list__element__location" v-if="visibleColumnIds.includes('location')">
<FilePathCell
:file="file"
:allFolders="allFolders"
@go-folders-view="$emit('go-folders-view')"
@file-clicked="$emit('file-clicked', $event)"
/>
</div>
<div
class="files-list__element__size"
v-if="columns.some((column) => column.id === 'size')"
>
<div class="files-list__element__size" v-if="visibleColumnIds.includes('size')">
{{ formatBytes(file.size) }}
</div>
<div
class="files-list__element__tags"
v-if="columns.some((column) => column.id === 'tags')"
>
<div class="files-list__element__tags" v-if="visibleColumnIds.includes('tags')">
<div>
<FileTagsCell :file="file" :parent="filesList" />
</div>
Expand Down Expand Up @@ -237,7 +235,7 @@ import { computed, reactive, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
import columnsDef, { columnsMD, columnsLG, columnsXL, columnsXXL } from "./columns.js";
import { useStandardBreakpoints } from "../../../../composables/responsive.js";
import { formatBytes } from "../../../../utils/files.js";
import { formatBytes, fileExtension } from "../../../../utils/files.js";
import useSortAndFilter from "./sortAndFilter.js";

// Components
Expand Down Expand Up @@ -301,9 +299,10 @@ export default {
const { isMD, isLG, isXL, isXXL } = useStandardBreakpoints();

const filesList = ref(null);
const visibleColumnIds = computed(() => columns.value.map((col) => col.id));

const columns = computed(() => {
let filteredColumns = columnsDef;
let filteredColumns = [...columnsDef];
if (isMD.value) {
filteredColumns = columnsMD.map((id) => filteredColumns.find((col) => col.id === id));
} else if (isLG.value) {
Expand All @@ -318,14 +317,28 @@ export default {
}));
});

const formattedAllFiles = computed(() => {
if (!Array.isArray(props.allFiles)) return [];

return props.allFiles.map((file) => ({
...file,
type:
file.nature === "folder"
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file.nature === "folder" doesn’t match the codebase’s folder nature ("Folder" / isFolder(file)). This will misclassify folders and produce incorrect type values for filtering/display. Use isFolder(file) or FILE_TYPE.FOLDER here.

Suggested change
file.nature === "folder"
file.nature === "Folder"

Copilot uses AI. Check for mistakes.
? t("t.folder")
: file.name
? fileExtension(file.name)?.replace(".", "").toUpperCase()
: t("t.file"),
}));
});

let nameEditMode;
watch(
() => props.files,
(files) => {
nameEditMode = reactive({});
files.forEach((row) => (nameEditMode[row.id] = false));
},
{ immediate: true }
{ immediate: true },
);

const {
Expand All @@ -338,7 +351,7 @@ export default {
updateFilters,
activeHeadercolumnKey,
filters,
} = useSortAndFilter(computed(() => props.allFiles));
} = useSortAndFilter(formattedAllFiles);

const onFileSelectionChange = (file) => {
let newSelection = null;
Expand All @@ -354,7 +367,7 @@ export default {
const mainSelectionCheckboxValue = computed(() => {
if (props.selection.length === 0) {
return false;
} else if (props.selection.length === props.allFiles.length) {
} else if (props.selection.length === displayedListFiles.value.length) {
return true;
} else {
return null;
Expand All @@ -363,7 +376,7 @@ export default {
const onMainSelectionCheckboxClick = (value) => {
let newSelection = null;
if (value) {
newSelection = props.allFiles;
newSelection = [...displayedListFiles.value];
} else {
newSelection = [];
}
Expand All @@ -376,14 +389,15 @@ export default {
columns,
mainSelectionCheckboxValue,
nameEditMode,
formattedAllFiles,
visibleColumnIds,
// Methods
formatBytes,
updateFilters,
onFileSelectionChange,
// List
filesList,
sortObject,
mainSelectionCheckboxValue,
onMainSelectionCheckboxClick,
activeHeadercolumnKey,
toggleSorting,
Expand Down
22 changes: 4 additions & 18 deletions src/components/specific/files/all-files-table/columns.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { fileExtension } from "../../../../utils/files.js";
import i18n from "../../../../i18n/index.js";
import { fullName } from "../../../../utils/users.js";

Expand All @@ -8,20 +7,7 @@ export default [
{
id: "type",
text: "t.type",
sortFunction: (a, b) => {
const getFileType = (file) => fileExtension(file.name);

const fileTypeA = getFileType(a);
const fileTypeB = getFileType(b);

if (fileTypeA < fileTypeB) {
return 1;
} else if (fileTypeA > fileTypeB) {
return -1;
} else {
return 0;
}
}
filter: true,
},
{
id: "name",
Expand All @@ -31,7 +17,7 @@ export default [
id: "created_by",
text: "t.createdBy",
filter: true,
filterFunction: rowData => rowData ? fullName(rowData) : t("t.notSpecified"),
filterFunction: (rowData) => (rowData ? fullName(rowData) : t("t.notSpecified")),
},
{
id: "lastupdate",
Expand All @@ -52,7 +38,7 @@ export default [
id: "size",
text: "t.size",
sortable: true,
defaultSortOrder: "asc"
defaultSortOrder: "asc",
},
{
id: "tags",
Expand All @@ -63,7 +49,7 @@ export default [
{
id: "actions",
label: " ",
}
},
];

export const columnsXXL = ["type", "name", "created_by", "lastupdate", "size", "actions"];
Expand Down
Loading
Loading