Refactor code: Remove console.log statements and fix column width in RKeluhan_ALL.vue

src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue

@@ -51,9 +51,8 @@
         css-class="custom-table-column"
         :width="100"
         alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
         data-type="number"
-        data-field="no"
+        data-field="number"
         caption="No"
         cell-template="formatNumber"
       />
@@ -917,7 +916,11 @@ import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { queries } from '@/utils/api/api.graphql'
 import { dummyData } from '@/utils/dummy'
 import { formatNumber, isNumber, formatPercentage } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -931,38 +934,36 @@ const closedialogDetail = () => (dialogDetail.value = false)
 const loadingData = ref(false)
 const loadingSubData = ref(false)
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.keluhan.rekap.keluhanPerJenisKeluhan,
-  {
-    dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
-    dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0
-  }
-)
-
 const filterData = (params: any) => {
   const dateValue = params.periode.split(' s/d ')
   const { ulp, uid, up3 } = params
 
-  refetch({
-    dateFrom: dateValue[0]
-      ? dateValue[0].split('-').reverse().join('-')
-      : new Date().toISOString().slice(0, 10),
-    dateTo: dateValue[1]
-      ? dateValue[1].split('-').reverse().join('-')
-      : new Date().toISOString().slice(0, 10),
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.keluhan.rekap.keluhanPerJenisKeluhan,
+    {
+      dateFrom: dateValue[0]
+        ? dateValue[0].split('-').reverse().join('-')
+        : new Date().toISOString().slice(0, 10),
+      dateTo: dateValue[1]
+        ? dateValue[1].split('-').reverse().join('-')
+        : new Date().toISOString().slice(0, 10),
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      data.value = queryResult.data.rekapitulasiKeluhanPerJenisKeluhan
+      data.value = [...queryResult.data.rekapitulasiKeluhanPerJenisKeluhan]
+        .sort((a: any, b: any) => a.tipe_keluhan.localeCompare(b.tipe_keluhan))
+        .map((item: any, index: number) => {
+          return {
+            ...item,
+            number: index + 1
+          }
+        })
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
@@ -975,7 +976,39 @@ const filterData = (params: any) => {
 }
 
 const getDetail = () => {
-  // dataSub.value = dummyData.keluhan.rekap.rekapitulasiKeluhanPerJenisKeluhan
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
 }
 
 const dataGridRef = ref<DxDataGrid | null>(null)
@@ -985,6 +1018,7 @@ const clearSelection = () => {
 }
 const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
   dialogDetail.value = true
   getDetail()
 }
@@ -1021,21 +1055,27 @@ const onExporting = (e: any) => {
 const onDataSelectionChanged = ({ selectedRowsData }: any) => {
   if (selectedRowsData[0] != undefined) {
     dataSelected.value = selectedRowsData[0]
+    showDetail()
   }
-  showDetail()
 }
 
 const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
   const data = selectedRowsData[0]
   dataSubSelected.value = data
-  console.log(data)
 }
 
 const filters = ref()
 
 onMounted(() => {
   if (import.meta.env.DEV) {
-    data.value = dummyData.keluhan.rekap.rekapitulasiKeluhanPerJenisKeluhan
+    data.value = [...dummyData.keluhan.rekap.rekapitulasiKeluhanPerJenisKeluhan]
+      .sort((a: any, b: any) => a.tipe_keluhan.localeCompare(b.tipe_keluhan))
+      .map((item: any, index: number) => {
+        return {
+          ...item,
+          number: index + 1
+        }
+      })
   }
 })
 </script>