Skip to content

Other Organization Page #1519

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
pablo014 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Other Organization Page #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
026478a
fix(comps): fit size and add sort emit
pablo014 Nov 1, 2022
2475e98
fix(pages): apply changes for sort
pablo014 Nov 1, 2022
44b3130
fix(comps): make table sort also call change emit
pablo014 Nov 1, 2022
dc6236c
feat(pages): add links, sortability, and csv download
pablo014 Nov 1, 2022
d9b4948
fix(pages): sortability issue
pablo014 Nov 1, 2022
8d4652f
fix(pages): sortability issue
pablo014 Nov 1, 2022
2af5b19
fix(comps): make the table responsive
pablo014 Nov 2, 2022
e37ee6e
feat(sort): implement sort in request
pablo014 Nov 3, 2022
eecfabe
fix(pages): remove sort in other org
pablo014 Nov 7, 2022
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
128 changes: 71 additions & 57 deletions src/components/Table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="table-grid w-full">
<div class="table-grid w-full" :style="gridStyleTable">
<div
v-if="!hideHeader && $mq !== 'sm'"
class="header text-crisiscleanup-grey-700 bg-white"
Expand Down Expand Up @@ -29,86 +29,88 @@
}
"
>
<slot :name="`${column.key}-title`" :column="column">
<base-text
class="text-crisiscleanup-grey-700"
:class="column.titleClass && column.titleClass"
variant="h3"
regular
>
{{ $t(column.title) }}
</base-text>
</slot>
<div v-if="column.sortable">
<ccu-icon
v-if="
<div v-if="!column.hidden">
<slot :name="`${column.key}-title`" :column="column">
<base-text
class="text-crisiscleanup-grey-700"
:class="column.titleClass && column.titleClass"
variant="h3"
regular
>
{{ $t(column.title) }}
</base-text>
</slot>
<div v-if="column.sortable">
<ccu-icon
v-if="
sorter.key === (column.sortKey || column.key) &&
sorter.direction === 'asc'
"
:alt="$t('actions.sort_ascending')"
size="small"
type="up"
/>
<ccu-icon
v-else-if="
:alt="$t('actions.sort_ascending')"
size="small"
type="up"
/>
<ccu-icon
v-else-if="
sorter.key === (column.sortKey || column.key) &&
sorter.direction === 'desc'
"
:alt="$t('actions.sort_descending')"
size="small"
type="down"
/>
<ccu-icon
v-else
:alt="$t('actions.sortable')"
size="small"
type="updown"
/>
:alt="$t('actions.sort_descending')"
size="small"
type="down"
/>
<ccu-icon
v-else
:alt="$t('actions.sortable')"
size="small"
type="updown"
/>
</div>
</div>
</div>
<template v-if="enableColumnSearch">
<div
v-for="column of columns"
:key="`search-${column.key}`"
class="
<template v-if="enableColumnSearch">
<div
v-for="column of columns"
:key="`search-${column.key}`"
class="
p-2
border-b
flex
items-center
cursor-pointer
bg-crisiscleanup-light-grey
"
>
<template v-if="column.searchable">
<form-select
v-if="column.searchSelect"
class="w-64 bg-white border h-10 border-crisiscleanup-dark-100"
:options="column ? column.getSelectValues(data) : []"
item-key="value"
label="name_t"
:value="columnSearch[column.key]"
@input="
>
<template v-if="column.searchable">
<form-select
v-if="column.searchSelect"
class="w-64 bg-white border h-10 border-crisiscleanup-dark-100"
:options="column ? column.getSelectValues(data) : []"
item-key="value"
label="name_t"
:value="columnSearch[column.key]"
@input="
(value) => {
columnSearch[column.key] = value;
onSearch();
}
"
></form-select>
<base-input
v-else
:placeholder="column.title"
:value="columnSearch[column.key]"
@input="
></form-select>
<base-input
v-else
:placeholder="column.title"
:value="columnSearch[column.key]"
@input="
(value) => {
columnSearch[column.key] = value;
onSearch();
}
"
input-style="width: 100%"
></base-input>
</template>
input-style="width: 100%"
></base-input>
</template>
</div>
</template>
</div>
</template>
</div>
<div class="body bg-white relative" :style="gridStyleBody">
<div
Expand Down Expand Up @@ -170,7 +172,7 @@
:style="column.style || []"
@click="handleColumnAction(column, item[column.key], item)"
>
<slot :name="column.key" :item="item">
<slot :name="column.key" :item="item" v-if="!column.hidden">
<span v-if="$mq === 'sm'" class="font-semibold mr-2">
{{ column.title }}:
</span>
Expand Down Expand Up @@ -336,6 +338,12 @@ export default {
return {};
},
},
tableStyle: {
type: Object,
default: () => {
return {};
},
},
},
data() {
return {
Expand Down Expand Up @@ -431,6 +439,11 @@ export default {
...this.rowStyle,
};
},
gridStyleTable() {
return {
...this.tableStyle,
};
},
},
mounted() {},
methods: {
Expand Down Expand Up @@ -516,6 +529,7 @@ export default {
this.logEvent(
sorter.direction === 'asc' ? 'user_ui-sort-asc' : 'user_ui-sort-desc',
);
this.$emit('sort', { pagination, filter, sorter, columnSearch });
this.$emit('change', { pagination, filter, sorter, columnSearch });
},
onSearch() {
Expand Down
Loading