Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fetch of useInbox and useOutbox #1072

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix fetch of useInbox and useOutbox #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/frontend/packages/activitypub-components/dist/index.cjs.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/frontend/packages/activitypub-components/dist/index.cjs.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/frontend/packages/activitypub-components/dist/index.es.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/frontend/packages/activitypub-components/dist/index.es.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/frontend/packages/activitypub-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
"@semapps/auth-provider": "0.4.0-alpha.39",
"@semapps/field-components": "0.4.0-alpha.39",
"@semapps/semantic-data-provider": "0.4.0-alpha.39",
"@rdfjs/data-model": "^1.3.4",
"@tiptap/core": "^2.0.0-beta.95",
"@tiptap/extension-mention": "^2.0.0-beta.95",
"@tiptap/suggestion": "^2.0.0-beta.95",
"ra-richtext-tiptap": "^0.0.1",
"sparqljs": "^3.5.1",
"tippy.js": "^6.3.7"
},
"peerDependencies": {
Expand Down
79 changes: 54 additions & 25 deletions src/frontend/packages/activitypub-components/src/hooks/useInbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { useCallback, useMemo } from 'react';
import { useGetIdentity, fetchUtils } from 'react-admin';
import DataFactory from '@rdfjs/data-model';
import { buildBlankNodesQuery } from '@semapps/semantic-data-provider';
const { namedNode, triple, variable } = DataFactory;
const SparqlGenerator = require('sparqljs').Generator;
const generator = new SparqlGenerator({
/* prefixes, baseIRI, factory, sparqlStar */
});

const useInbox = () => {
const { identity } = useGetIdentity();
Expand All @@ -19,37 +25,60 @@ const useInbox = () => {

const fetch = useCallback(
async ({ filters }) => {
console.log('inboxUrl', inboxUrl, sparqlEndpoint);

if (!sparqlEndpoint || !inboxUrl) return;

const token = localStorage.getItem('token');
const blankNodesQuery = buildBlankNodesQuery(['as:object']);
const baseTriples = [
triple(namedNode(inboxUrl), namedNode('https://www.w3.org/ns/activitystreams#items'), variable('s1')),
triple(variable('s1'), variable('p1'), variable('o1'))
];

let filtersWhereQuery = '';
if (filters) {
Object.keys(filters).forEach(predicate => {
if (filters[predicate]) {
const object = filters[predicate].startsWith('http') ? `<${filters[predicate]}>` : filters[predicate];
filtersWhereQuery += `?s1 ${predicate} ${object} .`;
}
});
const baseQuery = {
construct: baseTriples,
where: [
...baseTriples
],
}

const query = `
PREFIX as: <https://www.w3.org/ns/activitystreams#>
CONSTRUCT {
?s1 ?p1 ?o1 .
${blankNodesQuery.construct}
}
WHERE {
<${inboxUrl}> as:items ?s1 .
?s1 ?p1 ?o1 .
FILTER( (isIRI(?s1)) ) .
${filtersWhereQuery}
${blankNodesQuery.where}
const token = localStorage.getItem('token');
const asOntology = { prefix: "as", url: "https://www.w3.org/ns/activitystreams#" };
const blankNodesQuery = buildBlankNodesQuery(['as:object'], baseQuery, [asOntology]);

const sparqlJsParams = {
type: 'query',
queryType: 'CONSTRUCT',
template: blankNodesQuery.construct,
where: blankNodesQuery.where,
prefixes: {
as: 'https://www.w3.org/ns/activitystreams#'
}
`;
};

// let filtersWhereQuery = '';
// if (filters) {
// Object.keys(filters).forEach(predicate => {
// if (filters[predicate]) {
// const object = filters[predicate].startsWith('http') ? `<${filters[predicate]}>` : filters[predicate];
// filtersWhereQuery += `?s1 ${predicate} ${object} .`;
// }
// });
// }
//
// const query = `
// PREFIX as: <https://www.w3.org/ns/activitystreams#>
// CONSTRUCT {
// ?s1 ?p1 ?o1 .
// ${blankNodesQuery.construct}
// }
// WHERE {
// <${inboxUrl}> as:items ?s1 .
// ?s1 ?p1 ?o1 .
// FILTER( (isIRI(?s1)) ) .
// ${filtersWhereQuery}
// ${blankNodesQuery.where}
// }
// `;

const query = generator.stringify(sparqlJsParams);

const { json } = await fetchUtils.fetchJson(sparqlEndpoint, {
method: 'POST',
Expand Down