From 4dd53f81994f801f3fff95c30b0d74575a20daa7 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sun, 31 Dec 2023 23:26:02 +0530 Subject: [PATCH] fix: implemented ViewControls for Organizations --- frontend/src/pages/Organizations.vue | 109 +++------------------------ 1 file changed, 12 insertions(+), 97 deletions(-) diff --git a/frontend/src/pages/Organizations.vue b/frontend/src/pages/Organizations.vue index 2fe5a1c5..cc545a37 100644 --- a/frontend/src/pages/Organizations.vue +++ b/frontend/src/pages/Organizations.vue @@ -13,36 +13,16 @@ -
-
- - - -
-
- - - -
-
+ -
+
@@ -60,10 +40,8 @@ import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue' import LayoutHeader from '@/components/LayoutHeader.vue' import OrganizationModal from '@/components/Modals/OrganizationModal.vue' import OrganizationsListView from '@/components/ListViews/OrganizationsListView.vue' -import SortBy from '@/components/SortBy.vue' -import Filter from '@/components/Filter.vue' -import ViewSettings from '@/components/ViewSettings.vue' -import { FeatherIcon, Breadcrumbs, Dropdown, createResource } from 'frappe-ui' +import ViewControls from '@/components/ViewControls.vue' +import { FeatherIcon, Breadcrumbs } from 'frappe-ui' import { dateFormat, dateTooltipFormat, @@ -78,7 +56,7 @@ const route = useRoute() const showOrganizationModal = ref(false) const currentOrganization = computed(() => { - return organizations.data?.data?.find( + return organizations.value?.data?.data?.find( (organization) => organization.name === route.params.organizationId ) }) @@ -96,33 +74,13 @@ const breadcrumbs = computed(() => { return items }) -const currentView = ref({ - label: 'List', - icon: 'list', -}) - -function getParams() { - const filters = {} - const order_by = 'modified desc' - - return { - doctype: 'CRM Organization', - filters: filters, - order_by: order_by, - } -} - -const organizations = createResource({ - url: 'crm.api.doc.get_list_data', - params: getParams(), - auto: true, -}) +const organizations = ref({}) const rows = computed(() => { - if (!organizations.data?.data) return [] - return organizations.data.data.map((organization) => { + if (!organizations.value?.data?.data) return [] + return organizations.value?.data.data.map((organization) => { let _rows = {} - organizations.data.rows.forEach((row) => { + organizations.value?.data.rows.forEach((row) => { _rows[row] = organization[row] if (row === 'organization_name') { @@ -145,49 +103,6 @@ const rows = computed(() => { }) }) -const viewsDropdownOptions = [ - { - label: 'List', - icon: 'list', - onClick() { - currentView.value = { - label: 'List', - icon: 'list', - } - }, - }, - { - label: 'Table', - icon: 'grid', - onClick() { - currentView.value = { - label: 'Table', - icon: 'grid', - } - }, - }, - { - label: 'Calender', - icon: 'calendar', - onClick() { - currentView.value = { - label: 'Calender', - icon: 'calendar', - } - }, - }, - { - label: 'Board', - icon: 'columns', - onClick() { - currentView.value = { - label: 'Board', - icon: 'columns', - } - }, - }, -] - function website(url) { return url && url.replace(/^(?:https?:\/\/)?(?:www\.)?/i, '') }