Merge pull request #1156 from assemblee-virtuelle/fix-GroupedReferenc…

…eHandler Fix: GroupedReferenceHandler hooks don't work
assemblee-virtuelle · Sep 26, 2023 · 8cd5be3 · 8cd5be3
2 parents db87021 + c25bb24
commit 8cd5be3
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 41 deletions.
diff --git a/src/frontend/packages/semantic-data-provider/dist/index.cjs.js b/src/frontend/packages/semantic-data-provider/dist/index.cjs.js
diff --git a/src/frontend/packages/semantic-data-provider/dist/index.cjs.js.map b/src/frontend/packages/semantic-data-provider/dist/index.cjs.js.map
diff --git a/src/frontend/packages/semantic-data-provider/dist/index.es.js b/src/frontend/packages/semantic-data-provider/dist/index.es.js
diff --git a/src/frontend/packages/semantic-data-provider/dist/index.es.js.map b/src/frontend/packages/semantic-data-provider/dist/index.es.js.map
diff --git a/src/frontend/packages/semantic-data-provider/src/dataProvider/utils/buildSparqlQuery.js b/src/frontend/packages/semantic-data-provider/src/dataProvider/utils/buildSparqlQuery.js
@@ -1,9 +1,10 @@
 import DataFactory from '@rdfjs/data-model';
-import { Generator as SparqlGenerator } from 'sparqljs';
 import buildBaseQuery from './buildBaseQuery';
 import buildBlankNodesQuery from './buildBlankNodesQuery';
 import resolvePrefix from './resolvePrefix';
 
+const SparqlGenerator = require('sparqljs').Generator;
+
 const { literal, namedNode, triple, variable } = DataFactory;
 
 const generator = new SparqlGenerator({
@@ -20,23 +21,23 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
     template: baseQuery.construct,
     where: [],
     type: 'query',
-    prefixes: Object.fromEntries(ontologies.map(ontology => [ontology.prefix, ontology.url]))
+    prefixes: Object.fromEntries(ontologies.map((ontology) => [ontology.prefix, ontology.url])),
   };
 
   const containerWhere = [
     {
       type: 'values',
-      values: containers.map(containerUri => ({ '?containerUri': namedNode(containerUri) }))
+      values: containers.map((containerUri) => ({ '?containerUri': namedNode(containerUri) })),
     },
     triple(variable('containerUri'), namedNode('http://www.w3.org/ns/ldp#contains'), variable('s1')),
     {
       type: 'filter',
       expression: {
         type: 'operation',
         operator: 'isiri',
-        args: [variable('s1')]
-      }
-    }
+        args: [variable('s1')],
+      },
+    },
   ];
 
   let resourceWhere = [];
@@ -46,7 +47,7 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
     const hasFullTextSearch = filter.q && filter.q.length > 0;
 
     if (hasSPARQLFilter) {
-      /* 
+      /*
         Example of usage :
         {
           "sparqlWhere": {
@@ -60,7 +61,7 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
         }
       */
       // initialize array in case of single value :
-      [].concat(filter.sparqlWhere).forEach(sw => {
+      [].concat(filter.sparqlWhere).forEach((sw) => {
         resourceWhere.push(sw);
       });
     }
@@ -79,8 +80,8 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
                 expression: {
                   type: 'operation',
                   operator: 'isliteral',
-                  args: [variable('o1')]
-                }
+                  args: [variable('o1')],
+                },
               },
               {
                 type: 'filter',
@@ -95,18 +96,18 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
                         {
                           type: 'operation',
                           operator: 'str',
-                          args: [variable('o1')]
-                        }
-                      ]
+                          args: [variable('o1')],
+                        },
+                      ],
                     },
-                    literal(filter.q.toLowerCase(), '', namedNode('http://www.w3.org/2001/XMLSchema#string'))
-                  ]
-                }
-              }
+                    literal(filter.q.toLowerCase(), '', namedNode('http://www.w3.org/2001/XMLSchema#string')),
+                  ],
+                },
+              },
             ],
-            type: 'query'
-          }
-        ]
+            type: 'query',
+          },
+        ],
       });
     }
 
@@ -119,8 +120,8 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
           triple(
             variable('s1'),
             namedNode(resolvePrefix(predicate, ontologies)),
-            namedNode(resolvePrefix(object, ontologies))
-          )
+            namedNode(resolvePrefix(object, ontologies)),
+          ),
         );
       }
     });
@@ -143,9 +144,9 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
         {
           type: 'graph',
           name: namedNode('http://semapps.org/mirror'),
-          patterns: containerWhere
-        }
-      ]
+          patterns: containerWhere,
+        },
+      ],
     },
     {
       type: 'union',
@@ -154,10 +155,10 @@ const buildSparqlQuery = ({ containers, params: { filter }, blankNodes, predicat
         {
           type: 'graph',
           name: namedNode('http://semapps.org/mirror'),
-          patterns: resourceWhere
-        }
-      ]
-    }
+          patterns: resourceWhere,
+        },
+      ],
+    },
   );
 
   return generator.stringify(sparqlJsParams);

diff --git a/src/frontend/packages/semantic-data-provider/src/reification/GroupedReferenceHandler.js b/src/frontend/packages/semantic-data-provider/src/reification/GroupedReferenceHandler.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useGetList } from 'react-admin';
+import { useGetList, useRecordContext } from 'react-admin';
 import { default as FilterHandler } from './FilterHandler';
 
 /*
@@ -71,10 +71,8 @@ const GroupedReferenceHandler = ({
   filterProperty,
   ...otherProps
 }) => {
-  const { data } = useGetList({
-    resource: groupReference,
-    payload: {}
-  });
+  const record = useRecordContext();
+  const { data } = useGetList(groupReference);
 
   return (
     <>
@@ -84,7 +82,7 @@ const GroupedReferenceHandler = ({
         return (
           <>
             {groupHeader && groupHeader({ ...otherProps, group: data })}
-            <FilterHandler {...otherProps} filter={filter} label={data[groupLabel]}>
+            <FilterHandler {...otherProps} record={record} filter={filter} label={data[groupLabel]}>
               {children}
             </FilterHandler>
           </>