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.

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

fix: duplicated elements on public link page #11137

Merged
merged 2 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Duplicated elements on public link page

We've fixed a bug where clicking the ownCloud logo on a public link page would lead to certain UI elements being duplicated.

https://github.com/owncloud/web/pull/11137
https://github.com/owncloud/web/issues/10371
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const useFileActionsCopy = () => {
}

if (isLocationPublicActive(router, 'files-public-link')) {
return unref(currentFolder).canCreate()
return unref(currentFolder)?.canCreate()
}

if (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const useFileActionsPaste = () => {
}

if (isLocationPublicActive(router, 'files-public-link') && unref(currentFolder)) {
return unref(currentFolder).canCreate()
return unref(currentFolder)?.canCreate()
}

// copy can't be restricted in authenticated context, because
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ export const useExtensionRegistry = defineStore('extensionRegistry', () => {
const registerExtensions = (e: Ref<Extension[]>) => {
extensions.value.push(e)
}
const unregisterExtensions = (ids: string[]) => {
extensions.value = unref(extensions)
.map((e) => ref(unref(e).filter(({ id }) => !ids.includes(id))))
.filter((e) => unref(e).length)
}
const requestExtensions = <T extends Extension>(extensionPoint: ExtensionPoint<T>) => {
if (!extensionPoint.id || !extensionPoint.extensionType) {
throw new Error('ExtensionPoint must have an id and an extensionType')
Expand All @@ -30,6 +35,11 @@ export const useExtensionRegistry = defineStore('extensionRegistry', () => {
const registerExtensionPoints = <T extends Extension>(e: Ref<ExtensionPoint<T>[]>) => {
extensionPoints.value.push(e)
}
const unregisterExtensionPoints = (ids: string[]) => {
extensionPoints.value = unref(extensionPoints)
.map((e) => ref(unref(e).filter(({ id }) => !ids.includes(id))))
.filter((e) => unref(e).length)
}
const getExtensionPoints = <T extends ExtensionPoint<Extension>>(
options: {
extensionType?: ExtensionType
Expand All @@ -52,9 +62,11 @@ export const useExtensionRegistry = defineStore('extensionRegistry', () => {
return {
extensions,
registerExtensions,
unregisterExtensions,
requestExtensions,
extensionPoints,
registerExtensionPoints,
unregisterExtensionPoints,
getExtensionPoints
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,36 @@ describe('useExtensionRegistry', () => {
}
})
})

it('unregisters extensions', () => {
const extensionPoint: ExtensionPoint<CustomComponentExtension> = mock<
ExtensionPoint<CustomComponentExtension>
>({
id: 'extension-point-id',
extensionType: 'customComponent'
})

const extension = mock<Extension>({
id: 'foo-1',
type: 'customComponent',
extensionPointIds: [extensionPoint.id]
})
const extensions = computed(() => [extension])

getWrapper({
setup: (instance) => {
instance.registerExtensions(extensions)

const result1 = instance.requestExtensions(extensionPoint)
expect(result1.length).toBe(1)

instance.unregisterExtensions([extension.id])

const result2 = instance.requestExtensions(extensionPoint)
expect(result2.length).toBe(0)
}
})
})
})

describe('register and get extensionPoints', () => {
Expand Down Expand Up @@ -196,6 +226,29 @@ describe('useExtensionRegistry', () => {
}
})
})

it('unregisters extension points', () => {
const extensionPoint = mock<ExtensionPoint<CustomComponentExtension>>({
id: 'foo-1',
extensionType: 'customComponent'
})

const extensionPoints = computed<ExtensionPoint<Extension>[]>(() => [extensionPoint])

getWrapper({
setup: (instance) => {
instance.registerExtensionPoints(extensionPoints)

const result1 = instance.getExtensionPoints({ extensionType: 'customComponent' })
expect(result1.length).toBe(1)

instance.unregisterExtensionPoints([extensionPoint.id])

const result2 = instance.getExtensionPoints({ extensionType: 'customComponent' })
expect(result2.length).toBe(0)
}
})
})
})
})

Expand Down
37 changes: 25 additions & 12 deletions packages/web-runtime/src/layouts/Application.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,18 @@ import MobileNav from '../components/MobileNav.vue'
import { NavItem, getExtensionNavItems } from '../helpers/navItems'
import { LoadingIndicator } from '@ownclouders/web-pkg'
import { useActiveApp, useRoute, useRouteMeta, useSpacesLoading } from '@ownclouders/web-pkg'
import { computed, defineComponent, provide, ref, toRef, unref, watch } from 'vue'
import {
computed,
defineComponent,
nextTick,
onBeforeUnmount,
onMounted,
provide,
ref,
toRef,
unref,
watch
} from 'vue'
import { useRouter } from 'vue-router'
import { useGettext } from 'vue3-gettext'

Expand Down Expand Up @@ -200,14 +211,25 @@ export default defineComponent({
const extensionPoints = computed<ExtensionPoint<Extension>[]>(() => [progressBarExtensionPoint])
extensionRegistry.registerExtensionPoints(extensionPoints)

onMounted(async () => {
await nextTick()
window.addEventListener('resize', onResize)
onResize()
})

onBeforeUnmount(() => {
window.removeEventListener('resize', onResize)

extensionRegistry.unregisterExtensions([progressBarExtensionId])
extensionRegistry.unregisterExtensionPoints(unref(extensionPoints).flatMap((e) => e.id))
})

return {
apps,
defaultProgressBarExtension,
progressBarExtensionPoint,
isSidebarVisible,
isLoading,
navItems,
onResize,
isMobileWidth,
navBarClosed,
setNavBarClosed
Expand Down Expand Up @@ -239,15 +261,6 @@ export default defineComponent({
(b.applicationMenu?.priority || Number.MAX_SAFE_INTEGER)
)
}
},
mounted() {
this.$nextTick(() => {
window.addEventListener('resize', this.onResize)
this.onResize()
})
},
beforeUnmount() {
window.removeEventListener('resize', this.onResize)
}
})
</script>
Expand Down
3 changes: 2 additions & 1 deletion packages/web-runtime/src/services/auth/authService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ export class AuthService implements AuthServiceInterface {
if (publicLinkToken) {
await this.publicLinkManager.updateContext(publicLinkToken)
}
} else {
} else if (to.name !== 'resolvePublicLink') {
// no need to clear public context if we're routing the to public link resolving page
this.publicLinkManager.clearContext()
}

Expand Down