Merge branch 'post-milestone3m' into feature/widget-peoplesearch

Author: SharonStrats

src/login/login.ts

@@ -1047,10 +1047,20 @@ export function newAppInstance (
  * and/or a developer
  */
 export async function getUserRoles (): Promise<Array<NamedNode>> {
+  const sessionInfo = authSession.info
+  if (!sessionInfo?.isLoggedIn || !sessionInfo?.webId) {
+    return []
+  }
+
+  const currentUser = authn.currentUser()
+  if (!currentUser) {
+    return []
+  }
+
   try {
-    const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({})
+    const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({ me: currentUser })
     if (!preferencesFile || preferencesFileError) {
-      throw new Error(preferencesFileError)
+      throw new Error(preferencesFileError || 'Unable to load user preferences file.')
     }
     return solidLogicSingleton.store.each(
       me,

src/v2/components/actions/button/index.ts

@@ -4,6 +4,12 @@ export { Button }
 
 const BUTTON_TAG_NAME = 'solid-ui-button'
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'solid-ui-button': Button
+  }
+}
+
 if (!customElements.get(BUTTON_TAG_NAME)) {
   customElements.define(BUTTON_TAG_NAME, Button)
 }

src/widgets/buttons.ts

@@ -1028,6 +1028,10 @@ export function attachmentList (dom: HTMLDocument, subject: NamedNode, div: HTML
     attachmentLeft.appendChild(paperclip)
     const fhandler = options.uploadFolder ? droppedFileHandler : null
     makeDropTarget(paperclip, droppedURIHandler, fhandler) // beware missing the wire of the paparclip!
+    const paperclipImage = paperclip.querySelector('img')
+    if (paperclipImage) {
+      makeDropTarget(paperclipImage, droppedURIHandler, fhandler)
+    }
     makeDropTarget(attachmentLeft, droppedURIHandler, fhandler) // just the outer won't do it
 
     if (options.uploadFolder) { // Addd an explicit file upload button as well

src/widgets/dragAndDrop.js

@@ -15,12 +15,22 @@ import { style } from '../style'
 /* global FileReader alert */
 
 export function makeDropTarget (ele, droppedURIHandler, droppedFileHandler) {
+  const normalizeDroppedUris = function (uriText) {
+    return uriText
+      .split('\n')
+      .map(uri => uri.trim())
+      .filter(uri => uri && uri[0] !== '#')
+  }
+
   const dragoverListener = function (e) {
     e.preventDefault() // Need this; otherwise, drop does not work.
+    e.stopPropagation()
     e.dataTransfer.dropEffect = 'copy'
   }
 
   const dragenterListener = function (e) {
+    e.preventDefault()
+    e.stopPropagation()
     debug.log('dragenter event dropEffect: ' + e.dataTransfer.dropEffect)
     if (this.localStyle) {
       //  necessary not sure when
@@ -33,6 +43,7 @@ export function makeDropTarget (ele, droppedURIHandler, droppedFileHandler) {
     debug.log('dragenter event dropEffect 2: ' + e.dataTransfer.dropEffect)
   }
   const dragleaveListener = function (e) {
+    e.stopPropagation()
     debug.log('dragleave event dropEffect: ' + e.dataTransfer.dropEffect)
     if (this.savedStyle) {
       this.localStyle = this.savedStyle
@@ -43,6 +54,7 @@ export function makeDropTarget (ele, droppedURIHandler, droppedFileHandler) {
 
   const dropListener = function (e) {
     if (e.preventDefault) e.preventDefault() // stops the browser from redirecting off to the text.
+    if (e.stopPropagation) e.stopPropagation()
     debug.log('Drop event. dropEffect: ' + e.dataTransfer.dropEffect)
     debug.log(
       'Drop event. types: ' +
@@ -55,7 +67,7 @@ export function makeDropTarget (ele, droppedURIHandler, droppedFileHandler) {
       for (let t = 0; t < e.dataTransfer.types.length; t++) {
         const type = e.dataTransfer.types[t]
         if (type === 'text/uri-list') {
-          uris = e.dataTransfer.getData(type).split('\n') // @ ignore those starting with #
+          uris = normalizeDroppedUris(e.dataTransfer.getData(type))
           debug.log('Dropped text/uri-list: ' + uris)
         } else if (type === 'text/plain') {
           text = e.dataTransfer.getData(type)
@@ -79,13 +91,14 @@ export function makeDropTarget (ele, droppedURIHandler, droppedFileHandler) {
           droppedFileHandler(files)
         }
       }
-      if (uris === null && text && text.slice(0, 4) === 'http') {
-        uris = text
+      const trimmedText = text ? text.trim() : ''
+      if (uris === null && trimmedText && trimmedText.slice(0, 4) === 'http') {
+        uris = [trimmedText]
         debug.log('Waring: Poor man\'s drop: using text for URI') // chrome disables text/uri-list??
       }
     } else {
       // ... however, if we're IE, we don't have the .types property, so we'll just get the Text value
-      uris = [e.dataTransfer.getData('Text')]
+      uris = normalizeDroppedUris(e.dataTransfer.getData('Text'))
       debug.log('WARNING non-standard drop event: ' + uris[0])
     }
     debug.log('Dropped URI list (2): ' + uris)

src/widgets/forms.js

@@ -1903,7 +1903,14 @@ export function buildCheckboxForm (dom, kb, lab, del, ins, form, dataDoc, trista
   refresh()
   if (!editable) return box
 
+  let isUpdating = false // Prevent concurrent updates on double-click
+
   const boxHandler = function (_e) {
+    if (isUpdating) {
+      return // Ignore clicks while update is in progress
+    }
+    isUpdating = true
+    input.disabled = true // Disable button to provide user feedback
     colorCarrier.style.color = '#bbb' // grey -- not saved yet
     const toDelete = input.state === true ? ins : input.state === false ? del : []
     input.newState =
@@ -1924,6 +1931,8 @@ export function buildCheckboxForm (dom, kb, lab, del, ins, form, dataDoc, trista
       success,
       errorBody
     ) {
+      isUpdating = false
+      input.disabled = false
       if (!success) {
         if (toDelete.why) {
           const hmmm = kb.holds(

test/unit/login/login.test.ts

@@ -11,3 +11,34 @@ describe('ensureLoggedIn', () => {
     expect(testLogin.ensureLoggedIn({})).toBeInstanceOf(Object)
   })
 })
+
+describe('getUserRoles', () => {
+  afterEach(() => {
+    jest.restoreAllMocks()
+    jest.resetModules()
+  })
+
+  it('returns [] and does not load preferences when current user is missing', async () => {
+    const solidLogic = require('solid-logic')
+
+    solidLogic.authSession.info = {
+      isLoggedIn: true,
+      webId: 'https://alice.example.com/profile/card#me'
+    }
+
+    const currentUserSpy = jest
+      .spyOn(solidLogic.authn, 'currentUser')
+      .mockReturnValue(null)
+    const loadPreferencesSpy = jest.spyOn(
+      solidLogic.solidLogicSingleton.profile,
+      'loadPreferences'
+    )
+
+    const loginModule = require('../../../src/login/login')
+    const roles = await loginModule.getUserRoles()
+
+    expect(currentUserSpy).toHaveBeenCalled()
+    expect(roles).toEqual([])
+    expect(loadPreferencesSpy).not.toHaveBeenCalled()
+  })
+})

test/unit/widgets/forms/index.test.ts

@@ -1,5 +1,5 @@
 import { silenceDebugMessages } from '../../helpers/debugger'
-import { namedNode } from 'rdflib'
+import { namedNode, st } from 'rdflib'
 import ns from '../../../../src/ns'
 import { store } from 'solid-logic'
 
@@ -594,6 +594,57 @@ describe('buildCheckboxForm', () => {
       )
     ).toBeInstanceOf(HTMLDivElement)
   })
+
+  it('ignores rapid second click while async update is in progress and reenables button afterward', async () => {
+    const dataDoc = namedNode('http://example.com/#doc')
+    const form = namedNode('http://example.com/#form')
+    const subject = namedNode('http://example.com/#subject')
+    const predicate = namedNode('http://example.com/#predicate')
+    const object = namedNode('http://example.com/#object')
+    const statement = st(subject, predicate, object, dataDoc)
+
+    const originalEditable = store.updater.editable
+    const originalUpdate = store.updater.update
+
+    const updateSpy = jest.fn((_deletes, _inserts, callback) => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          callback(undefined, true, 'ok')
+          resolve(true)
+        }, 0)
+      })
+    })
+
+    store.updater.editable = jest.fn(() => true) as any
+    store.updater.update = updateSpy as any
+
+    try {
+      const box = buildCheckboxForm(
+        document,
+        store,
+        'label',
+        [],
+        statement,
+        form,
+        dataDoc,
+        false
+      )
+      const checkboxButton = box.querySelector('button') as HTMLButtonElement
+
+      checkboxButton.click()
+      checkboxButton.click()
+
+      expect(updateSpy).toHaveBeenCalledTimes(1)
+      expect(checkboxButton.disabled).toEqual(true)
+
+      await new Promise(resolve => setTimeout(resolve, 5))
+
+      expect(checkboxButton.disabled).toEqual(false)
+    } finally {
+      store.updater.editable = originalEditable
+      store.updater.update = originalUpdate
+    }
+  })
 })
 
 describe('newThing', () => {