Skip to content
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
2 changes: 1 addition & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"portal-vue": "^3.0.0",
"tippy.js": "^6.3.7",
"vue-inline-svg": "^4.0.0",
"vue-router": "^4.2.5",
"vue-router": "^5.0.0",
"vue-select": "^4.0.0-beta.6",
"vue3-gettext": "^2.4.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
'oc-breadcrumb-list-item',
'flex',
'items-center',
{
'sr-only': isItemHidden(item, index)
}
{ 'sr-only': isItemHidden(item) }
]"
@dragover.prevent
@dragenter.prevent="dropItemStyling(item, index, false, $event)"
Expand Down Expand Up @@ -227,7 +225,7 @@ const hiddenItems = ref<BreadcrumbItem[]>([])
const displayItems: Ref<BreadcrumbItem[]> = ref([])
displayItems.value = items

const isItemHidden = (item: BreadcrumbItem, index: number): boolean => {
const isItemHidden = (item: BreadcrumbItem): boolean => {
return (
hiddenItems.value.indexOf(item) !== -1 ||
(item.isTruncationPlaceholder && hiddenItems.value.length === 0)
Expand Down Expand Up @@ -286,10 +284,6 @@ const reduceBreadcrumb = (offsetIndex: number) => {
reduceBreadcrumb(offsetIndex)
}

const lastHiddenItem = computed(() =>
hiddenItems.value.length >= 1 ? unref(hiddenItems)[unref(hiddenItems).length - 1] : { to: {} }
)

const renderBreadcrumb = () => {
displayItems.value = [...items]
if (displayItems.value.length > truncationOffset - 1) {
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-activities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"pinia": "^2.2.2 || ^3.0.0",
"luxon": "^3.5.0",
"vue-concurrency": "^5.0.1",
"vue-router": "^4.2.5",
"vue-router": "^4.2.5 || ^5.0.0",
"vue3-gettext": "^2.4.0"
}
}
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"pinia": "3.0.4",
"uuid": "13.0.0",
"vue-concurrency": "5.0.3",
"vue-router": "4.6.4"
"vue-router": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/web-app-app-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"mark.js": "^8.11.1",
"pinia": "3.0.4",
"vue-concurrency": "5.0.3",
"vue-router": "4.6.4",
"vue-router": "5.0.0",
"zod": "4.3.6",
"vue3-gettext": "2.4.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-external/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"uuid": "13.0.0",
"vue-concurrency": "5.0.3",
"vue3-gettext": "2.4.0",
"vue-router": "4.6.4",
"vue-router": "5.0.0",
"zod": "4.3.6"
}
}
2 changes: 1 addition & 1 deletion packages/web-app-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"qs": "6.14.1",
"uuid": "13.0.0",
"vue-concurrency": "5.0.3",
"vue-router": "4.6.4",
"vue-router": "5.0.0",
"vue3-gettext": "2.4.0",
"web-app-search": "workspace:*"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { mockDeep } from 'vitest-mock-extended'
import ResourceUpload from '../../../../../src/components/AppBar/Upload/ResourceUpload.vue'
import {
defaultComponentMocks,
defaultPlugins,
defaultStubs,
mount
} from '@opencloud-eu/web-test-helpers'
import { defaultComponentMocks, defaultPlugins, shallowMount } from '@opencloud-eu/web-test-helpers'
import { UppyService } from '@opencloud-eu/web-pkg'
import { OcButton } from '@opencloud-eu/design-system/components'

Expand All @@ -30,16 +25,15 @@ describe('Resource Upload Component', () => {
it('should call "triggerUpload"', async () => {
const { wrapper } = getWrapper()

const spyTriggerUpload = vi.spyOn(wrapper.vm, 'triggerUpload')
const uploadButton = wrapper.find('button')
const fileUploadInput = wrapper.find('#files-file-upload-input')

;(fileUploadInput.element as HTMLElement).click = vi.fn()
await wrapper.vm.$forceUpdate()
const clickMock = vi.fn()
;(fileUploadInput.element as HTMLElement).click = clickMock

await uploadButton.trigger('click')

expect(spyTriggerUpload).toHaveBeenCalledTimes(1)
expect(clickMock).toHaveBeenCalledTimes(1)
expect((fileUploadInput.element as HTMLElement).click).toHaveBeenCalledTimes(1)
})
})
Expand All @@ -59,11 +53,11 @@ function getWrapper(props = {}, uppyService = mockDeep<UppyService>()) {
}
return {
mocks,
wrapper: mount(ResourceUpload, {
wrapper: shallowMount(ResourceUpload, {
props,
global: {
mocks,
stubs: defaultStubs,
stubs: { OcButton: false },
provide: mocks,
plugins: [...defaultPlugins()]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,15 @@
exports[`Resource Upload Component > file upload > should render component 1`] = `
"<div class="relative overflow-hidden"><button type="button" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-start text-base min-h-4 oc-button cursor-pointer disabled:opacity-60 disabled:cursor-default">
<!--v-if-->
<!-- @slot Content of the button --> <span class="oc-icon box-content inline-block align-baseline [&amp;_svg]:block size-5.5 oc-resource-icon inline-flex items-center [&amp;_svg]:h-[70%] [&amp;_svg]:h-5.5! sm:[&amp;_svg]:h-full"><svg data-testid="inline-svg-stub" src="icons/resource-type-file-fill.svg" transform-source="(svg) => {
if (__props.accessibleLabel !== &quot;&quot;) {
const title = document.createElement(&quot;title&quot;);
title.setAttribute(&quot;id&quot;, svgTitleId.value);
title.appendChild(document.createTextNode(__props.accessibleLabel));
svg.insertBefore(title, svg.firstChild);
};
return svg;
}" aria-hidden="true" focusable="false" style="fill: var(--oc-role-on-surface);" class="size-5.5"></svg></span> <span id="files-file-upload-button">Files</span>
<!-- @slot Content of the button -->
<resource-icon-stub resource="[object Object]" size="medium" class="[&amp;_svg]:h-5.5! sm:[&amp;_svg]:h-full"></resource-icon-stub> <span id="files-file-upload-button">Files</span>
</button> <input id="files-file-upload-input" multiple="" class="absolute left-[99999px]" type="file" aria-labelledby="files-file-upload-button" name="folder" tabindex="-1"></div>"
`;

exports[`Resource Upload Component > folder upload > should render component 1`] = `
"<div class="relative overflow-hidden"><button type="button" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-start text-base min-h-4 oc-button cursor-pointer disabled:opacity-60 disabled:cursor-default">
<!--v-if-->
<!-- @slot Content of the button --> <span class="oc-icon box-content inline-block align-baseline [&amp;_svg]:block size-5.5 oc-resource-icon inline-flex items-center [&amp;_svg]:h-5.5! sm:[&amp;_svg]:h-full"><svg data-testid="inline-svg-stub" src="icons/resource-type-folder-fill.svg" transform-source="(svg) => {
if (__props.accessibleLabel !== &quot;&quot;) {
const title = document.createElement(&quot;title&quot;);
title.setAttribute(&quot;id&quot;, svgTitleId.value);
title.appendChild(document.createTextNode(__props.accessibleLabel));
svg.insertBefore(title, svg.firstChild);
};
return svg;
}" aria-hidden="true" focusable="false" style="fill: var(--oc-color-icon-folder);" class="size-5.5"></svg></span> <span id="files-folder-upload-button">Folder</span>
<!-- @slot Content of the button -->
<resource-icon-stub resource="[object Object]" size="medium" class="[&amp;_svg]:h-5.5! sm:[&amp;_svg]:h-full"></resource-icon-stub> <span id="files-folder-upload-button">Folder</span>
</button> <input id="files-folder-upload-input" webkitdirectory="true" mozdirectory="true" allowdirs="true" class="absolute left-[99999px]" type="file" aria-labelledby="files-folder-upload-button" name="file" tabindex="-1"></div>"
`;
2 changes: 1 addition & 1 deletion packages/web-app-mail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"mark.js": "^8.11.1",
"pinia": "3.0.4",
"vue-concurrency": "5.0.3",
"vue-router": "^4.2.5",
"vue-router": "^4.2.5 || ^5.0.0",
"vue3-gettext": "2.4.0",
"zod": "4.3.6",
"dompurify": "^3.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-ocm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"lodash-es": "4.17.23",
"vue-concurrency": "5.0.3",
"uuid": "13.0.0",
"vue-router": "4.6.4",
"vue-router": "5.0.0",
"zod": "4.3.6"
}
}
2 changes: 1 addition & 1 deletion packages/web-app-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"@vueuse/core": "^14.0.0",
"lodash-es": "^4.17.21",
"vue3-gettext": "2.4.0",
"vue-router": "4.6.4"
"vue-router": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/web-app-search/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"mark.js": "^8.11.1",
"pinia": "3.0.4",
"vue3-gettext": "2.4.0",
"vue-router": "4.6.4"
"vue-router": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/web-pkg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"screenfull": "^6.0.2",
"uuid": "^13.0.0",
"vue-concurrency": "^5.0.1",
"vue-router": "^4.2.5",
"vue-router": "^5.0.0",
"vue3-gettext": "^2.4.0",
"zod": "^4.0.0"
},
Expand Down
21 changes: 6 additions & 15 deletions packages/web-pkg/src/components/PortalTarget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,15 @@
<portal-target-vue v-bind="properties" />
</template>

<script lang="ts">
import { computed, defineComponent, onMounted } from 'vue'
<script setup lang="ts">
import { computed, onMounted } from 'vue'
import { eventBus } from '../services'
import { PortalTargetEventTopics } from '../composables/portalTarget'
import { PortalTarget as PortalTargetVue } from 'portal-vue'

export default defineComponent({
name: 'PortalTarget',
components: { PortalTargetVue },
props: {
...PortalTargetVue.props
},
setup(props) {
const properties = computed<typeof PortalTargetVue.props>(() => props)
onMounted(() => {
eventBus.publish(PortalTargetEventTopics.mounted, props)
})
return { properties }
}
const props = { ...PortalTargetVue.props }
const properties = computed<typeof PortalTargetVue.props>(() => props)
onMounted(() => {
eventBus.publish(PortalTargetEventTopics.mounted, props)
})
</script>
2 changes: 1 addition & 1 deletion packages/web-pkg/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
},

// include component types of the design-system
"include": ["../design-system/types.d.ts", "./web.declarations.d.ts", "./src/**/*"]
"include": ["../design-system/types.d.ts", "./web.declarations.d.ts", "./**/*"]
}
3 changes: 0 additions & 3 deletions packages/web-pkg/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
PreviewService,
PasswordPolicyService
} from './src/services'
import { Route, Router } from 'vue-router'

export * from './src'

Expand All @@ -18,7 +17,5 @@ declare module 'vue' {
$loadingService: LoadingService
$previewService: PreviewService
$passwordPolicyService: PasswordPolicyService
$router: Router
$route: Route
}
}
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"utf8": "^3.0.0",
"uuid": "13.0.0",
"vue-concurrency": "5.0.3",
"vue-router": "4.6.4",
"vue-router": "5.0.0",
"vue": "3.5.27",
"vue3-gettext": "2.4.0",
"webdav": "5.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-test-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"axios": "^1.7.9",
"pinia": "^3.0.0",
"vitest-mock-extended": "^3.0.0",
"vue-router": "^4.2.5",
"vue-router": "^5.0.0",
"vue3-gettext": "^2.4.0"
}
}
13 changes: 0 additions & 13 deletions packages/web-test-helpers/web.d.ts

This file was deleted.

Loading