Update path for agents in useMenu.ts and router.push in identities/index.vue and identityForm/actions.vue

tacxou · tacxou · commit 43776aae6552 · 2024-05-15T15:56:03.000+02:00
diff --git a/src/components/identityForm/actions.vue b/src/components/identityForm/actions.vue
@@ -57,7 +57,7 @@ async function sync() {
 }
 
 function logs() {
-  router.push(`/jobs?filters[%concernedTo]=${(props.identity as any)._id}`)
+  router.push(`/jobs?filters[:concernedTo.id]=${(props.identity as any)._id}`)
 }
 
 function back() {
diff --git a/src/composables/useMenu.ts b/src/composables/useMenu.ts
@@ -33,7 +33,7 @@ function useMenu(identityStateStore, identityAffectationStore) {
     {
       icon: 'mdi-card-account-details',
       label: 'Liste des agents',
-      path: '/account',
+      path: '/agents',
       color: 'primary',
       part: 'Listes',
     },
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -12,7 +12,7 @@ q-layout
         q-list(v-for="part in menuParts" :key="part")
           q-item(
             v-for="menu in getMenuByPart(part)" :key="part" clickable v-ripple
-            @click="push(menu.path)"
+            :href="menu.path" :active="menu.path === $route.fullPath"
           )
             q-item-section(avatar)
               q-icon(:name="menu.icon")
@@ -24,81 +24,81 @@ q-layout
             //-   q-item-label {{ part }}
             //- q-tooltip.text-body2(anchor="center right" self="center left") {{ part }}
             //- q-badge(v-if="badgesValues[part]" color="primary" floating) {{ badgesValues[part] }}
-          //- q-item(@click="push('/')" clickable v-ripple)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-home")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Accueil
-          //- q-item(@click="push('/agents')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-card-account-details")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Liste des agents
-          //- q-item(@click="push('/identities')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account")
-          //-     q-badge(color="primary" floating) {{ TOTAL }}
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Liste des identités
-          //- q-space
-          //- q-separator
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_VALIDATE}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-check")
-          //-     q-badge(color="primary" floating ) {{ TO_VALIDATE }}
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") A valider
+            //- q-item(@click="push('/')" clickable v-ripple)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-home")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Accueil
+            //- q-item(@click="push('/agents')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-card-account-details")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Liste des agents
+            //- q-item(@click="push('/identities')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account")
+            //-     q-badge(color="primary" floating) {{ TOTAL }}
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Liste des identités
+            //- q-space
+            //- q-separator
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_VALIDATE}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-check")
+            //-     q-badge(color="primary" floating ) {{ TO_VALIDATE }}
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") A valider
 
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_COMPLETE}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-alert")
-          //-   q-badge(color="primary" floating) {{ TO_COMPLETE }}
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") A compléter
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.ON_ERROR}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-remove")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") En erreur
-          //-   q-badge(color="primary" floating) {{ ON_ERROR }}
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_COMPLETE}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-alert")
+            //-   q-badge(color="primary" floating) {{ TO_COMPLETE }}
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") A compléter
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.ON_ERROR}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-remove")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") En erreur
+            //-   q-badge(color="primary" floating) {{ ON_ERROR }}
 
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_SYNC}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-sync")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") A synchroniser
-          //-   q-badge(color="primary" floating) {{ TO_SYNC }}
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_SYNC}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-sync")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") A synchroniser
+            //-   q-badge(color="primary" floating) {{ TO_SYNC }}
 
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.PROCESSING}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-loading")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") En cours de synchronisation
-          //-   q-badge(color="primary" floating) {{ PROCESSING }}
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.PROCESSING}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-loading")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") En cours de synchronisation
+            //-   q-badge(color="primary" floating) {{ PROCESSING }}
 
-          //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.SYNCED}`)" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-check")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Synchronisées
-          //-   q-badge(color="primary" floating) {{ SYNCED }}
+            //- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.SYNCED}`)" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-check")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Synchronisées
+            //-   q-badge(color="primary" floating) {{ SYNCED }}
 
-          //- q-separator
-          //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/etd/i')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-off")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Etudiants
-          //-   q-badge(color="primary" floating) {{ ETD }}
-          //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/adm/i')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-tie")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Administratifs
-          //-   q-badge(color="primary" floating) {{ ADM }}
-          //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/esn/i')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-account-group")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Enseignants
-          //-   q-badge(color="primary" floating) {{ ESN }}
-          //- q-separator
-          //- q-item(@click="push('/settings')" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-cog")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Paramètres
-          //- q-item(@click="test" clickable)
-          //-   q-item-section(avatar)
-          //-     q-icon(name="mdi-logout")
-          //-   q-tooltip.text-body2(anchor="center right" self="center left") Déconnexion
+            //- q-separator
+            //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/etd/i')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-off")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Etudiants
+            //-   q-badge(color="primary" floating) {{ ETD }}
+            //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/adm/i')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-tie")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Administratifs
+            //-   q-badge(color="primary" floating) {{ ADM }}
+            //- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/esn/i')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-account-group")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Enseignants
+            //-   q-badge(color="primary" floating) {{ ESN }}
+            //- q-separator
+            //- q-item(@click="push('/settings')" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-cog")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Paramètres
+            //- q-item(@click="test" clickable)
+            //-   q-item-section(avatar)
+            //-     q-icon(name="mdi-logout")
+            //-   q-tooltip.text-body2(anchor="center right" self="center left") Déconnexion
 
   q-page-container
     nuxt-page
diff --git a/src/pages/identities/index.vue b/src/pages/identities/index.vue
@@ -236,7 +236,7 @@ async function sync(identity: Identity) {
 }
 
 function logs(identity: Identity & { _id: string }) {
-  router.push(`/logs?filters[concernedTo]=${identity._id}`)
+  router.push(`/logs?filters[:concernedTo.id]=${identity._id}`)
 }
 
 const actions = {
diff --git a/src/pages/jobs/index.vue b/src/pages/jobs/index.vue
@@ -1,53 +1,65 @@
 <template lang="pug">
 div
-  //- .q-px-md
+  .q-px-md.row
+    q-space
+    q-select.col-4(
+      v-model="jobsBy"
+      :options="jobsByOptions"
+      label="Regrouper par"
+      emit-value
+      map-options
+    )
   //-   sesame-searchfilters(:fields="fieldsList")
   q-timeline.q-px-lg
     q-infinite-scroll.q-px-lg(@load="load" :offset="250")
       template(#loading)
         .row.justify-center.q-my-md
           q-spinner-dots(color="primary" size="40px")
 
-      q-timeline-entry(heading) November, 2017
-      q-timeline-entry(
-        v-for="(job, key) in jobs" :key="key"
-        icon="mdi-account" color="orange"
-      )
-        template(#title)
-          span(v-text="'[' + job.jobId + ']'")
-          | &nbsp; - &nbsp;
-          span(v-text="job.params?.identity?.identity?.inetOrgPerson?.cn")
-          | &nbsp;
-          span(v-text="job.params?.identity?.identity?.inetOrgPerson?.givenName")
-        template(#subtitle)
-          q-card.bg-transparent(flat)
-            q-card-actions
-              div(v-text="job.action")
-              q-space
-              div
-                q-icon(name="mdi-clock" size="20px" left)
-                time(v-text="$dayjs(job.metadata?.createdAt).format('DD/MM/YYYY HH:mm:ss').toString()")
-        q-card(flat)
-          q-tabs(
-            v-model="tabs[key]"
-            align="justify"
-            dense
-          )
-            q-tab(name="params") Paramètres d'appel
-            q-tab(name="result") Résultat
-            q-btn(
-              v-if="tabs[key]"
-              @click="delete tabs[key]"
-              slot="right"
-              color="primary"
-              icon="mdi-close"
-              flat
+      template(v-for="(day, keyCompute) in computedJobsByDays" :key="keyCompute")
+        q-timeline-entry(heading)
+          time(v-text="keyCompute")
+        q-timeline-entry(
+          v-for="(job, key) in day" :key="key"
+          icon="mdi-account" color="orange"
+        )
+          template(#title)
+            span(v-text="'[' + job.jobId + ']'")
+            | &nbsp; - &nbsp;
+            span(v-text="job.params?.identity?.identity?.inetOrgPerson?.cn")
+            | &nbsp;
+            span(v-text="job.params?.identity?.identity?.inetOrgPerson?.givenName")
+          template(#subtitle)
+            q-card.bg-transparent(flat)
+              q-card-actions
+                div(v-text="job.action")
+                q-space
+                div
+                  q-icon(name="mdi-clock" size="20px" left)
+                  time(v-text="$dayjs(job.metadata?.createdAt).format('DD/MM/YYYY HH:mm:ss').toString()")
+          q-card(flat)
+            q-tabs(
+              v-model="tabs[keyCompute + '_' + key]"
+              align="justify"
+              dense
             )
-          q-tab-panels.overflow-auto(v-model="tabs[key]" style="max-height: 300px")
-            q-tab-panel(name="params")
-              pre(v-html="JSON.stringify(job.params, null, 2)")
-            q-tab-panel(name="result")
-              pre(v-html="JSON.stringify(job.result, null, 2)")
+              q-tab(name="params") Paramètres d'appel
+              q-separator(vertical)
+              q-tab(name="result") Résultat
+              template(v-if="tabs[keyCompute + '_' + key]")
+                q-separator(vertical)
+                q-btn(
+                  @click="delete tabs[keyCompute + '_' + key]"
+                  slot="right"
+                  color="white"
+                  icon="mdi-close"
+                  flat
+                )
+            q-tab-panels.overflow-auto(v-model="tabs[keyCompute + '_' + key]" style="max-height: 300px")
+              q-tab-panel(name="params")
+                pre(v-html="JSON.stringify(job.params, null, 2)")
+              q-tab-panel(name="result")
+                pre(v-html="JSON.stringify(job.result, null, 2)")
 </template>
 
 <script lang="ts" setup>
@@ -69,6 +81,8 @@ const scrollTargetRef = ref(null)
 const tabs = ref([])
 
 const $route = useRoute();
+const $router = useRouter();
+const $dayjs = useDayjs();
 
 const offset = ref(0);
 const query = computed(() => {
@@ -80,10 +94,45 @@ const query = computed(() => {
   };
 });
 
+const jobsBy = computed({
+  get: () => $route.query.jobsBy ? `${$route.query.jobsBy}` : undefined,
+  set: (value) => {
+    tabs.value = [] // Reset tabs when changing jobsBy
+    $router.replace({
+      query: {
+        ...$route.query,
+        jobsBy: value,
+      },
+    })
+  },
+})
+if (!jobsBy.value) {
+  console.log('jobsBy.value', jobsBy.value)
+  jobsBy.value = 'DD/MM/YYYY'
+}
+
+const jobsByOptions = [
+  { label: 'Jour', value: 'DD/MM/YYYY' },
+  { label: 'Mois', value: 'MM/YYYY' },
+  { label: 'Année', value: 'YYYY' },
+]
+
 const jobs = ref<any>([]);
 
+const computedJobsByDays = computed(() => {
+  const jobsByDays = {}
+  jobs.value.forEach((job) => {
+    const day = $dayjs(job.metadata?.createdAt).format(jobsBy.value)
+    if (!jobsByDays[day]) {
+      jobsByDays[day] = []
+    }
+    jobsByDays[day].push(job)
+  })
+  return jobsByDays
+});
+
 const load = async (index, done) => {
-  offset.value = index;
+  offset.value = index - 1;
   const { data, pending, error, refresh } = await useHttp<any>(`/core/jobs/`, {
     method: 'GET',
     query,

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ async function sync() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`function logs() {`
`60`		- router.push(`/jobs?filters[%concernedTo]=${(props.identity as any)._id}`)
	`60`	+ router.push(`/jobs?filters[:concernedTo.id]=${(props.identity as any)._id}`)
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`function back() {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function useMenu(identityStateStore, identityAffectationStore) {`
`33`	`33`	`{`
`34`	`34`	`icon: 'mdi-card-account-details',`
`35`	`35`	`label: 'Liste des agents',`
`36`		`- path: '/account',`
	`36`	`+ path: '/agents',`
`37`	`37`	`color: 'primary',`
`38`	`38`	`part: 'Listes',`
`39`	`39`	`},`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ async function sync(identity: Identity) {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`function logs(identity: Identity & { _id: string }) {`
`239`		- router.push(`/logs?filters[concernedTo]=${identity._id}`)
	`239`	+ router.push(`/logs?filters[:concernedTo.id]=${identity._id}`)
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`const actions = {`