Progress
Total
{{
- metrics.progress | percent
+ datasetMetrics.progress | percent
}}
- /{{ metrics.total }}
+ /{{ datasetMetrics.total }}
import { RecordStatus } from "~/v1/domain/entities/record/RecordStatus";
+import { useFeedbackTaskProgressViewModel } from "./useFeedbackTaskProgressViewModel";
export default {
props: {
- metrics: {
- type: Object,
+ datasetId: {
+ type: String,
required: true,
},
},
@@ -78,22 +79,22 @@ export default {
{
name: RecordStatus.pending.name,
color: this.pendingColor,
- progress: this.metrics.pending,
+ progress: this.datasetMetrics.pending,
},
{
name: RecordStatus.draft.name,
color: this.draftColor,
- progress: this.metrics.draft,
+ progress: this.datasetMetrics.draft,
},
{
name: RecordStatus.submitted.name,
color: this.submittedColor,
- progress: this.metrics.submitted,
+ progress: this.datasetMetrics.submitted,
},
{
name: RecordStatus.discarded.name,
color: this.discardedColor,
- progress: this.metrics.discarded,
+ progress: this.datasetMetrics.discarded,
},
];
},
@@ -115,8 +116,12 @@ export default {
return progress && this.$options.filters.formatNumber(progress);
},
},
+ setup(props) {
+ return useFeedbackTaskProgressViewModel(props);
+ },
};
+
diff --git a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/IconButton.vue b/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/IconButton.vue
deleted file mode 100644
index bcdc1caa6f..0000000000
--- a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/IconButton.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTask.vue b/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTask.vue
deleted file mode 100644
index a226736516..0000000000
--- a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTask.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskButtonGroup.vue b/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskButtonGroup.vue
deleted file mode 100644
index 755342a774..0000000000
--- a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskButtonGroup.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskPanel.vue b/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskPanel.vue
deleted file mode 100644
index 05065f7a28..0000000000
--- a/argilla-frontend/components/features/annotation/sidebar/sidebar-feedback-task/SidebarFeedbackTaskPanel.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/datasets/DatasetsTable.vue b/argilla-frontend/components/features/datasets/DatasetsTable.vue
index fecfc89ff1..40d6ffaec1 100644
--- a/argilla-frontend/components/features/datasets/DatasetsTable.vue
+++ b/argilla-frontend/components/features/datasets/DatasetsTable.vue
@@ -209,7 +209,7 @@ export default {
.container {
display: flex;
justify-content: center;
- padding: 0 calc($sidebarMenuWidth + 4em) 0 4em;
+ padding: 0 4em;
@include media("<=tablet") {
padding: 0 $base-space * 2;
}
@@ -221,6 +221,9 @@ export default {
padding: 0 $base-space * 6;
display: flex;
flex-direction: column;
+ @include media("<=tablet") {
+ padding: 0;
+ }
}
}
.interactions {
diff --git a/argilla-frontend/components/features/global/sidebar/SidebarButton.vue b/argilla-frontend/components/features/global/sidebar/SidebarButton.vue
deleted file mode 100644
index 1ead6582b1..0000000000
--- a/argilla-frontend/components/features/global/sidebar/SidebarButton.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/global/sidebar/SidebarMenu.vue b/argilla-frontend/components/features/global/sidebar/SidebarMenu.vue
deleted file mode 100644
index 15cd373d5b..0000000000
--- a/argilla-frontend/components/features/global/sidebar/SidebarMenu.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/argilla-frontend/components/features/global/sidebar/SidebarPanel.vue b/argilla-frontend/components/features/global/sidebar/SidebarPanel.vue
deleted file mode 100644
index 8587023223..0000000000
--- a/argilla-frontend/components/features/global/sidebar/SidebarPanel.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-
diff --git a/argilla-frontend/layouts/AnnotationPage.vue b/argilla-frontend/layouts/AnnotationPage.vue
new file mode 100644
index 0000000000..cd26301d83
--- /dev/null
+++ b/argilla-frontend/layouts/AnnotationPage.vue
@@ -0,0 +1,46 @@
+
+
+
+
+ here is the center content
+
+
+
+
+
+
+
diff --git a/argilla-frontend/layouts/HeaderAndTopAndOneColumn.vue b/argilla-frontend/layouts/HeaderAndTopAndOneColumn.vue
deleted file mode 100644
index 6c1a600d18..0000000000
--- a/argilla-frontend/layouts/HeaderAndTopAndOneColumn.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
- here is the center content
-
-
-
-
-
-
-
diff --git a/argilla-frontend/pages/dataset/_id/annotation-mode/index.component.spec.js b/argilla-frontend/pages/dataset/_id/annotation-mode/index.component.spec.js
index 22dd3f3326..55994e600e 100644
--- a/argilla-frontend/pages/dataset/_id/annotation-mode/index.component.spec.js
+++ b/argilla-frontend/pages/dataset/_id/annotation-mode/index.component.spec.js
@@ -1,6 +1,6 @@
import { shallowMount } from "@vue/test-utils";
import AnnotationModePage from "./index";
-import HeaderAndTopAndOneColumn from "@/layouts/HeaderAndTopAndOneColumn";
+import AnnotationPage from "@/layouts/AnnotationPage";
import { setActivePinia, createPinia } from "pinia";
import { GetDatasetByIdUseCase } from "@/v1/domain/usecases/get-dataset-by-id-use-case";
import { useResolveMock } from "~/v1/di/__mocks__/useResolveMock";
@@ -33,7 +33,6 @@ describe("AnnotationModePage", () => {
"DatasetFilters",
"PaginationFeedbackTask",
"BaseModal",
- "DatasetTrainComponent",
"BaseLoading",
"PersistentStorageBanner",
],
@@ -52,9 +51,7 @@ describe("AnnotationModePage", () => {
expect(wrapper.is(AnnotationModePage)).toBe(true);
- const headerComponentWrapper = wrapper.findComponent(
- HeaderAndTopAndOneColumn
- );
+ const headerComponentWrapper = wrapper.findComponent(AnnotationPage);
expect(headerComponentWrapper.exists()).toBeTruthy();
});
@@ -67,7 +64,6 @@ describe("AnnotationModePage", () => {
"DatasetFilters",
"PaginationFeedbackTask",
"BaseModal",
- "DatasetTrainComponent",
"BaseLoading",
"PersistentStorageBanner",
],
@@ -85,9 +81,7 @@ describe("AnnotationModePage", () => {
const wrapper = shallowMount(AnnotationModePage, options);
expect(wrapper.is(AnnotationModePage)).toBe(true);
- const headerComponentWrapper = wrapper.findComponent(
- HeaderAndTopAndOneColumn
- );
+ const headerComponentWrapper = wrapper.findComponent(AnnotationPage);
expect(headerComponentWrapper.exists()).toBeTruthy();
});
diff --git a/argilla-frontend/pages/dataset/_id/annotation-mode/index.vue b/argilla-frontend/pages/dataset/_id/annotation-mode/index.vue
index ca6e8cd9d6..d8059047e2 100644
--- a/argilla-frontend/pages/dataset/_id/annotation-mode/index.vue
+++ b/argilla-frontend/pages/dataset/_id/annotation-mode/index.vue
@@ -1,68 +1,32 @@