Skip to content

Commit 765ab48

Browse files
bourgeoabourgeoa
authored
Merge pull request SolidOS#391 from solid/timbl-forms
Adding public data searches using autocomplete UX to the forms system.
2 parents e44ca42 + 2e6cd76 commit 765ab48

68 files changed

Lines changed: 5069 additions & 5676 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 2886 additions & 4913 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"mime-types": "^2.1.28",
6262
"pane-registry": "^2.3.5",
6363
"path-browserify": "^1.0.1",
64+
"postcss-flexbugs-fixes": "^5.0.2",
6465
"rdflib": "^2.1.7",
6566
"solid-auth-client": "^2.5.5",
6667
"solid-logic": "^1.3.5",
@@ -93,6 +94,7 @@
9394
"jest": "^26.6.3",
9495
"jsdom": "^16.4.0",
9596
"lint-staged": "^10.5.3",
97+
"raw-loader": "^4.0.2",
9698
"react-is": "^17.0.1",
9799
"solid-auth-cli": "^1.0.15",
98100
"standard": "^16.0.3",

‎src/acl/access-controller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { graph, NamedNode, UpdateManager } from 'rdflib'
88
import { AccessGroups } from './access-groups'
99
import { DataBrowserContext } from 'pane-registry'
1010
import { shortNameForFolder } from './acl-control'
11-
import utils from '../utils.js'
11+
import * as utils from '../utils.js'
1212
import * as debug from '../debug'
1313

1414
/**

‎src/acl/access-groups.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import { fetcher, IndexedFormula, NamedNode, sym } from 'rdflib'
88
import { ACLbyCombination, readACL } from './acl'
9-
import widgets from '../widgets'
10-
import ns from '../ns'
9+
import * as widgets from '../widgets'
10+
import * as ns from '../ns'
1111
import { AccessController } from './access-controller'
1212
import { AgentMapMap, ComboList, PartialAgentTriple } from './types'
1313
import { AddAgentButtons } from './add-agent-buttons'

‎src/acl/acl-control.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* @packageDocumentation
66
*/
77

8-
import ns from '../ns'
9-
import utils from '../utils.js'
8+
import * as ns from '../ns'
9+
import * as utils from '../utils.js'
1010
import { getACLorDefault, getProspectiveHolder } from './acl'
1111
import { IndexedFormula, NamedNode } from 'rdflib'
1212
import { DataBrowserContext } from 'pane-registry'

‎src/acl/acl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* @packageDocumentation
66
*/
77

8-
import ns from '../ns'
8+
import * as ns from '../ns'
99
import { solidLogicSingleton } from '../logic'
10-
import utils from '../utils'
10+
import * as utils from '../utils'
1111
import { AgentMapMap, AgentMapUnion, ComboList } from './types'
1212
import * as debug from '../debug'
1313
import { graph, IndexedFormula, NamedNode, serialize, st, Statement, sym } from 'rdflib'

‎src/acl/add-agent-buttons.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
*/
55

66
import { AccessGroups } from './access-groups'
7-
import icons from '../iconBase'
8-
import widgets from '../widgets'
9-
import ns from '../ns'
7+
import { icons } from '../iconBase'
8+
import * as widgets from '../widgets'
9+
import * as ns from '../ns'
1010
import { logInLoadProfile } from '../authn/authn'
11-
import utils from '../utils'
11+
import * as utils from '../utils'
1212
import { NamedNode, Store } from 'rdflib'
1313
import { AuthenticationContext } from '../authn/types'
1414
import * as debug from '../debug'

‎src/authn/authn.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import { graph, namedNode, NamedNode, Namespace, serialize, st, Statement, sym, BlankNode } from 'rdflib'
2323
import solidAuthClient from 'solid-auth-client'
2424
import { PaneDefinition } from 'pane-registry'
25-
import Signup from './signup'
26-
import widgets from '../widgets'
27-
import ns from '../ns.js'
28-
import utils from '../utils.js'
25+
import { Signup } from './signup'
26+
import * as widgets from '../widgets'
27+
import * as ns from '../ns.js'
28+
import * as utils from '../utils.js'
2929
import { alert } from '../log'
3030
import { AppDetails, AuthenticationContext } from './types'
3131
import * as debug from '../debug'
@@ -208,7 +208,7 @@ export async function logInLoadPreferences (context: AuthenticationContext): Pro
208208
} catch (err) {
209209
let m2: string
210210
if (err instanceof UnauthorizedError) {
211-
m2 = 'Strange - you are not authenticated (properly logged in) to read preference file.'
211+
m2 = 'Ooops - you are not authenticated (properly logged in) to for me to read your preference file. Try loggin out and logging in?'
212212
alert(m2)
213213
} else if (err instanceof CrossOriginForbiddenError) {
214214
m2 = `Unauthorized: Assuming preference file blocked for origin ${window.location.origin}`
@@ -439,7 +439,7 @@ export async function findAppInstances (
439439
for (let i = 0; i < containers.length; i++) {
440440
const cont = containers[i]
441441
context.instances = context.instances.concat(
442-
solidLogicSingleton.getContainerElements(cont as NamedNode) as NamedNode[]
442+
(await solidLogicSingleton.getContainerMembers(cont.value)).map(uri => solidLogicSingleton.store.sym(uri)) // @@ warning: uses strings not NN
443443
)
444444
}
445445
return context
@@ -1027,10 +1027,10 @@ export function loginStatusBox (
10271027
box.refresh = function () {
10281028
solidAuthClient.currentSession().then(
10291029
session => {
1030-
if (session && session.webId) {
1030+
if (session && session.webId) { // offline
10311031
me = sym(session.webId)
10321032
} else {
1033-
me = null
1033+
me = offlineTestID() // null unless testing
10341034
}
10351035
if ((me && box.me !== me.uri) || (!me && box.me)) {
10361036
widgets.clearElement(box)

‎src/authn/config-default.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* modules.
55
* @module config-default
66
*/
7-
module.exports = {
7+
export default { // @@ should not use export default
88
/**
99
* Primary authentication endpoint
1010
*/

‎src/authn/signup.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const defaultConfig = require('./config-default')
1+
import defaultConfig from './config-default'
22

33
/**
44
* Provides functionality for signing up with a Solid provider
@@ -9,7 +9,7 @@ const defaultConfig = require('./config-default')
99
* Creates a Signup UI manager
1010
* @class
1111
*/
12-
function Signup (config) {
12+
export function Signup (config) {
1313
this.config = config || defaultConfig
1414
}
1515

@@ -72,5 +72,3 @@ Signup.prototype.signup = function signup (signupUrl) {
7272
})
7373
})
7474
}
75-
76-
module.exports = Signup

0 commit comments

Comments
 (0)