adaptations for new version of API graphQL

components/certif/List.vue

@@ -39,7 +39,7 @@
 							<div class="text-truncate">{{ certif.uid }}</div>
 							&nbsp;
 							<BadgeDanger
-								:limitDate="certif.received_certifications.limit"
+								:limitDate="certif.certsLimit"
 								:memberStatus="certif.status" />
 						</div>
 						<BadgeStatus :membre="certif" />

components/member/Card.vue

@@ -90,16 +90,9 @@
 							<td
 								:class="
 									'list-group-item-' +
-									$options.filters.dateStatus(
-										hash.received_certifications.limit
-									)
+									$options.filters.dateStatus(hash.certsLimit)
 								">
-								{{
-									$d(
-										new Date(hash.received_certifications.limit * 1000),
-										"long"
-									)
-								}}
+								{{ $d(new Date(hash.certsLimit * 1000), "long") }}
 							</td>
 						</tr>
 						<tr v-if="hash.status == 'MEMBER'">

components/member/List.vue

@@ -72,7 +72,7 @@
 							<div class="text-truncate">{{ member.uid }}</div>
 							&nbsp;
 							<BadgeDanger
-								:limitDate="member.received_certifications.limit"
+								:limitDate="member.certsLimit"
 								:memberStatus="member.status" />
 						</div>
 						<div v-if="['adhesion', 'certif'].includes(type)" class="d-sm-none">
@@ -108,9 +108,7 @@
 						}"
 						v-if="['certif', 'favoris'].includes(type)"
 						@click="redirect(member.hash)">
-						<BadgeDate
-							:date="member.received_certifications.limit"
-							styleDate="short" />
+						<BadgeDate :date="member.certsLimit" styleDate="short" />
 					</td>
 					<td class="py-1" v-if="type == 'favoris'" style="width: 60px">
 						<button
@@ -178,8 +176,8 @@ export default {
 		},
 		getDate(member) {
 			if (this.type == "adhesion") return member.limitDate
-			if (this.type == "certif") return member.received_certifications.limit
-			return Math.min(member.limitDate, member.received_certifications.limit)
+			if (this.type == "certif") return member.certsLimit
+			return Math.min(member.limitDate, member.certsLimit)
 		},
 		getOrder(a, b, order) {
 			if (a < b) return -1 * order
@@ -208,11 +206,7 @@ export default {
 					} else if (this.currentSort == "date_membership") {
 						return this.getOrder(a["limitDate"], b["limitDate"], modifier)
 					} else if (this.currentSort == "date_certs") {
-						return this.getOrder(
-							a["received_certifications"]["limit"],
-							b["received_certifications"]["limit"],
-							modifier
-						)
+						return this.getOrder(a["certsLimit"], b["certsLimit"], modifier)
 					}
 					return 0
 				})

graphql/queries.js

@@ -31,6 +31,7 @@ export const LAST_EVENTS = gql`
 					hash
 					minDatePassed
 					minDate
+					certsLimit
 					limitDate
 					quality {
 						__typename
@@ -44,10 +45,6 @@ export const LAST_EVENTS = gql`
 							number
 						}
 					}
-					received_certifications {
-						__typename
-						limit
-					}
 					sent_certifications {
 						__typename
 						pending
@@ -79,11 +76,8 @@ export const NEWCOMERS = gql`
 					uid
 					status
 					hash
+					certsLimit
 					limitDate
-					received_certifications {
-						__typename
-						limit
-					}
 				}
 				date
 				after
@@ -106,15 +100,12 @@ export const SEARCH_MEMBERS = gql`
 				minDate
 				minDatePassed
 				hash
+				certsLimit
 				limitDate
 				quality {
 					__typename
 					ratio
 				}
-				received_certifications {
-					__typename
-					limit
-				}
 				sent_certifications {
 					__typename
 					pending
@@ -151,14 +142,11 @@ export const SEARCH_MEMBER = gql`
 			}
 			received_certifications {
 				__typename
-				certifications {
-					__typename
-					from {
-						...attr
-					}
-					expires_on
-					pending
+				from {
+					...attr
 				}
+				expires_on
+				pending
 			}
 			sent_certifications {
 				__typename
@@ -175,6 +163,7 @@ export const SEARCH_MEMBER = gql`
 		uid
 		hash
 		status
+		certsLimit
 		limitDate
 		minDate
 		minDatePassed
@@ -182,10 +171,6 @@ export const SEARCH_MEMBER = gql`
 			__typename
 			ratio
 		}
-		received_certifications {
-			__typename
-			limit
-		}
 		sent_certifications {
 			__typename
 			pending
@@ -229,6 +214,7 @@ export const FAVORIS = gql`
 		uid
 		status
 		hash
+		certsLimit
 		limitDate
 		minDatePassed
 		minDate
@@ -236,10 +222,6 @@ export const FAVORIS = gql`
 			__typename
 			ratio
 		}
-		received_certifications {
-			__typename
-			limit
-		}
 		sent_certifications {
 			__typename
 			pending
@@ -258,15 +240,12 @@ export const NEXT_EXITS = gql`
 			hash
 			minDatePassed
 			minDate
+			certsLimit
 			limitDate
 			quality {
 				__typename
 				ratio
 			}
-			received_certifications {
-				__typename
-				limit
-			}
 			sent_certifications {
 				__typename
 				pending
@@ -288,29 +267,23 @@ export const NEXT_LOOSE_CERTS = gql`
 			period: $period
 			missingIncluded: $missingIncluded
 		) {
-			id {
+			__typename
+			pubkey
+			uid
+			status
+			hash
+			minDatePassed
+			minDate
+			certsLimit
+			limitDate
+			quality {
 				__typename
-				pubkey
-				uid
-				status
-				hash
-				minDatePassed
-				minDate
-				limitDate
-				quality {
-					__typename
-					ratio
-				}
-				received_certifications {
-					__typename
-					limit
-				}
-				sent_certifications {
-					__typename
-					pending
-				}
+				ratio
+			}
+			sent_certifications {
+				__typename
+				pending
 			}
-			date
 		}
 	}
 `

package.json

 {
 	"name": "wotwizard-ui",
-	"version": "0.23.0",
+	"version": "0.24.0",
 	"private": true,
 	"scripts": {
 		"dev": "nuxt",

pages/membre.vue

@@ -21,11 +21,10 @@
 								:class="{
 									'text-success':
 										['NEWCOMER', 'MISSING'].includes(idFromHash.status) &&
-										idFromHash.received_certifications.certifications.length >=
-											5,
+										idFromHash.received_certifications.length >= 5,
 									'text-danger':
 										['NEWCOMER', 'MISSING'].includes(idFromHash.status) &&
-										idFromHash.received_certifications.certifications.length < 5
+										idFromHash.received_certifications.length < 5
 								}">
 								{{ $t("certification.recues") }} ({{ nbCertifsReceived
 								}}<span v-if="nbCertifsPendingReceived != 0">{{
@@ -33,11 +32,11 @@
 								}}</span
 								>)
 								<BadgeDanger
-									:limitDate="idFromHash.received_certifications.limit"
+									:limitDate="idFromHash.certsLimit"
 									:memberStatus="idFromHash.status" />
 							</h3>
 							<CertifGroup
-								:certifs="idFromHash.received_certifications.certifications"
+								:certifs="idFromHash.received_certifications"
 								type="received" />
 						</div>
 						<div
@@ -106,11 +105,10 @@ export default {
 	computed: {
 		classWarning() {
 			return {
-				"text-danger": !this.idFromHash.received_certifications.limit,
+				"text-danger": !this.idFromHash.certsLimit,
 				"text-warning":
-					this.$options.filters.dateStatus(
-						this.idFromHash.received_certifications.limit
-					) == "warning"
+					this.$options.filters.dateStatus(this.idFromHash.certsLimit) ==
+					"warning"
 			}
 		},
 		nbCertifsSent() {
@@ -119,11 +117,9 @@ export default {
 			}).length
 		},
 		nbCertifsReceived() {
-			return this.idFromHash.received_certifications.certifications.filter(
-				(el) => {
-					return el.pending == false
-				}
-			).length
+			return this.idFromHash.received_certifications.filter((el) => {
+				return el.pending == false
+			}).length
 		},
 		nbCertifsPendingSent() {
 			return this.idFromHash.sent_certifications.filter((el) => {
@@ -131,11 +127,9 @@ export default {
 			}).length
 		},
 		nbCertifsPendingReceived() {
-			return this.idFromHash.received_certifications.certifications.filter(
-				(el) => {
-					return el.pending == true
-				}
-			).length
+			return this.idFromHash.received_certifications.filter((el) => {
+				return el.pending == true
+			}).length
 		}
 	},
 	mounted() {

pages/previsions/futures_sorties.vue

@@ -96,9 +96,6 @@ export default {
 			variables() {
 				return this.getParams
 			},
-			update(data) {
-				return data.certEnds.map((item) => item.id)
-			},
 			error(err) {
 				this.error = err.message
 			}