Skip to content

Commit 0e88ede

Browse files
authored
🔀 Task distribution UI/QA issues fixed (#5283)
- [x] When device is small, show “No record message” area reduced (around 20px height?) - [x] The % of completed is different from dataset list to dataset page - [x] Maintain “GUIDELINES” title when the quadrant is open - [x] Pending, Draft, Discard, Submit
1 parent d436da9 commit 0e88ede

File tree

7 files changed

+44
-29
lines changed

7 files changed

+44
-29
lines changed

argilla-frontend/components/base/base-collpasable-panel/BaseCollapsablePanel.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div
33
class="panel"
44
:class="[
5-
isExpanded ? '--expanded' : '--collapsed',
5+
!isExpanded ? '--collapsed' : undefined,
66
hideOnDesktop ? '--mobile' : undefined,
77
]"
88
>
@@ -63,6 +63,10 @@ export default {
6363
display: flex;
6464
justify-content: space-between;
6565
align-items: center;
66+
67+
@include media("<desktop") {
68+
height: $base-space * 3;
69+
}
6670
}
6771
6872
width: 100%;
@@ -95,6 +99,12 @@ export default {
9599
}
96100
}
97101
102+
.--collapsed {
103+
@include media("<desktop") {
104+
max-height: 6vh;
105+
}
106+
}
107+
98108
.--mobile {
99109
@include media(">=desktop") {
100110
display: none !important;

argilla-frontend/components/base/base-resizable/VerticalResizable.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ $resizable-bar-width: $base-space;
139139
height: 100%;
140140
margin-left: calc(-#{$resizable-bar-width} / 2);
141141
@include media("<desktop") {
142+
align-items: flex-end;
142143
min-width: 100% !important;
143144
height: auto !important;
144145
margin-left: 0;

argilla-frontend/components/features/annotation/container/mode/BulkAnnotation.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,13 @@ export default {
496496
}
497497
&--empty {
498498
width: 100%;
499-
height: 100%;
499+
height: 80vh;
500500
display: flex;
501501
align-items: center;
502502
justify-content: center;
503-
@include media("<desktop") {
504-
height: 80vh;
503+
@include media("<=tablet") {
504+
height: 100%;
505+
text-align: center;
505506
}
506507
}
507508
}

argilla-frontend/components/features/annotation/container/mode/FocusAnnotation.vue

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@
3636
</div>
3737
</section>
3838
</template>
39-
4039
<template #downHeader>
4140
<p v-text="$t('guidelines')" />
4241
</template>
42+
<template #downHeaderExpanded>
43+
<p v-text="$t('guidelines')" />
44+
</template>
4345
<template #downContent>
4446
<AnnotationGuidelines />
4547
</template>
@@ -169,7 +171,7 @@ export default {
169171
&__right {
170172
@include media("<desktop") {
171173
overflow: visible;
172-
height: auto !important;
174+
height: 100% !important;
173175
max-height: none !important;
174176
}
175177
}
@@ -203,12 +205,13 @@ export default {
203205
}
204206
&--empty {
205207
width: 100%;
206-
height: 100%;
208+
height: 80vh;
207209
display: flex;
208210
align-items: center;
209211
justify-content: center;
210-
@include media("<desktop") {
211-
height: 80vh;
212+
@include media("<=tablet") {
213+
height: 100%;
214+
text-align: center;
212215
}
213216
}
214217
}

argilla-frontend/components/features/annotation/header/StatusFilter.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ export default {
5151
name: this.$t(`recordStatus.${RecordStatus.draft.name}`),
5252
color: RecordStatus.draft.color,
5353
},
54-
{
55-
id: RecordStatus.submitted.name,
56-
name: this.$t(`recordStatus.${RecordStatus.submitted.name}`),
57-
color: RecordStatus.submitted.color,
58-
},
5954
{
6055
id: RecordStatus.discarded.name,
6156
name: this.$t(`recordStatus.${RecordStatus.discarded.name}`),
6257
color: RecordStatus.discarded.color,
6358
},
59+
{
60+
id: RecordStatus.submitted.name,
61+
name: this.$t(`recordStatus.${RecordStatus.submitted.name}`),
62+
color: RecordStatus.submitted.color,
63+
},
6464
],
6565
};
6666
},

argilla-frontend/components/features/annotation/progress/AnnotationProgressDetailed.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ export default {
5757
progressItems() {
5858
return [
5959
{
60-
name: RecordStatus.submitted.name,
61-
color: RecordStatus.submitted.color,
62-
value: this.metrics.submitted,
63-
percent: this.metrics.percentage.submitted,
60+
name: RecordStatus.pending.name,
61+
color: RecordStatus.pending.color,
62+
value: this.metrics.pending,
63+
percent: this.metrics.percentage.pending,
6464
},
6565
{
6666
name: RecordStatus.draft.name,
@@ -75,10 +75,10 @@ export default {
7575
percent: this.metrics.percentage.discarded,
7676
},
7777
{
78-
name: RecordStatus.pending.name,
79-
color: RecordStatus.pending.color,
80-
value: this.metrics.pending,
81-
percent: this.metrics.percentage.pending,
78+
name: RecordStatus.submitted.name,
79+
color: RecordStatus.submitted.color,
80+
value: this.metrics.submitted,
81+
percent: this.metrics.percentage.submitted,
8282
},
8383
];
8484
},

argilla-frontend/components/features/datasets/dataset-progress/useDatasetProgressViewModel.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useResolve } from "ts-injecty";
22
import { onBeforeMount, ref } from "@nuxtjs/composition-api";
33
import { GetDatasetProgressUseCase } from "@/v1/domain/usecases/get-dataset-progress-use-case";
44
import { useTranslate } from "~/v1/infrastructure/services/useTranslate";
5-
import { useTeamProgress } from "~/v1/infrastructure/storage/TeamProgressStorage";
5+
import { Progress } from "~/v1/domain/entities/dataset/Progress";
66

77
export const useDatasetProgressViewModel = ({
88
datasetId,
@@ -11,28 +11,28 @@ export const useDatasetProgressViewModel = ({
1111
}) => {
1212
const t = useTranslate();
1313
const isLoaded = ref(false);
14+
const progress = ref<Progress | null>(null);
1415
const progressRanges = ref([]);
1516

16-
const { state: progress } = useTeamProgress();
1717
const getProgressUseCase = useResolve(GetDatasetProgressUseCase);
1818

1919
onBeforeMount(async () => {
20-
await getProgressUseCase.execute(datasetId);
20+
progress.value = await getProgressUseCase.execute(datasetId);
2121

2222
progressRanges.value = [
2323
{
2424
id: "completed",
2525
name: t("datasets.completed"),
2626
color: "linear-gradient(90deg, #6A6A6C 0%, #252626 100%)",
27-
value: progress.completed,
28-
tooltip: `${progress.completed}/${progress.total}`,
27+
value: progress.value.completed,
28+
tooltip: `${progress.value.completed}/${progress.value.total}`,
2929
},
3030
{
3131
id: "pending",
3232
name: t("datasets.left"),
3333
color: "#e6e6e6",
34-
value: progress.pending,
35-
tooltip: `${progress.pending}/${progress.total}`,
34+
value: progress.value.pending,
35+
tooltip: `${progress.value.pending}/${progress.value.total}`,
3636
},
3737
];
3838

0 commit comments

Comments
 (0)