bachir/materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed modalCard after graphql refactoring

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2020-12-23 19:11:46 +01:00
parent 53dcc8b854
commit 609d4f5fde
12 changed files with 232 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
web/themes/custom/materiotheme/vuejs/store/index.js
View File

@ -3,8 +3,8 @@ import Vuex from 'vuex'
import { createStore } from 'vuex-extensions'
import { JSONAPI } from 'vuejs/api/json-axios'
import qs from 'querystring-es3'
// import { JSONAPI } from 'vuejs/api/json-axios'
// import qs from 'querystring-es3'
import { MGQ } from 'vuejs/api/graphql-axios'
import { print } from 'graphql/language/printer'
@ -48,9 +48,13 @@ export default createStore(Vuex.Store, {
MGQ.post('', { query: print(ast) })
.then(( resp ) => {
console.log('loadMaterialsGQL resp', resp )
dispatch('parseMaterialsGQL', {
// dispatch('parseMaterialsGQL', {
// items: resp.data.data.materiaux,
// callBack: callBack,
// callBackArgs: callBackArgs
// })
dispatch(callBack, {
items: resp.data.data.materiaux,
callBack: callBack,
callBackArgs: callBackArgs
})
})
@ -58,92 +62,92 @@ export default createStore(Vuex.Store, {
console.warn('Issue with loadMaterials', error)
Promise.reject(error)
})
},
parseMaterialsGQL ({ dispatch }, { items, callBack, callBackArgs }) {
dispatch(callBack, { items: items, callBackArgs: callBackArgs })
},
loadMaterials ({ dispatch }, { uuids, imgStyle, callBack, callBackArgs }) {
const params = {
// include: 'images', // no needs to include thanks to consumers_image_styles module
// include: 'drupal_internal__nid',
'filter[uuids-groupe][group][conjunction]': 'OR'
}
for (let i = 0; i < uuids.length; i++) {
const uuid = uuids[i]
params[`filter[${uuid}][condition][path]`] = 'id'
params[`filter[${uuid}][condition][value]`] = uuid
params[`filter[${uuid}][condition][operator]`] = '='
params[`filter[${uuid}][condition][memberOf]`] = 'uuids-groupe'
}
// console.log('search JSONAPI params', params);
const q = qs.stringify(params)
return JSONAPI.get('node/materiau?' + q)
.then(({ data }) => {
console.log('mixin getMaterials data', data)
dispatch('parseMaterials', { data: data.data, uuids: uuids, imgStyle: imgStyle, callBack: callBack, callBackArgs: callBackArgs })
// commit('setItems', data.items)
})
.catch((error) => {
console.warn('Issue with getItems', error)
Promise.reject(error)
})
},
parseMaterials ({ dispatch }, { data, uuids, imgStyle, callBack, callBackArgs }) {
// data comes from jsonapi query
// uuids comes from original query (solr, FlagCollection, etc)
// so we loop from uuids to conserve the original order
console.log('mixin parseMaterials', data, uuids, callBack, callBackArgs)
const items = []
// for (var i = 0; i < data.length; i++) {
for (let i = 0; i < uuids.length; i++) {
const uuid = uuids[i]
// https://stackoverflow.com/questions/11258077/how-to-find-index-of-an-object-by-key-and-value-in-an-javascript-array
const item_index = data.findIndex(p => p.id === uuid)
// console.log('item_index', item_index);
if (item_index === -1) continue
const item_src = data[item_index]
const attrs = item_src.attributes
const relations = item_src.relationships
// get field values
const item = {
uuid: uuid,
title: attrs.title,
field_short_description: attrs.field_short_description,
body: attrs.body,
field_reference: attrs.field_reference
}
// get images included values
const img_src = relations.images.data
// console.log('img_src', img_src);
// this is a temporary deactivation of images
// img_src = [];
item.images = []
for (let j = 0; j < img_src.length; j++) {
if (img_src[j].meta.imageDerivatives) {
let img_styles = {}
for (var k = 0; k < imgStyle.length; k++) {
img_styles[imgStyle[k]] = img_src[j].meta.imageDerivatives.links.[imgStyle[k]].href
}
item.images.push({
title: img_src[j].meta.title,
src: img_src[j].meta.imageDerivatives.links.hd.href,
// meta.imageDerivatives.style.href link is provided by drupal consumers_image_styles module
// BUG: missing all image derivative but first
img_styles: img_styles
})
} else {
console.warn('missing image derivative ' + j + '/' + img_src.length + ' for ' + attrs.title)
}
}
items.push(item)
}
console.log('items', items)
dispatch(callBack, { items: items, callBackArgs: callBackArgs })
}
// parseMaterialsGQL ({ dispatch }, { items, callBack, callBackArgs }) {
// dispatch(callBack, { items: items, callBackArgs: callBackArgs })
// }
// loadMaterials ({ dispatch }, { uuids, imgStyle, callBack, callBackArgs }) {
// const params = {
// // include: 'images', // no needs to include thanks to consumers_image_styles module
// // include: 'drupal_internal__nid',
// 'filter[uuids-groupe][group][conjunction]': 'OR'
// }
// for (let i = 0; i < uuids.length; i++) {
// const uuid = uuids[i]
// params[`filter[${uuid}][condition][path]`] = 'id'
// params[`filter[${uuid}][condition][value]`] = uuid
// params[`filter[${uuid}][condition][operator]`] = '='
// params[`filter[${uuid}][condition][memberOf]`] = 'uuids-groupe'
// }
// // console.log('search JSONAPI params', params);
// const q = qs.stringify(params)
// return JSONAPI.get('node/materiau?' + q)
// .then(({ data }) => {
// console.log('mixin getMaterials data', data)
// dispatch('parseMaterials', { data: data.data, uuids: uuids, imgStyle: imgStyle, callBack: callBack, callBackArgs: callBackArgs })
// // commit('setItems', data.items)
// })
// .catch((error) => {
// console.warn('Issue with getItems', error)
// Promise.reject(error)
// })
// },
// parseMaterials ({ dispatch }, { data, uuids, imgStyle, callBack, callBackArgs }) {
// // data comes from jsonapi query
// // uuids comes from original query (solr, FlagCollection, etc)
// // so we loop from uuids to conserve the original order
// console.log('mixin parseMaterials', data, uuids, callBack, callBackArgs)
// const items = []
// // for (var i = 0; i < data.length; i++) {
// for (let i = 0; i < uuids.length; i++) {
// const uuid = uuids[i]
// // https://stackoverflow.com/questions/11258077/how-to-find-index-of-an-object-by-key-and-value-in-an-javascript-array
// const item_index = data.findIndex(p => p.id === uuid)
// // console.log('item_index', item_index);
// if (item_index === -1) continue
//
// const item_src = data[item_index]
// const attrs = item_src.attributes
// const relations = item_src.relationships
//
// // get field values
// const item = {
// uuid: uuid,
// title: attrs.title,
// field_short_description: attrs.field_short_description,
// body: attrs.body,
// field_reference: attrs.field_reference
// }
//
// // get images included values
// const img_src = relations.images.data
// // console.log('img_src', img_src);
// // this is a temporary deactivation of images
// // img_src = [];
// item.images = []
// for (let j = 0; j < img_src.length; j++) {
// if (img_src[j].meta.imageDerivatives) {
// let img_styles = {}
// for (var k = 0; k < imgStyle.length; k++) {
// img_styles[imgStyle[k]] = img_src[j].meta.imageDerivatives.links.[imgStyle[k]].href
// }
// item.images.push({
// title: img_src[j].meta.title,
// src: img_src[j].meta.imageDerivatives.links.hd.href,
// // meta.imageDerivatives.style.href link is provided by drupal consumers_image_styles module
// // BUG: missing all image derivative but first
// img_styles: img_styles
// })
// } else {
// console.warn('missing image derivative ' + j + '/' + img_src.length + ' for ' + attrs.title)
// }
// }
//
// items.push(item)
// }
// console.log('items', items)
// dispatch(callBack, { items: items, callBackArgs: callBackArgs })
// }
}
}
})

6
web/themes/custom/materiotheme/vuejs/store/modules/blabla.js
View File

@ -1,7 +1,7 @@
import { JSONAPI } from 'vuejs/api/json-axios'
// import { JSONAPI } from 'vuejs/api/json-axios'
import { REST } from 'vuejs/api/rest-axios'
import { MA } from 'vuejs/api/ma-axios'
import qs from 'querystring-es3'
// import { MA } from 'vuejs/api/ma-axios'
// import qs from 'querystring-es3'
export default {
namespaced: true,

6
web/themes/custom/materiotheme/vuejs/store/modules/common.js
View File

@ -1,6 +1,6 @@
import { REST } from 'vuejs/api/rest-axios'
import { JSONAPI } from 'vuejs/api/json-axios'
import qs from 'querystring-es3'
// import { REST } from 'vuejs/api/rest-axios'
// import { JSONAPI } from 'vuejs/api/json-axios'
// import qs from 'querystring-es3'
export default {
namespaced: true,

6
web/themes/custom/materiotheme/vuejs/store/modules/pages.js
View File

@ -1,7 +1,7 @@
import { JSONAPI } from 'vuejs/api/json-axios'
// import { JSONAPI } from 'vuejs/api/json-axios'
import { REST } from 'vuejs/api/rest-axios'
import { MA } from 'vuejs/api/ma-axios'
import qs from 'querystring-es3'
// import { MA } from 'vuejs/api/ma-axios'
// import qs from 'querystring-es3'
export default {
namespaced: true,

6
web/themes/custom/materiotheme/vuejs/store/modules/showrooms.js
View File

@ -1,7 +1,7 @@
import { JSONAPI } from 'vuejs/api/json-axios'
// import { JSONAPI } from 'vuejs/api/json-axios'
import { REST } from 'vuejs/api/rest-axios'
import { MA } from 'vuejs/api/ma-axios'
import qs from 'querystring-es3'
// import { MA } from 'vuejs/api/ma-axios'
// import qs from 'querystring-es3'
export default {
namespaced: true,