diff --git a/src/lib/components/FormModel/form-model.component.js b/src/lib/components/FormModel/form-model.component.js
index e51a5678..391795d3 100644
--- a/src/lib/components/FormModel/form-model.component.js
+++ b/src/lib/components/FormModel/form-model.component.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import { FormActions, formUi } from '@inrupt/solid-sdk-forms';
import { useLiveUpdate } from '@solid/react';
-import { UI } from '@inrupt/lit-generated-vocab-common';
+import { UI } from '@solid/lit-vocab-common';
import { ThemeContext } from '@context';
import { SolidError, solidResponse } from '@utils';
diff --git a/src/lib/components/ProfileViewer/profile-viewer.component.js b/src/lib/components/ProfileViewer/profile-viewer.component.js
index ee063e64..79936767 100644
--- a/src/lib/components/ProfileViewer/profile-viewer.component.js
+++ b/src/lib/components/ProfileViewer/profile-viewer.component.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import ldflex from '@solid/query-ldflex';
+import { VCARD } from '@solid/lit-vocab-common';
// In-house Components
// Utils
import { SolidError } from '@utils';
@@ -45,10 +46,18 @@ export default class ProfileViewer extends Component
{
}
try {
- const name = await ldflex[webId].vcard_fn;
- const image = await ldflex[webId].vcard_hasPhoto;
- const company = await ldflex[webId]['vcard_organization-name'];
- const title = await ldflex[webId].vcard_role;
+ // const name = await ldflex[webId].vcard_fn;
+ // const image = await ldflex[webId].vcard_hasPhoto;
+ // const company = await ldflex[webId]['vcard_organization-name'];
+ // const title = await ldflex[webId].vcard_role;
+
+ console.log(`PMCB55: ABOUT TO GET PROFILE PROPERTIES...`);
+ const name = await ldflex[webId][VCARD.fn];
+ const image = await ldflex[webId][VCARD.hasPhoto];
+ const company = await ldflex[webId][VCARD.organization_name];
+ const title = await ldflex[webId][VCARD.role];
+ console.log(`PMCB55: GOT [${name}], [${image}], [${company}], [${title}]`);
+
this.setState({
name: (name && name.value) || '',
image: (image && image.value) || '',
diff --git a/src/lib/components/Uploader/uploader.component.js b/src/lib/components/Uploader/uploader.component.js
index d746c2f4..2ef3a249 100644
--- a/src/lib/components/Uploader/uploader.component.js
+++ b/src/lib/components/Uploader/uploader.component.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import { UI_COMMON } from '@inrupt/lit-generated-vocab-inrupt-common';
+import { UI_COMMON } from '@inrupt/lit-vocab-common';
import { lookup, extension } from 'mime-types';
import auth from 'solid-auth-client';
import { SolidError } from '@utils';
diff --git a/src/lib/constants/index.js b/src/lib/constants/index.js
index d9743fad..1a9b7d4f 100644
--- a/src/lib/constants/index.js
+++ b/src/lib/constants/index.js
@@ -1,4 +1,4 @@
-import { UI } from '@inrupt/lit-generated-vocab-common';
+import { UI } from '@solid/lit-vocab-common';
export const PERMISSIONS = {
APPEND: 'Append',
diff --git a/src/lib/hooks/useNotification.js b/src/lib/hooks/useNotification.js
index 485e77b6..cbe188ec 100644
--- a/src/lib/hooks/useNotification.js
+++ b/src/lib/hooks/useNotification.js
@@ -73,7 +73,12 @@ export const useNotification = owner => {
* @type {number}
*/
const unread = Array.isArray(notificationList)
- ? notificationList.filter(item => item.read === 'false').length
+ ? // TODO: PMCB55: The 'read' member of notification can be either
+ // 'null' if the Shape we validate against makes no mention of the
+ // predicate 'solid:read'. But if the Shape does reference this
+ // predicate, then it's value will be the string 'false' or 'true'
+ // (but with the correct XSD:boolean datatype).
+ notificationList.filter(item => !item.read || item.read === 'false').length
: 0;
/**
@@ -135,6 +140,7 @@ export const useNotification = owner => {
async (file, id, status = 'true') => {
try {
const { notify } = notification;
+
/**
* Update notification read to true
*/
diff --git a/src/lib/shapes/notification.json b/src/lib/shapes/notification.json
index c341e834..5f669a19 100644
--- a/src/lib/shapes/notification.json
+++ b/src/lib/shapes/notification.json
@@ -4,7 +4,7 @@
"terms": "http://purl.org/dc/terms#",
"as": "https://www.w3.org/ns/activitystreams#",
"schema": "http://schema.org/",
- "solid": "https://www.w3.org/ns/solid/terms#",
+ "solid": "http://www.w3.org/ns/solid/terms#",
"xsd": "http://www.w3.org/2001/XMLSchema#",
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
},
diff --git a/src/lib/utils/datestimes.test.js b/src/lib/utils/datestimes.test.js
index 9aac68a8..15ae9705 100644
--- a/src/lib/utils/datestimes.test.js
+++ b/src/lib/utils/datestimes.test.js
@@ -1,5 +1,5 @@
import { parseInitialValue, isValidDate } from './datetimes';
-import { UI } from '@inrupt/lit-generated-vocab-common';
+import { UI } from '@solid/lit-vocab-common';
describe('Parser should return the expected values', () => {
const time = '19:00:34';
diff --git a/src/lib/utils/datetimes.js b/src/lib/utils/datetimes.js
index 0fd797ed..7041de03 100644
--- a/src/lib/utils/datetimes.js
+++ b/src/lib/utils/datetimes.js
@@ -1,7 +1,7 @@
import { addHours, setHours, setMinutes, setSeconds } from 'date-fns';
import * as locales from 'date-fns/locale';
-import { UI } from '@inrupt/lit-generated-vocab-common';
+import { UI } from '@solid/lit-vocab-common';
/**
* @param value - object stored in the pod
diff --git a/src/lib/utils/solidFetch.js b/src/lib/utils/solidFetch.js
index d2456f7c..052a2884 100644
--- a/src/lib/utils/solidFetch.js
+++ b/src/lib/utils/solidFetch.js
@@ -1,5 +1,5 @@
import auth from 'solid-auth-client';
-import { VCARD } from '@inrupt/lit-generated-vocab-common';
+import { VCARD } from '@solid/lit-vocab-common';
import data from '@solid/query-ldflex';
export const fetchSchema = async file => {
@@ -113,6 +113,8 @@ export const getIdpFromWebId = async webId => {
if (fileRequest.ok) {
issuer = await data[webId]['solid:oidcIssuer'];
+
+ console.log(`PMCB55: ISSUER [${issuer}] for WEBID [${webId}]`);
}
if (issuer) {
@@ -121,6 +123,13 @@ export const getIdpFromWebId = async webId => {
} else {
const idpConfig = await auth.fetch(idpConfigUrl);
idp = idpConfig.ok ? webId : null;
+ console.log(
+ `PMCB55: IDP CONFIG [${JSON.stringify(
+ idpConfig,
+ null,
+ 2
+ )}] for idpConfigUrl [${idpConfigUrl}]`
+ );
}
}
return idp;
diff --git a/src/test/__mocks__/@solid/query-ldflex.js b/src/test/__mocks__/@solid/query-ldflex.js
index 358a692a..96748be2 100644
--- a/src/test/__mocks__/@solid/query-ldflex.js
+++ b/src/test/__mocks__/@solid/query-ldflex.js
@@ -9,8 +9,8 @@ const ldflex = {
properties: [],
subjects: []
};
-ldflex['ldp:inbox'] = ldflex;
-ldflex['https://example.org/#me'] = ldflex['ldp:inbox'];
+ldflex['http://www.w3.org/ns/ldp#inbox'] = ldflex;
+ldflex['https://example.org/#me'] = ldflex['http://www.w3.org/ns/ldp#inbox'];
ldflex['https://example.org/public/test.ttl.acl'] = { ...ldflex };
export default ldflex;