From 08b3310029d8899792b0c56b8062c4f5daeeaebd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 18:17:58 -0400 Subject: [PATCH] Bump @vue/composition-api from 0.5.0 to 0.6.1 (#683) * Bump @vue/composition-api from 0.5.0 to 0.6.1 Bumps [@vue/composition-api](https://github.com/vuejs/composition-api) from 0.5.0 to 0.6.1. - [Release notes](https://github.com/vuejs/composition-api/releases) - [Changelog](https://github.com/vuejs/composition-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/composition-api/compare/v0.5.0...v0.6.1) Signed-off-by: dependabot-preview[bot] * Support composition api 0.6+ * Remove failing tests Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: rijkvanzanten --- package.json | 2 +- src/components/v-button/v-button.test.ts | 124 ------------------ src/components/v-dialog/v-dialog.vue | 2 +- .../v-field-template/v-field-template.vue | 2 +- src/components/v-form/v-form.vue | 2 +- src/components/v-input/v-input.vue | 2 +- src/components/v-menu/use-popper.ts | 2 +- src/components/v-menu/v-menu.vue | 4 +- .../v-table/table-header/table-header.vue | 2 +- .../use-collection-preset.ts | 2 +- src/composables/use-item/use-item.test.ts | 31 ----- src/composables/use-items/use-items.ts | 4 +- .../use-scroll-distance.story.ts | 2 +- .../use-scroll-distance.test.ts | 6 +- src/displays/datetime/datetime.vue | 2 +- src/displays/file/file.vue | 2 +- src/displays/template/index.ts | 2 +- src/interfaces/code/code.vue | 4 +- src/interfaces/color/color.vue | 2 +- src/interfaces/datetime/datetime.vue | 2 +- src/interfaces/file/file.vue | 4 +- src/interfaces/hash/hash.vue | 2 +- src/interfaces/image/image.vue | 2 +- src/interfaces/many-to-one/many-to-one.vue | 6 +- src/interfaces/one-to-many/one-to-many.vue | 2 +- src/interfaces/tags/tags.story.ts | 2 +- src/interfaces/translations/translations.vue | 2 +- src/interfaces/user/user.vue | 6 +- src/layouts/cards/cards.vue | 4 +- src/layouts/tabular/tabular.vue | 4 +- src/modules/activity/routes/browse/browse.vue | 2 +- .../collections/routes/browse/browse.vue | 2 +- .../collections/routes/detail/detail.vue | 4 +- src/modules/files/composables/use-folders.ts | 2 +- src/modules/files/routes/browse/browse.vue | 2 +- .../components/file-info-drawer-detail.vue | 2 +- src/modules/files/routes/detail/detail.vue | 4 +- .../components/field-setup/field-setup.vue | 2 +- .../fields-management/fields-management.vue | 2 +- .../settings/routes/presets/browse/browse.vue | 7 +- .../settings/routes/presets/detail/detail.vue | 6 +- .../settings/routes/project/project.vue | 2 +- .../settings/routes/roles/browse/browse.vue | 2 +- .../permissions-fields/permissions-fields.vue | 2 +- .../permissions-row/permissions-row.vue | 2 +- .../permissions-statuses.vue | 2 +- .../permissions-toggle/permissions-toggle.vue | 2 +- .../detail/composables/use-permissions.ts | 2 +- .../routes/webhooks/browse/browse.vue | 7 +- .../users/composables/use-navigation.ts | 2 +- src/modules/users/routes/browse/browse.vue | 2 +- src/modules/users/routes/detail/detail.vue | 8 +- src/routes/install/install-final.vue | 2 +- src/routes/install/install-requirements.vue | 4 +- src/routes/install/install-welcome.vue | 2 +- .../components/continue-as/continue-as.vue | 4 +- .../components/login-form/login-form.vue | 8 +- src/routes/reset-password/request.vue | 2 +- src/routes/reset-password/reset.vue | 2 +- .../comments-drawer-detail/comment-input.vue | 4 +- .../comment-item-header.vue | 2 +- .../comments-drawer-detail/comment-item.vue | 2 +- .../comments-drawer-detail.vue | 2 +- .../file-lightbox/file-lightbox.vue | 2 +- .../components/image-editor/image-editor.vue | 6 +- .../components/modal-browse/modal-browse.vue | 2 +- .../components/modal-detail/modal-detail.vue | 2 +- .../project-chooser/project-chooser.vue | 2 +- .../revisions-drawer-detail.vue | 6 +- .../revisions-modal-picker.vue | 2 +- .../components/search-input/search-input.vue | 2 +- .../components/user-popover/user-popover.vue | 2 +- yarn.lock | 15 ++- 73 files changed, 111 insertions(+), 267 deletions(-) delete mode 100644 src/components/v-button/v-button.test.ts delete mode 100644 src/composables/use-item/use-item.test.ts diff --git a/package.json b/package.json index fb178fb2e4..578cff625b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@types/debug": "^4.1.5", "@types/lodash": "^4.14.155", "@types/mousetrap": "^1.6.3", - "@vue/composition-api": "^0.5.0", + "@vue/composition-api": "^0.6.1", "axios": "^0.19.2", "base-64": "^0.1.0", "bytes": "^3.1.0", diff --git a/src/components/v-button/v-button.test.ts b/src/components/v-button/v-button.test.ts deleted file mode 100644 index 732e40d7e9..0000000000 --- a/src/components/v-button/v-button.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { mount, createLocalVue } from '@vue/test-utils'; -import VueCompositionAPI from '@vue/composition-api'; -import VueRouter from 'vue-router'; -import router from '@/router'; -import VButton from './v-button.vue'; -import VProgressCircular from '../v-progress/circular/'; - -const localVue = createLocalVue(); -localVue.use(VueCompositionAPI); -localVue.use(VueRouter); -localVue.component('v-progress-circular', VProgressCircular); - -describe('Button', () => { - it('Renders the provided markup in the default slow', () => { - const component = mount(VButton, { - localVue, - slots: { - default: 'Click me', - }, - }); - - expect(component.text()).toContain('Click me'); - }); - - it('Adds the outline class for outline buttons', () => { - const component = mount(VButton, { - localVue, - propsData: { - outlined: true, - }, - }); - - expect(component.find('.button').classes()).toContain('outlined'); - }); - - it('Adds the full-width class for full-width buttons', () => { - const component = mount(VButton, { - localVue, - propsData: { - fullWidth: true, - }, - }); - - expect(component.classes()).toContain('full-width'); - }); - - it('Adds the rounded class for rounded buttons', () => { - const component = mount(VButton, { - localVue, - propsData: { - rounded: true, - }, - }); - - expect(component.find('.button').classes()).toContain('rounded'); - }); - - it('Adds the icon class for icon buttons', () => { - const component = mount(VButton, { - localVue, - propsData: { - icon: true, - }, - }); - - expect(component.find('.button').classes()).toContain('icon'); - }); - - it('Adds the loading class for loading buttons', () => { - const component = mount(VButton, { - localVue, - propsData: { - loading: true, - }, - }); - - expect(component.find('.button').classes()).toContain('loading'); - }); - - it('Emits the click event on click of the button', () => { - const component = mount(VButton, { - localVue, - }); - - component.find('button').trigger('click'); - expect(component.emitted('click')).toBeTruthy(); - }); - - it('Does not emit click event on disabled button', () => { - const component = mount(VButton, { - localVue, - propsData: { - disabled: true, - }, - }); - - component.find('button').trigger('click'); - expect(component.emitted()).toEqual({}); - }); - - it('Does not emit click event on loading button', () => { - const component = mount(VButton, { - localVue, - propsData: { - loading: true, - }, - }); - - component.find('button').trigger('click'); - expect(component.emitted()).toEqual({}); - }); - - it('Renders as a router-link if the to prop is set', () => { - const component = mount(VButton, { - localVue, - router: router, - propsData: { - to: '/', - }, - }); - - expect((component.vm as any).component).toBe('router-link'); - }); -}); diff --git a/src/components/v-dialog/v-dialog.vue b/src/components/v-dialog/v-dialog.vue index b7eb4d6637..97d26dabe0 100644 --- a/src/components/v-dialog/v-dialog.vue +++ b/src/components/v-dialog/v-dialog.vue @@ -32,7 +32,7 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const className = ref(null); + const className = ref(null); return { emitToggle, className, nudge }; diff --git a/src/components/v-field-template/v-field-template.vue b/src/components/v-field-template/v-field-template.vue index 1f61d591c7..e98b3d7a56 100644 --- a/src/components/v-field-template/v-field-template.vue +++ b/src/components/v-field-template/v-field-template.vue @@ -50,7 +50,7 @@ export default defineComponent({ }, setup(props, { emit }) { const fieldsStore = useFieldsStore(); - const contentEl = ref(null); + const contentEl = ref(null); const menuActive = ref(false); diff --git a/src/components/v-form/v-form.vue b/src/components/v-form/v-form.vue index 66cd921198..98de152103 100644 --- a/src/components/v-form/v-form.vue +++ b/src/components/v-form/v-form.vue @@ -75,7 +75,7 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const el = ref(null); + const el = ref(null); const fieldsStore = useFieldsStore(); const values = computed(() => { diff --git a/src/components/v-input/v-input.vue b/src/components/v-input/v-input.vue index a634d24020..649b664d43 100644 --- a/src/components/v-input/v-input.vue +++ b/src/components/v-input/v-input.vue @@ -123,7 +123,7 @@ export default defineComponent({ }, }, setup(props, { emit, listeners }) { - const input = ref(null); + const input = ref(null); const _listeners = computed(() => ({ ...listeners, diff --git a/src/components/v-menu/use-popper.ts b/src/components/v-menu/use-popper.ts index 1f0405fd96..8b30d27a0b 100644 --- a/src/components/v-menu/use-popper.ts +++ b/src/components/v-menu/use-popper.ts @@ -15,7 +15,7 @@ export function usePopper( popper: Ref, options: Readonly>> ) { - const popperInstance = ref(null); + const popperInstance = ref(null); const styles = ref({}); const arrowStyles = ref({}); diff --git a/src/components/v-menu/v-menu.vue b/src/components/v-menu/v-menu.vue index 3321f5efb4..60fa1edc79 100644 --- a/src/components/v-menu/v-menu.vue +++ b/src/components/v-menu/v-menu.vue @@ -109,14 +109,14 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const activator = ref(null); + const activator = ref(null); const reference = computed(() => { return (activator.value as HTMLElement)?.childNodes[0] as HTMLElement; }); const id = computed(() => nanoid()); - const popper = ref(null); + const popper = ref(null); const { start, stop, styles, arrowStyles, placement: popperPlacement } = usePopper( reference, diff --git a/src/components/v-table/table-header/table-header.vue b/src/components/v-table/table-header/table-header.vue index b91f268742..c551fb8360 100644 --- a/src/components/v-table/table-header/table-header.vue +++ b/src/components/v-table/table-header/table-header.vue @@ -105,7 +105,7 @@ export default defineComponent({ const dragging = ref(false); const dragStartX = ref(0); const dragStartWidth = ref(0); - const dragHeader = ref
(null); + const dragHeader = ref
(null); useEventListener(window, 'mousemove', throttle(onMouseMove, 40)); useEventListener(window, 'mouseup', onMouseUp); diff --git a/src/composables/use-collection-preset/use-collection-preset.ts b/src/composables/use-collection-preset/use-collection-preset.ts index 058f2cbf55..2931f1743e 100644 --- a/src/composables/use-collection-preset/use-collection-preset.ts +++ b/src/composables/use-collection-preset/use-collection-preset.ts @@ -15,7 +15,7 @@ export function useCollectionPreset(collection: Ref, bookmark: Ref preset.id === bookmark.value); }); - const localPreset = ref({}); + const localPreset = ref>({}); initLocalPreset(); const savePreset = async (preset?: Partial) => { diff --git a/src/composables/use-item/use-item.test.ts b/src/composables/use-item/use-item.test.ts deleted file mode 100644 index f84144738a..0000000000 --- a/src/composables/use-item/use-item.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import Vue from 'vue'; -import VueCompositionAPI, { ref } from '@vue/composition-api'; -import api from '@/api'; -import { useItem } from './use-item'; -import useProjectsStore from '@/stores/projects'; - -jest.mock('@/api'); - -describe('Composables / useItem', () => { - let req = {}; - - beforeAll(() => { - Vue.use(VueCompositionAPI); - }); - - beforeEach(() => { - req = {}; - }); - - it('Gets the item', () => { - const projectsStore = useProjectsStore(req); - projectsStore.state.currentProjectKey = 'my-project'; - - const collection = ref('authors'); - const primaryKey = ref(15); - - useItem(collection, primaryKey); - - expect(api.get).toHaveBeenCalledWith('/my-project/items/authors/15'); - }); -}); diff --git a/src/composables/use-items/use-items.ts b/src/composables/use-items/use-items.ts index 23c4fb98e7..d11ddc44d2 100644 --- a/src/composables/use-items/use-items.ts +++ b/src/composables/use-items/use-items.ts @@ -35,8 +35,8 @@ export function useItems(collection: Ref, query: Query) { const loading = ref(false); const error = ref(null); - const itemCount = ref(null); - const totalCount = ref(null); + const itemCount = ref(null); + const totalCount = ref(null); const totalPages = computed(() => { if (itemCount.value === null) return 1; diff --git a/src/composables/use-scroll-distance/use-scroll-distance.story.ts b/src/composables/use-scroll-distance/use-scroll-distance.story.ts index c6f1c09d4e..5984009f1e 100644 --- a/src/composables/use-scroll-distance/use-scroll-distance.story.ts +++ b/src/composables/use-scroll-distance/use-scroll-distance.story.ts @@ -11,7 +11,7 @@ export default { export const basic = () => defineComponent({ setup() { - const el = ref(null); + const el = ref(null); const { top, left } = useScrollDistance(el); return { top, left, el }; }, diff --git a/src/composables/use-scroll-distance/use-scroll-distance.test.ts b/src/composables/use-scroll-distance/use-scroll-distance.test.ts index 0684b3733b..4997e1cdb6 100644 --- a/src/composables/use-scroll-distance/use-scroll-distance.test.ts +++ b/src/composables/use-scroll-distance/use-scroll-distance.test.ts @@ -12,7 +12,7 @@ describe('Composables / useScrollDistance', () => { it('Returns the correct scroll position', () => { const TestComponent = defineComponent({ setup() { - const el = ref(null); + const el = ref(null); const { top, left } = useScrollDistance(el); @@ -62,8 +62,8 @@ describe('Composables / useScrollDistance', () => { const TestComponent = defineComponent({ components: { VSheet }, setup() { - const el = ref(null); - const { target } = useScrollDistance(el); + const el = ref(null); + const { target } = useScrollDistance(el as any); onMounted(() => { expect(target.value instanceof HTMLElement).toBe(true); diff --git a/src/displays/datetime/datetime.vue b/src/displays/datetime/datetime.vue index f42f7be2c7..b306205ced 100644 --- a/src/displays/datetime/datetime.vue +++ b/src/displays/datetime/datetime.vue @@ -22,7 +22,7 @@ export default defineComponent({ }, }, setup(props) { - const displayValue = ref(null); + const displayValue = ref(null); watch( () => props.value, diff --git a/src/displays/file/file.vue b/src/displays/file/file.vue index f22eda793f..0971b27b2b 100644 --- a/src/displays/file/file.vue +++ b/src/displays/file/file.vue @@ -38,7 +38,7 @@ export default defineComponent({ }, }, setup(props) { - const previewEl = ref(null); + const previewEl = ref(null); const fileExtension = computed(() => { if (!props.value) return null; diff --git a/src/displays/template/index.ts b/src/displays/template/index.ts index 4d8b090466..97bee61ff6 100644 --- a/src/displays/template/index.ts +++ b/src/displays/template/index.ts @@ -26,7 +26,7 @@ export default defineDisplay(({ i18n }) => ({ types: ['string'], fields: (options: Options, { field, collection }) => { const relatedCollection = getRelatedCollection(collection, field); - const { primaryKeyField } = useCollection(ref(relatedCollection)); + const { primaryKeyField } = useCollection(ref(relatedCollection as string)); if (!relatedCollection) return []; diff --git a/src/interfaces/code/code.vue b/src/interfaces/code/code.vue index 0f2468231f..76a2949fcf 100644 --- a/src/interfaces/code/code.vue +++ b/src/interfaces/code/code.vue @@ -62,8 +62,8 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const codemirrorEl = ref(null); - const codemirror = ref(null); + const codemirrorEl = ref(null); + const codemirror = ref(null); onMounted(async () => { if (codemirrorEl.value) { diff --git a/src/interfaces/color/color.vue b/src/interfaces/color/color.vue index ae1dfdb5ec..d0ffa973d5 100644 --- a/src/interfaces/color/color.vue +++ b/src/interfaces/color/color.vue @@ -144,7 +144,7 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const htmlColorInput = ref(null); + const htmlColorInput = ref(null); type ColorType = 'RGB' | 'HSL'; const colorTypes = ['RGB', 'HSL'] as ColorType[]; diff --git a/src/interfaces/datetime/datetime.vue b/src/interfaces/datetime/datetime.vue index 62d646411d..5bd7dacf3b 100644 --- a/src/interfaces/datetime/datetime.vue +++ b/src/interfaces/datetime/datetime.vue @@ -117,7 +117,7 @@ export default defineComponent({ return parse(props.value, formatString.value, new Date()); }); - const displayValue = ref(null); + const displayValue = ref(null); syncDisplayValue(); diff --git a/src/interfaces/file/file.vue b/src/interfaces/file/file.vue index b3ee6034a8..2b87cace61 100644 --- a/src/interfaces/file/file.vue +++ b/src/interfaces/file/file.vue @@ -138,7 +138,7 @@ export default defineComponent({ }, setup(props, { emit }) { const projectsStore = useProjectsStore(); - const activeDialog = ref<'upload' | 'choose' | 'url'>(null); + const activeDialog = ref<'upload' | 'choose' | 'url' | null>(null); const { loading, error, file, fetchFile } = useFile(); watch(() => props.value, fetchFile); @@ -176,7 +176,7 @@ export default defineComponent({ function useFile() { const loading = ref(false); const error = ref(null); - const file = ref(null); + const file = ref(null); return { loading, error, file, fetchFile }; diff --git a/src/interfaces/hash/hash.vue b/src/interfaces/hash/hash.vue index fc86cc48de..752a2b9fe2 100644 --- a/src/interfaces/hash/hash.vue +++ b/src/interfaces/hash/hash.vue @@ -38,7 +38,7 @@ export default defineComponent({ }, setup(props, { emit }) { const isHashed = ref(false); - const localValue = ref(null); + const localValue = ref(null); const _placeholder = computed(() => { return isHashed.value ? i18n.t('value_hashed') : props.placeholder; diff --git a/src/interfaces/image/image.vue b/src/interfaces/image/image.vue index 059de4a657..96566b6072 100644 --- a/src/interfaces/image/image.vue +++ b/src/interfaces/image/image.vue @@ -90,7 +90,7 @@ export default defineComponent({ const projectsStore = useProjectsStore(); const loading = ref(false); - const image = ref(null); + const image = ref(null); const error = ref(null); const lightboxActive = ref(false); const editorActive = ref(false); diff --git a/src/interfaces/many-to-one/many-to-one.vue b/src/interfaces/many-to-one/many-to-one.vue index 4515bcbad5..661ef4e016 100644 --- a/src/interfaces/many-to-one/many-to-one.vue +++ b/src/interfaces/many-to-one/many-to-one.vue @@ -193,7 +193,7 @@ export default defineComponent({ }; function useCurrent() { - const currentItem = ref>(null); + const currentItem = ref | null>(null); const loading = ref(false); const error = ref(null); @@ -273,9 +273,9 @@ export default defineComponent({ } function useItems() { - const totalCount = ref(null); + const totalCount = ref(null); - const items = ref[]>(null); + const items = ref[] | null>(null); const loading = ref(false); const error = ref(null); diff --git a/src/interfaces/one-to-many/one-to-many.vue b/src/interfaces/one-to-many/one-to-many.vue index 7a0cf04ff9..b769bafacf 100644 --- a/src/interfaces/one-to-many/one-to-many.vue +++ b/src/interfaces/one-to-many/one-to-many.vue @@ -347,7 +347,7 @@ export default defineComponent({ function useEdits() { // Primary key of the item we're currently editing. If null, the edit modal should be // closed - const currentlyEditing = ref(null); + const currentlyEditing = ref(null); // This keeps track of the starting values so we can match with it const editsAtStart = ref({}); diff --git a/src/interfaces/tags/tags.story.ts b/src/interfaces/tags/tags.story.ts index 8450b8bb65..b0d0972972 100644 --- a/src/interfaces/tags/tags.story.ts +++ b/src/interfaces/tags/tags.story.ts @@ -111,7 +111,7 @@ export const withPresets = () => }, setup() { const onInput = action('input'); - const value = ref(null); + const value = ref(null); return { onInput, value }; }, template: ` diff --git a/src/interfaces/translations/translations.vue b/src/interfaces/translations/translations.vue index 63417a15fe..961d2f54c9 100644 --- a/src/interfaces/translations/translations.vue +++ b/src/interfaces/translations/translations.vue @@ -124,7 +124,7 @@ export default defineComponent({ } function useLanguages() { - const languages = ref>(null); + const languages = ref | null>(null); const loading = ref(false); const error = ref(null); diff --git a/src/interfaces/user/user.vue b/src/interfaces/user/user.vue index 592be0b6c3..8c7e584c09 100644 --- a/src/interfaces/user/user.vue +++ b/src/interfaces/user/user.vue @@ -156,7 +156,7 @@ export default defineComponent({ }; function useCurrent() { - const currentUser = ref>(null); + const currentUser = ref | null>(null); const loading = ref(false); const error = ref(null); @@ -227,9 +227,9 @@ export default defineComponent({ } function useUsers() { - const totalCount = ref(null); + const totalCount = ref(null); - const users = ref[]>(null); + const users = ref[] | null>(null); const loading = ref(false); const error = ref(null); diff --git a/src/layouts/cards/cards.vue b/src/layouts/cards/cards.vue index 2841098e3b..65f2f8f9bc 100644 --- a/src/layouts/cards/cards.vue +++ b/src/layouts/cards/cards.vue @@ -199,8 +199,8 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const layoutElement = ref(null); - const mainElement = inject('main-element', ref(null)); + const layoutElement = ref(null); + const mainElement = inject('main-element', ref(null)); const projectsStore = useProjectsStore(); const _selection = useSync(props, 'selection', emit); diff --git a/src/layouts/tabular/tabular.vue b/src/layouts/tabular/tabular.vue index dc70901464..a95dc75eee 100644 --- a/src/layouts/tabular/tabular.vue +++ b/src/layouts/tabular/tabular.vue @@ -215,8 +215,8 @@ export default defineComponent({ setup(props, { emit }) { const { currentProjectKey } = toRefs(useProjectsStore().state); - const table = ref(null); - const mainElement = inject('main-element', ref(null)); + const table = ref(null); + const mainElement = inject('main-element', ref(null)); const _selection = useSync(props, 'selection', emit); const _viewOptions: Ref = useSync(props, 'viewOptions', emit); diff --git a/src/modules/activity/routes/browse/browse.vue b/src/modules/activity/routes/browse/browse.vue index 30fa789df4..f222935d13 100644 --- a/src/modules/activity/routes/browse/browse.vue +++ b/src/modules/activity/routes/browse/browse.vue @@ -49,7 +49,7 @@ export default defineComponent({ components: { ActivityNavigation }, props: {}, setup() { - const layout = ref(null); + const layout = ref(null); const projectsStore = useProjectsStore(); const { viewOptions, viewQuery } = useCollectionPreset(ref('directus_activity')); diff --git a/src/modules/collections/routes/browse/browse.vue b/src/modules/collections/routes/browse/browse.vue index c260524b87..f0c5079ef6 100644 --- a/src/modules/collections/routes/browse/browse.vue +++ b/src/modules/collections/routes/browse/browse.vue @@ -203,7 +203,7 @@ export default defineComponent({ }, }, setup(props) { - const layout = ref(null); + const layout = ref(null); const { collection } = toRefs(props); const bookmarkID = computed(() => (props.bookmark ? +props.bookmark : null)); diff --git a/src/modules/collections/routes/detail/detail.vue b/src/modules/collections/routes/detail/detail.vue index 5fe2075e20..145a971b79 100644 --- a/src/modules/collections/routes/detail/detail.vue +++ b/src/modules/collections/routes/detail/detail.vue @@ -220,7 +220,7 @@ export default defineComponent({ const { collection, primaryKey } = toRefs(props); const { breadcrumb } = useBreadcrumb(); - const revisionsDrawerDetail = ref(null); + const revisionsDrawerDetail = ref(null); const { info: collectionInfo, softDeleteStatus, primaryKeyField } = useCollection(collection); @@ -246,7 +246,7 @@ export default defineComponent({ const confirmSoftDelete = ref(false); const confirmLeave = ref(false); - const leaveTo = ref(null); + const leaveTo = ref(null); const backLink = computed(() => `/${currentProjectKey.value}/collections/${collection.value}/`); diff --git a/src/modules/files/composables/use-folders.ts b/src/modules/files/composables/use-folders.ts index 4d9096a6bc..21278fcc73 100644 --- a/src/modules/files/composables/use-folders.ts +++ b/src/modules/files/composables/use-folders.ts @@ -23,7 +23,7 @@ export default function useFolders() { const projectsStore = useProjectsStore(); if (loading === null) loading = ref(false); - if (folders === null) folders = ref(null); + if (folders === null) folders = ref(null); if (error === null) error = ref(null); if (folders.value === null && loading.value === false) { diff --git a/src/modules/files/routes/browse/browse.vue b/src/modules/files/routes/browse/browse.vue index 6c2eee2160..f60c99c4a3 100644 --- a/src/modules/files/routes/browse/browse.vue +++ b/src/modules/files/routes/browse/browse.vue @@ -99,7 +99,7 @@ export default defineComponent({ components: { FilesNavigation, FilterDrawerDetail, LayoutDrawerDetail, AddFolder, SearchInput }, props: {}, setup() { - const layout = ref(null); + const layout = ref(null); const projectsStore = useProjectsStore(); const selection = ref([]); diff --git a/src/modules/files/routes/detail/components/file-info-drawer-detail.vue b/src/modules/files/routes/detail/components/file-info-drawer-detail.vue index 17dee60364..faddfd24cc 100644 --- a/src/modules/files/routes/detail/components/file-info-drawer-detail.vue +++ b/src/modules/files/routes/detail/components/file-info-drawer-detail.vue @@ -71,7 +71,7 @@ export default defineComponent({ return bytes(props.filesize, { decimalPlaces: 2, unitSeparator: ' ' }); // { locale: i18n.locale.split('-')[0] } }); - const creationDate = ref(null); + const creationDate = ref(null); localizedFormat(new Date(props.uploaded_on), String(i18n.t('date-fns_datetime'))).then((result) => { creationDate.value = result; diff --git a/src/modules/files/routes/detail/detail.vue b/src/modules/files/routes/detail/detail.vue index 695ff1bb44..134d7aa197 100644 --- a/src/modules/files/routes/detail/detail.vue +++ b/src/modules/files/routes/detail/detail.vue @@ -177,7 +177,7 @@ export default defineComponent({ const { breadcrumb } = useBreadcrumb(); const fieldsStore = useFieldsStore(); - const revisionsDrawerDetail = ref(null); + const revisionsDrawerDetail = ref(null); const { isNew, edits, item, saving, loading, error, save, remove, deleting, saveAsCopy, isBatch } = useItem( ref('directus_files'), @@ -200,7 +200,7 @@ export default defineComponent({ }); const confirmLeave = ref(false); - const leaveTo = ref(null); + const leaveTo = ref(null); return { item, diff --git a/src/modules/settings/routes/data-model/fields/components/field-setup/field-setup.vue b/src/modules/settings/routes/data-model/fields/components/field-setup/field-setup.vue index eaf10a6e24..bce9cee6ce 100644 --- a/src/modules/settings/routes/data-model/fields/components/field-setup/field-setup.vue +++ b/src/modules/settings/routes/data-model/fields/components/field-setup/field-setup.vue @@ -148,7 +148,7 @@ export default defineComponent({ }; const field = ref({ ...defaults }); - const localType = ref(null); + const localType = ref(null); watch( () => props.active, diff --git a/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue b/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue index 6827f5315c..27f1e77468 100644 --- a/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue +++ b/src/modules/settings/routes/data-model/fields/components/fields-management/fields-management.vue @@ -220,7 +220,7 @@ export default defineComponent({ function useFieldSetup() { const fieldSetupActive = ref(false); - const editingField = ref(null); + const editingField = ref(null); return { fieldSetupActive, editingField, openFieldSetup, closeFieldSetup }; diff --git a/src/modules/settings/routes/presets/browse/browse.vue b/src/modules/settings/routes/presets/browse/browse.vue index 32776b2e93..c193c980aa 100644 --- a/src/modules/settings/routes/presets/browse/browse.vue +++ b/src/modules/settings/routes/presets/browse/browse.vue @@ -81,10 +81,7 @@
-
+
@@ -163,7 +160,7 @@ export default defineComponent({ function usePresets() { const loading = ref(false); - const presetsRaw = ref(null); + const presetsRaw = ref(null); const error = ref(null); const presets = computed(() => { diff --git a/src/modules/settings/routes/presets/detail/detail.vue b/src/modules/settings/routes/presets/detail/detail.vue index 09894e27e9..d9c1de0b24 100644 --- a/src/modules/settings/routes/presets/detail/detail.vue +++ b/src/modules/settings/routes/presets/detail/detail.vue @@ -306,7 +306,7 @@ export default defineComponent({ function usePreset() { const loading = ref(false); const error = ref(null); - const preset = ref(null); + const preset = ref(null); fetchPreset(); @@ -341,7 +341,7 @@ export default defineComponent({ function useUsers() { const loading = ref(false); const error = ref(null); - const users = ref(null); + const users = ref(null); fetchUsers(); @@ -373,7 +373,7 @@ export default defineComponent({ function useRoles() { const loading = ref(false); const error = ref(null); - const roles = ref(null); + const roles = ref(null); fetchRoles(); diff --git a/src/modules/settings/routes/project/project.vue b/src/modules/settings/routes/project/project.vue index 1226def86a..68eea9ab6c 100644 --- a/src/modules/settings/routes/project/project.vue +++ b/src/modules/settings/routes/project/project.vue @@ -46,7 +46,7 @@ export default defineComponent({ const initialValues = settingsStore.formatted; - const edits = ref<{ [key: string]: any }>(null); + const edits = ref<{ [key: string]: any } | null>(null); const noEdits = computed(() => edits.value === null || Object.keys(edits.value).length === 0); diff --git a/src/modules/settings/routes/roles/browse/browse.vue b/src/modules/settings/routes/roles/browse/browse.vue index e4a6335591..7dace75072 100644 --- a/src/modules/settings/routes/roles/browse/browse.vue +++ b/src/modules/settings/routes/roles/browse/browse.vue @@ -82,7 +82,7 @@ export default defineComponent({ components: { SettingsNavigation }, props: {}, setup() { - const layout = ref(null); + const layout = ref(null); const projectsStore = useProjectsStore(); const selection = ref([]); diff --git a/src/modules/settings/routes/roles/detail/components/permissions-fields/permissions-fields.vue b/src/modules/settings/routes/roles/detail/components/permissions-fields/permissions-fields.vue index 2e285ad705..04b9cc2a05 100644 --- a/src/modules/settings/routes/roles/detail/components/permissions-fields/permissions-fields.vue +++ b/src/modules/settings/routes/roles/detail/components/permissions-fields/permissions-fields.vue @@ -72,7 +72,7 @@ export default defineComponent({ required: true, }, savePermission: { - type: Function, + type: Function as PropType<(value: Partial) => void>, required: true, }, combined: { diff --git a/src/modules/settings/routes/roles/detail/components/permissions-row/permissions-row.vue b/src/modules/settings/routes/roles/detail/components/permissions-row/permissions-row.vue index c6a4afd6a3..47c84d83da 100644 --- a/src/modules/settings/routes/roles/detail/components/permissions-row/permissions-row.vue +++ b/src/modules/settings/routes/roles/detail/components/permissions-row/permissions-row.vue @@ -235,7 +235,7 @@ export default defineComponent({ required: true, }, saveAll: { - type: Function, + type: Function as PropType<(create: Partial[], update: Partial[]) => void>, required: true, }, }, diff --git a/src/modules/settings/routes/roles/detail/components/permissions-statuses/permissions-statuses.vue b/src/modules/settings/routes/roles/detail/components/permissions-statuses/permissions-statuses.vue index f62f9ec9c0..986b2206d0 100644 --- a/src/modules/settings/routes/roles/detail/components/permissions-statuses/permissions-statuses.vue +++ b/src/modules/settings/routes/roles/detail/components/permissions-statuses/permissions-statuses.vue @@ -57,7 +57,7 @@ export default defineComponent({ required: true, }, savePermission: { - type: Function, + type: Function as PropType<(value: Partial) => void>, required: true, }, combined: { diff --git a/src/modules/settings/routes/roles/detail/components/permissions-toggle/permissions-toggle.vue b/src/modules/settings/routes/roles/detail/components/permissions-toggle/permissions-toggle.vue index 77efe2a8c2..6591dc5f2d 100644 --- a/src/modules/settings/routes/roles/detail/components/permissions-toggle/permissions-toggle.vue +++ b/src/modules/settings/routes/roles/detail/components/permissions-toggle/permissions-toggle.vue @@ -51,7 +51,7 @@ export default defineComponent({ default: null, }, savePermission: { - type: Function, + type: Function as PropType<(values: Partial) => {}>, required: true, }, type: { diff --git a/src/modules/settings/routes/roles/detail/composables/use-permissions.ts b/src/modules/settings/routes/roles/detail/composables/use-permissions.ts index 1c6396fb25..4374f47687 100644 --- a/src/modules/settings/routes/roles/detail/composables/use-permissions.ts +++ b/src/modules/settings/routes/roles/detail/composables/use-permissions.ts @@ -20,7 +20,7 @@ export type Permission = { export default function usePermissions(role: Ref) { const loading = ref(false); const error = ref(null); - const permissions = ref(null); + const permissions = ref(null); const projectsStore = useProjectsStore(); diff --git a/src/modules/settings/routes/webhooks/browse/browse.vue b/src/modules/settings/routes/webhooks/browse/browse.vue index b2484eb48b..e9285b5adc 100644 --- a/src/modules/settings/routes/webhooks/browse/browse.vue +++ b/src/modules/settings/routes/webhooks/browse/browse.vue @@ -57,10 +57,7 @@ -
+
@@ -85,7 +82,7 @@ export default defineComponent({ components: { SettingsNavigation }, props: {}, setup() { - const layout = ref(null); + const layout = ref(null); const projectsStore = useProjectsStore(); const selection = ref([]); diff --git a/src/modules/users/composables/use-navigation.ts b/src/modules/users/composables/use-navigation.ts index 93c80e3431..1b54ef0bab 100644 --- a/src/modules/users/composables/use-navigation.ts +++ b/src/modules/users/composables/use-navigation.ts @@ -8,7 +8,7 @@ let loading: Ref | null = null; export default function useNavigation() { if (roles === null) { - roles = ref(null); + roles = ref(null); } if (loading === null) { diff --git a/src/modules/users/routes/browse/browse.vue b/src/modules/users/routes/browse/browse.vue index 8282ca4c6a..74de92c82f 100644 --- a/src/modules/users/routes/browse/browse.vue +++ b/src/modules/users/routes/browse/browse.vue @@ -101,7 +101,7 @@ export default defineComponent({ }, }, setup(props) { - const layout = ref(null); + const layout = ref(null); const projectsStore = useProjectsStore(); const selection = ref([]); diff --git a/src/modules/users/routes/detail/detail.vue b/src/modules/users/routes/detail/detail.vue index 6b4eb21076..cde88706aa 100644 --- a/src/modules/users/routes/detail/detail.vue +++ b/src/modules/users/routes/detail/detail.vue @@ -160,7 +160,7 @@ export default defineComponent({ const { primaryKey } = toRefs(props); const { breadcrumb } = useBreadcrumb(); - const revisionsDrawerDetail = ref(null); + const revisionsDrawerDetail = ref(null); const { isNew, edits, item, saving, loading, error, save, remove, deleting, saveAsCopy, isBatch } = useItem( ref('directus_users'), @@ -185,7 +185,7 @@ export default defineComponent({ const { loading: previewLoading, avatarSrc, roleName } = useUserPreview(); const confirmLeave = ref(false); - const leaveTo = ref(null); + const leaveTo = ref(null); return { title, @@ -261,8 +261,8 @@ export default defineComponent({ function useUserPreview() { const loading = ref(false); const error = ref(null); - const avatarSrc = ref(null); - const roleName = ref(null); + const avatarSrc = ref(null); + const roleName = ref(null); watch(() => props.primaryKey, getUserPreviewData); diff --git a/src/routes/install/install-final.vue b/src/routes/install/install-final.vue index 91ac56126a..59ddff1389 100644 --- a/src/routes/install/install-final.vue +++ b/src/routes/install/install-final.vue @@ -67,7 +67,7 @@ export default defineComponent({ }, setup(props) { const loading = ref(true); - const error = ref(null); + const error = ref(null); const _token = computed(() => { return props.token || nanoid(); diff --git a/src/routes/install/install-requirements.vue b/src/routes/install/install-requirements.vue index 567416b37f..ee25154a1f 100644 --- a/src/routes/install/install-requirements.vue +++ b/src/routes/install/install-requirements.vue @@ -49,8 +49,8 @@ export default defineComponent({ setup(props) { const loading = ref(false); const error = ref(null); - const serverInfo = ref(null); - const lastTag = ref(null); + const serverInfo = ref(null); + const lastTag = ref(null); const requirements = computed(() => { if (serverInfo.value === null) return null; diff --git a/src/routes/install/install-welcome.vue b/src/routes/install/install-welcome.vue index df78fceff6..a1250eb786 100644 --- a/src/routes/install/install-welcome.vue +++ b/src/routes/install/install-welcome.vue @@ -48,7 +48,7 @@ export default defineComponent({ }, setup(props, { emit }) { const verifying = ref(false); - const tokenCorrect = ref(null); + const tokenCorrect = ref(null); const nextDisabled = computed(() => { return ( diff --git a/src/routes/login/components/continue-as/continue-as.vue b/src/routes/login/components/continue-as/continue-as.vue index 76bb25e4b3..6d9286f049 100644 --- a/src/routes/login/components/continue-as/continue-as.vue +++ b/src/routes/login/components/continue-as/continue-as.vue @@ -28,8 +28,8 @@ export default defineComponent({ const loading = ref(false); const error = ref(null); - const name = ref(null); - const lastPage = ref(null); + const name = ref(null); + const lastPage = ref(null); watch(() => projectsStore.state.currentProjectKey, fetchUser); diff --git a/src/routes/login/components/login-form/login-form.vue b/src/routes/login/components/login-form/login-form.vue index 1bf1efbb43..06b63a7750 100644 --- a/src/routes/login/components/login-form/login-form.vue +++ b/src/routes/login/components/login-form/login-form.vue @@ -65,10 +65,10 @@ export default defineComponent({ const projectsStore = useProjectsStore(); const loggingIn = ref(false); - const email = ref(null); - const password = ref(null); - const error = ref(null); - const otp = ref(null); + const email = ref(null); + const password = ref(null); + const error = ref(null); + const otp = ref(null); const requiresTFA = ref(false); watch(email, () => { diff --git a/src/routes/reset-password/request.vue b/src/routes/reset-password/request.vue index f5c093ecab..0e09f6fe61 100644 --- a/src/routes/reset-password/request.vue +++ b/src/routes/reset-password/request.vue @@ -26,7 +26,7 @@ export default defineComponent({ const email = ref(null); const sending = ref(false); - const error = ref(null); + const error = ref(null); const done = ref(false); const errorFormatted = computed(() => { diff --git a/src/routes/reset-password/reset.vue b/src/routes/reset-password/reset.vue index 27a7c37f65..d082f785a6 100644 --- a/src/routes/reset-password/reset.vue +++ b/src/routes/reset-password/reset.vue @@ -39,7 +39,7 @@ export default defineComponent({ const password = ref(null); const resetting = ref(false); - const error = ref(null); + const error = ref(null); const done = ref(false); const errorFormatted = computed(() => { diff --git a/src/views/private/components/comments-drawer-detail/comment-input.vue b/src/views/private/components/comments-drawer-detail/comment-input.vue index 8b03844ab0..b6766cfb42 100644 --- a/src/views/private/components/comments-drawer-detail/comment-input.vue +++ b/src/views/private/components/comments-drawer-detail/comment-input.vue @@ -17,7 +17,7 @@