Skip to content
Snippets Groups Projects
Commit 75e85252 authored by Pierre-Jean CHANCELLIER's avatar Pierre-Jean CHANCELLIER
Browse files

Apollo configuration

parent 1dd36bd1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 565 additions and 746 deletions
graphql/endpoint.js 0 → 100644
+ 3
− 0
View file @ 75e85252
module.exports = {
ENDPOINT : 'https://wwgql.coinduf.eu'
}
\ No newline at end of file
graphql/fragmentTypes.json 0 → 100644
+ 1
− 0
View file @ 75e85252
{"__schema":{"types":[{"kind":"UNION","name":"CertifOrDossier","possibleTypes":[{"name":"MarkedDatedCertification"},{"name":"MarkedDossier"}]},{"kind":"INTERFACE","name":"File","possibleTypes":[{"name":"FileS"}]},{"kind":"INTERFACE","name":"WWResult","possibleTypes":[{"name":"WWResultS"}]}]}}
\ No newline at end of file
graphql/index.js
+ 23
− 17
View file @ 75e85252
import { HttpLink } from 'apollo-link-http'
import { setContext } from 'apollo-link-context'
import { from } from 'apollo-link'
import { InMemoryCache } from 'apollo-cache-inmemory'
import { InMemoryCache, IntrospectionFragmentMatcher, defaultDataIdFromObject } from 'apollo-cache-inmemory'
import {ENDPOINT} from './endpoint'
import introspectionQueryResultData from './fragmentTypes.json';
export default ctx => {
const ssrMiddleware = setContext((_, { headers }) => {
......@@ -10,29 +13,32 @@ export default ctx => {
headers
}
})
const httpLink = new HttpLink({
uri: 'https://wwgql.coinduf.eu'
uri: ENDPOINT
})
const link = from([ssrMiddleware, httpLink])
const fragmentMatcher = new IntrospectionFragmentMatcher({
introspectionQueryResultData
})
// Apparemment il faut utiliser la syntaxe Apollo v2
const cache = new InMemoryCache({
typePolicies: {
Event: {
keyFields: ['block',['number ']]
},
EventId: {
keyFields: ['member',['hash'],'inOut']
},
Identity: {
keyFields: ['hash']
},
Forecast: {
keyFields: ['member',['hash'],'date','after','proba']
addTypename: false,
fragmentMatcher,
dataIdFromObject: object => {
switch (object.__typename) {
case 'Identity': return object.hash
case 'Event': return object.block.number
case 'EventId': return `${object.member.hash}:${object.inOut}`
case 'Forecast': return `${object.member.hash}:${object.date}:${object.after}:${object.proba}`
default: return defaultDataIdFromObject(object); // fall back to default handling
}
}
})
return {
link,
cache,
......
graphql/queries.js
+ 101
− 60
View file @ 75e85252
......@@ -4,87 +4,109 @@ import gql from "graphql-tag"
export const LAST_EVENTS = gql`query LastEvents($start: Int64, $end: Int64) {
membersCount(start: $start, end: $end) {
idList {
__typename
member : id {
__typename
pubkey
uid
status
hash
limitDate
received_certifications {
limit
__typename
limit
}
}
inOut
},
block {
__typename
number
}
}
} `
// Pour la page previsions/index
export const PREVISIONS = gql`query {
export const PREVISIONS = gql`query GetDossiers {
now {
number
bct
number
bct
__typename
}
parameter(name: sigQty) {
sigQty:value
sigQty: value
__typename
}
wwFile(full: true) {
certifs_dossiers {
... on MarkedDatedCertification {
datedCertification {
date
certification {
from {
uid
}
to {
uid
}
expires_on
}
certifs_dossiers {
... on MarkedDatedCertification {
datedCertification {
date
certification {
from {
uid
__typename
}
to {
uid
__typename
}
expires_on
__typename
}
__typename
}
__typename
}
... on MarkedDossier {
dossier {
main_certifs
newcomer {
uid
lastApplication {
lastAppDate: bct
__typename
}
distance: distanceE {
value {
ratio
__typename
}
dist_ok
__typename
}
__typename
}
... on MarkedDossier {
dossier {
main_certifs
newcomer {
uid
lastApplication {
lastAppDate: bct
}
distance: distanceE {
value {
ratio
}
dist_ok
}
}
date
minDate
expires_on:limit
certifications {
date
certification {
from {
uid
quality {
ratio
}
}
expires_on
}
}
date
minDate
expires_on: limit
certifications {
date
certification {
from {
uid
quality {
ratio
__typename
}
__typename
}
expires_on
__typename
}
__typename
}
__typename
}
__typename
}
}
__typename
}
} `
}`
// Pour la page previsions/_hash
export const PREVISION = gql`query Search($hash: Hash!) {
export const PREVISION = gql`query SearchForecast($hash: Hash!) {
idFromHash(hash: $hash) {
...memberAttributes
pubkey
......@@ -95,13 +117,17 @@ export const PREVISION = gql`query Search($hash: Hash!) {
membership_pending
limitDate
distance {
__typename
value {
__typename
ratio
}
dist_ok
}
received_certifications {
__typename
certifications {
__typename
from {
...memberAttributes
}
......@@ -109,6 +135,7 @@ export const PREVISION = gql`query Search($hash: Hash!) {
}
}
sent_certifications {
__typename
to {
...memberAttributes
}
......@@ -117,6 +144,7 @@ export const PREVISION = gql`query Search($hash: Hash!) {
}
}
fragment memberAttributes on Identity {
__typename
uid
hash
status
......@@ -129,19 +157,23 @@ fragment memberAttributes on Identity {
}`
// Pour la page previsions/newcomers
export const NEWCOMERS = gql`query {
export const NEWCOMERS = gql`query GetNewcomers{
wwResult {
__typename
permutations_nb
dossiers_nb
certifs_nb
forecastsByNames {
__typename
member : id {
__typename
pubkey
uid
status
hash
limitDate
received_certifications {
__typename
limit
}
}
......@@ -153,15 +185,18 @@ export const NEWCOMERS = gql`query {
} `
// Pour la page membres/index
export const SEARCH_MEMBERS = gql`query Search($hint: String) {
export const SEARCH_MEMBERS = gql`query SearchMember($hint: String) {
idSearch(with: {hint: $hint}) {
__typename
ids {
__typename
pubkey
uid
status
hash
limitDate
received_certifications {
__typename
limit
}
}
......@@ -169,9 +204,9 @@ export const SEARCH_MEMBERS = gql`query Search($hint: String) {
} `
// Pour la page membres/_hash
export const SEARCH_MEMBER = gql`query Search($hash: Hash!) {
export const SEARCH_MEMBER = gql`query SearchMemberWithHash($hash: Hash!) {
idFromHash(hash: $hash) {
...memberAttributes
...attr
pubkey
isLeaving
sentry
......@@ -180,28 +215,34 @@ export const SEARCH_MEMBER = gql`query Search($hash: Hash!) {
membership_pending
limitDate
distance {
__typename
value {
__typename
ratio
}
dist_ok
}
received_certifications {
__typename
certifications {
from {
...memberAttributes
}
expires_on
__typename
from {
...attr
}
expires_on
}
}
sent_certifications {
__typename
to {
...memberAttributes
...attr
}
expires_on
}
}
}
fragment memberAttributes on Identity {
fragment attr on Identity {
__typename
uid
hash
status
......
graphql/schemaQuery.js 0 → 100644
+ 39
− 0
View file @ 75e85252
const {ENDPOINT} = require('./endpoint');
const fetch = require('node-fetch');
const fs = require('fs');
fetch(ENDPOINT, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
variables: {},
query: `
{
__schema {
types {
kind
name
possibleTypes {
name
}
}
}
}
`,
}),
})
.then(result => result.json())
.then(result => {
const filteredData = result.data.__schema.types.filter(
type => type.possibleTypes !== null
)
result.data.__schema.types = filteredData;
fs.writeFile('./graphql/fragmentTypes.json', JSON.stringify(result.data), err => {
if (err) {
console.error('Error writing fragmentTypes file', err);
} else {
console.log('Fragment types successfully extracted!');
}
});
});
\ No newline at end of file
package-lock.json
+ 378
− 655
View file @ 75e85252
This diff is collapsed.
package.json
+ 10
− 5
View file @ 75e85252
......@@ -4,10 +4,14 @@
"private": true,
"scripts": {
"dev": "nuxt",
"build": "nuxt build",
"start": "nuxt start",
"generate": "nuxt generate",
"analyze": "nuxt build --analyze"
"build": "npm-run-all -p build-fragment nuxt-build",
"start": "npm-run-all -p build-fragment nuxt-start",
"generate": "npm-run-all -p build-fragment nuxt-generate",
"analyze": "nuxt build --analyze",
"build-fragment": "node graphql/schemaQuery.js",
"nuxt-build": "nuxt build",
"nuxt-start": "nuxt start",
"nuxt-generate": "nuxt generate"
},
"dependencies": {
"@nuxtjs/apollo": "^4.0.1-rc.5",
......@@ -23,6 +27,7 @@
},
"devDependencies": {
"sass": "^1.45.0",
"sass-loader": "^10.2.0"
"sass-loader": "^10.2.0",
"npm-run-all": "^4.1.5"
}
}
pages/membres/index.vue
+ 1
− 1
View file @ 75e85252
......@@ -11,7 +11,7 @@
<NavigationLoader :isLoading="$apollo.queries.idSearch.loading" />
<transition name="fade">
<div class="alert alert-danger" v-if="error">{{ error }}</div>
<div class="row" v-if="idSearch && param.length>2">
<div class="row" v-if="idSearch && param.length>2 && !$apollo.queries.idSearch.loading">
<div class="col-8 m-auto">
<MemberList :members="idSearch.ids"/>
</div>
......
pages/previsions/index.vue
+ 8
− 7
View file @ 75e85252
......@@ -2,11 +2,11 @@
<main class="container">
<h2 class="text-center mb-5 font-weight-light">En préparation</h2>
<b-alert variant="danger" show>En développement</b-alert>
<NavigationLoader :isLoading="$apollo.queries.test.loading" />
<NavigationLoader :isLoading="$apollo.queries.previsions.loading" />
<transition name="fade">
<div class="alert alert-danger" v-if="error">{{ error }}</div>
<div v-if="test">
{{ test }}
<div v-if="previsions">
{{ previsions }}
</div>
</transition>
</main>
......@@ -33,13 +33,14 @@ export default {
}
},
apollo: {
test : {
previsions : {
query: PREVISIONS,
update (data) {
return {
now: data.now,
sigQty: data.parameter.sigQty,
certifs_dossiers: data.wwFile.certifs_dossiers
// now: data.now,
// sigQty: data.parameter.sigQty,
// certifs_dossiers: data.wwFile.certifs_dossiers
data
}
},
error (err) {this.error = err.message}
......
pages/previsions/newcomers.vue
+ 1
− 1
View file @ 75e85252
......@@ -57,7 +57,7 @@
<th scope="row">{{ forecast.date | formatDateHeure }}</th>
<td class="p-0">
<div class="list-group rounded-0">
<nuxt-link class="list-group-item list-group-item-action border-0 d-flex justify-content-between" :to="'/membres/' + member.member.hash" v-for="member in forecast.forecasts" :key="member.member.uid">
<nuxt-link class="list-group-item list-group-item-action border-0 d-flex justify-content-between" :to="'/previsions/' + member.member.hash" v-for="member in forecast.forecasts" :key="member.member.uid">
<div>{{ member.member.uid }} <BadgeStatus :membre="member.member" /></div>
<div>{{ member.proba * 100 }} %</div>
</nuxt-link>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment