浏览代码

prettier fixes

Olivier Massot 1 年之前
父节点
当前提交
3542123375

+ 15 - 10
composables/data/useEntityFetch.ts

@@ -1,11 +1,14 @@
 import type { AsyncData } from '#app'
 import type { ComputedRef, Ref } from 'vue'
 import { v4 as uuid4 } from 'uuid'
+import type {
+  AsyncDataExecuteOptions,
+  AsyncDataRequestStatus,
+} from '#app/composables/asyncData'
 import { useEntityManager } from '~/composables/data/useEntityManager'
 import ApiResource from '~/models/ApiResource'
 import type { Collection } from '~/types/data'
 import Query from '~/services/data/Query'
-import type {AsyncDataExecuteOptions, AsyncDataRequestStatus} from "#app/composables/asyncData";
 
 interface useEntityFetchReturnType {
   fetch: (
@@ -18,11 +21,13 @@ interface useEntityFetchReturnType {
     parent?: ApiResource | null,
     query?: Query | null,
   ) => {
-    data: ComputedRef<Collection | null>,
-    pending: Ref<boolean>,
-    refresh: (opts?: AsyncDataExecuteOptions) => Promise<ComputedRef<Collection> | null>,
-    error: Ref<Error | null>,
-    status: Ref<AsyncDataRequestStatus>,
+    data: ComputedRef<Collection | null>
+    pending: Ref<boolean>
+    refresh: (
+      opts?: AsyncDataExecuteOptions,
+    ) => Promise<ComputedRef<Collection> | null>
+    error: Ref<Error | null>
+    status: Ref<AsyncDataRequestStatus>
   }
 
   getRef: <T extends ApiResource>(
@@ -49,18 +54,18 @@ export const useEntityFetch = (
     parent: ApiResource | null = null,
     query: Query | null = null,
   ) => {
-    const {data, pending, refresh, error, status } = useAsyncData(
+    const { data, pending, refresh, error, status } = useAsyncData(
       model.entity + '_many_' + uuid4(),
       () => em.fetchCollection(model, parent, query),
-      {lazy, deep: true},
+      { lazy, deep: true },
     )
 
     return {
-      data: computed(() => data.value !== null ? data.value.value : null),
+      data: computed(() => (data.value !== null ? data.value.value : null)),
       pending,
       refresh,
       error,
-      status
+      status,
     }
   }
 

+ 3 - 3
models/Organization/Subdomain.ts

@@ -1,7 +1,7 @@
-import {Attr, Bool, Str, Uid} from 'pinia-orm/dist/decorators'
+import { Attr, Bool, Str, Uid } from 'pinia-orm/dist/decorators'
 import ApiModel from '~/models/ApiModel'
-import {IriEncoded} from "~/models/decorators";
-import Organization from "~/models/Organization/Organization";
+import { IriEncoded } from '~/models/decorators'
+import Organization from '~/models/Organization/Organization'
 
 /**
  * AP2i Model : Subdomain

+ 8 - 4
pages/parameters/attendances.vue

@@ -40,7 +40,10 @@
           </tr>
         </thead>
         <tbody v-if="attendanceBookingReasons!.items.length > 0">
-          <tr v-for="reason in attendanceBookingReasons!.items" :key="reason.id">
+          <tr
+            v-for="reason in attendanceBookingReasons!.items"
+            :key="reason.id"
+          >
             <td class="cycle-editable-cell">
               {{ reason.reason }}
             </td>
@@ -103,9 +106,10 @@ const { data: parameters, pending } = fetch(
 
 const { fetchCollection } = useEntityFetch()
 
-const { data: attendanceBookingReasons, pending: attendanceBookingReasonsPending } = fetchCollection(
-  AttendanceBookingReason,
-)
+const {
+  data: attendanceBookingReasons,
+  pending: attendanceBookingReasonsPending,
+} = fetchCollection(AttendanceBookingReason)
 
 const goToEditPage = (id: number) => {
   navigateTo(UrlUtils.join('/parameters/attendance_booking_reasons', id))

+ 0 - 3
pages/parameters/education_timings/index.vue

@@ -52,11 +52,8 @@
 </template>
 
 <script setup lang="ts">
-import { useRepo } from 'pinia-orm'
-import type { ComputedRef } from 'vue'
 import { useEntityFetch } from '~/composables/data/useEntityFetch'
 import EducationTiming from '~/models/Education/EducationTiming'
-import EducationTimingsRepository from '~/stores/repositories/EducationTimingsRepository'
 import { useOrganizationProfileStore } from '~/stores/organizationProfile'
 import UrlUtils from '~/services/utils/urlUtils'
 

+ 4 - 1
pages/parameters/residence_areas/index.vue

@@ -10,7 +10,10 @@
           </tr>
         </thead>
         <tbody v-if="residenceAreas!.items.length > 0">
-          <tr v-for="residenceArea in residenceAreas!.items" :key="residenceArea.id">
+          <tr
+            v-for="residenceArea in residenceAreas!.items"
+            :key="residenceArea.id"
+          >
             <td class="cycle-editable-cell">
               {{ residenceArea.label }}
             </td>

+ 2 - 4
pages/parameters/website.vue

@@ -146,7 +146,7 @@ import { useEntityFetch } from '~/composables/data/useEntityFetch'
 import Subdomain from '~/models/Organization/Subdomain'
 import ApiResource from '~/models/ApiResource'
 import EqualFilter from '~/services/data/Filters/EqualFilter'
-import Query from "~/services/data/Query";
+import Query from '~/services/data/Query'
 
 const { fetch, fetchCollection } = useEntityFetch()
 
@@ -161,9 +161,7 @@ const { data: parameters, pending } = fetch(
   organizationProfile.parametersId,
 ) as AsyncData<ApiResource | null, Error | null>
 
-const query = new Query(
-  new EqualFilter('organization', organizationProfile.id)
-)
+const query = new Query(new EqualFilter('organization', organizationProfile.id))
 
 const { data: subdomains, pending: subdomainsPending } = fetchCollection(
   Subdomain,

+ 2 - 4
services/data/Query.ts

@@ -1,9 +1,8 @@
 import type { Query as PiniaOrmQuery } from 'pinia-orm'
 import type { ApiFilter } from '~/types/data'
 import type ApiResource from '~/models/ApiResource'
-import ObjectUtils from "~/services/utils/objectUtils";
-import PageFilter from "~/services/data/Filters/PageFilter";
-import OrderBy from "~/services/data/Filters/OrderBy";
+import PageFilter from '~/services/data/Filters/PageFilter'
+import OrderBy from '~/services/data/Filters/OrderBy'
 
 /**
  * A Query to filter and sort ApiResources.
@@ -54,7 +53,6 @@ export default class Query {
   public applyToPiniaOrmQuery(
     query: PiniaOrmQuery<ApiResource>,
   ): PiniaOrmQuery<ApiResource> {
-
     // 'Where' filters shall be applied first, then orderBy filters, and finally pagination
     const where: ApiFilter[] = []
     const orderBy: ApiFilter[] = []

+ 8 - 2
services/data/apiRequestService.ts

@@ -21,7 +21,10 @@ class ApiRequestService {
    * @param url
    * @param query
    */
-  public async get(url: string, query: AssociativeArray | string | null = null) {
+  public async get(
+    url: string,
+    query: AssociativeArray | string | null = null,
+  ) {
     return await this.request(HTTP_METHOD.GET, url, null, query)
   }
 
@@ -61,7 +64,10 @@ class ApiRequestService {
    * @param url
    * @param query
    */
-  public async delete(url: string, query: AssociativeArray | string | null = null) {
+  public async delete(
+    url: string,
+    query: AssociativeArray | string | null = null,
+  ) {
     return await this.request(HTTP_METHOD.DELETE, url, null, query)
   }