Skip to content

fix(EG-382): fix tables UI for empty state #38

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

Merged
simondib merged 2 commits into from
Apr 16, 2024
Merged

fix(EG-382): fix tables UI for empty state #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f2f19
feat: add loading state to table + correctly handle empty states
Apr 16, 2024
011c6d3
fix(EG-382): pagination display logic
Apr 16, 2024
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
51 changes: 28 additions & 23 deletions packages/front-end/src/app/pages/labs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
const pageFrom = computed(() => (page.value - 1) * pageCount.value + 1);
const pageTo = computed(() => Math.min(page.value * pageCount.value, pageTotal.value));

useFetch(async () => {
onMounted(async () => {
try {
labData.value = await $api.labs.list(MOCK_ORG_ID);
if (!labData.value.length) {
Expand Down Expand Up @@ -82,28 +82,34 @@
button-label="Create a new Lab"
/>

<template v-if="!loading && !hasNoData">
<UCard
class="rounded-2xl border-none shadow-none"
:ui="{
body: 'p-0',
}"
<UCard
v-else
class="rounded-2xl border-none shadow-none"
:ui="{
body: 'p-0',
}"
>
<UTable
class="LabsTable rounded-2xl"
:rows="sortedData"
:columns="columns"
:key="sortedData"
:loading="isLoading"
:loading-state="{ icon: '', label: '' }"
>
<UTable class="LabsTable rounded-2xl" :rows="sortedData" :columns="columns">
<template #actions-data="{ row }">
<EGActionButton :items="actionItems(row)" />
</template>
<template #empty-state>&nbsp;</template>
</UTable>
</UCard>

<div class="text-muted flex h-16 flex-wrap items-center justify-between">
<div class="text-xs leading-5">Showing {{ pageFrom }} to {{ pageTo }} results</div>
<div class="flex justify-end px-3" v-if="pageTotal > pageCount">
<UPagination v-model="page" :page-count="10" :total="labData.length" />
</div>
<template #actions-data="{ row }">
<EGActionButton :items="actionItems(row)" />
</template>
<template #empty-state>&nbsp;</template>
</UTable>
</UCard>

<div class="text-muted flex h-16 flex-wrap items-center justify-between" v-if="!isLoading && !hasNoData">
<div class="text-xs leading-5">Showing {{ pageFrom }} to {{ pageTo }} results</div>
<div class="flex justify-end px-3" v-if="pageTotal > pageCount">
<UPagination v-model="page" :page-count="10" :total="labData.length" />
</div>
</template>
</div>
</template>

<style>
Expand All @@ -120,11 +126,11 @@
}

tr {
height: 50px;
background-color: #efefef;

th:first-child {
padding-left: 40px;
width: 400px;
}
}
}
Expand All @@ -136,7 +142,6 @@
}

tbody tr td:nth-child(2) {
min-width: 500px;
font-size: 12px;
color: #818181;
}
Expand Down
51 changes: 28 additions & 23 deletions packages/front-end/src/app/pages/organizations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
],
];

useFetch(async () => {
onMounted(async () => {
try {
orgData.value = await $api.orgs.list(MOCK_ORG_ID);
if (!orgData.value.length) {
Expand Down Expand Up @@ -82,28 +82,34 @@
button-label="Create a new Organization"
/>

<template v-if="!loading && !hasNoData">
<UCard
class="rounded-2xl border-none shadow-none"
:ui="{
body: 'p-0',
}"
<UCard
v-else
class="rounded-2xl border-none shadow-none"
:ui="{
body: 'p-0',
}"
>
<UTable
class="LabsTable rounded-2xl"
:rows="sortedData"
:columns="columns"
:key="sortedData"
:loading="isLoading"
:loading-state="{ icon: '', label: '' }"
>
<UTable class="LabsTable rounded-2xl" :rows="sortedData" :columns="columns">
<template #actions-data="{ row }">
<EGActionButton :items="actionItems(row)" />
</template>
<template #empty-state>&nbsp;</template>
</UTable>
</UCard>

<div class="text-muted flex h-16 flex-wrap items-center justify-between">
<div class="text-xs leading-5">Showing {{ pageFrom }} to {{ pageTo }} results</div>
<div class="flex justify-end px-3" v-if="pageTotal > pageCount">
<UPagination v-model="page" :page-count="10" :total="labData.length" />
</div>
<template #actions-data="{ row }">
<EGActionButton :items="actionItems(row)" />
</template>
<template #empty-state>&nbsp;</template>
</UTable>
</UCard>

<div class="text-muted flex h-16 flex-wrap items-center justify-between" v-if="!isLoading && !hasNoData">
<div class="text-xs leading-5">Showing {{ pageFrom }} to {{ pageTo }} results</div>
<div class="flex justify-end px-3" v-if="pageTotal > pageCount">
<UPagination v-model="page" :page-count="10" :total="orgData.length" />
</div>
</template>
</div>
</template>

<style>
Expand All @@ -120,11 +126,11 @@
}

tr {
height: 50px;
background-color: #efefef;

th:first-child {
padding-left: 40px;
min-width: 400px;
}
}
}
Expand All @@ -136,7 +142,6 @@
}

tbody tr td:nth-child(2) {
min-width: 500px;
font-size: 12px;
color: #818181;
}
Expand Down