mirror of
https://github.com/directus/directus.git
synced 2026-02-03 18:05:29 -05:00
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@dependabot.com> * 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 <rijkvanzanten@me.com>
This commit is contained in:
committed by
GitHub
parent
93c7cdef1f
commit
08b3310029
@@ -49,7 +49,7 @@ export default defineComponent({
|
||||
components: { ActivityNavigation },
|
||||
props: {},
|
||||
setup() {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
const { viewOptions, viewQuery } = useCollectionPreset(ref('directus_activity'));
|
||||
|
||||
@@ -203,7 +203,7 @@ export default defineComponent({
|
||||
},
|
||||
},
|
||||
setup(props) {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
|
||||
const { collection } = toRefs(props);
|
||||
const bookmarkID = computed(() => (props.bookmark ? +props.bookmark : null));
|
||||
|
||||
@@ -220,7 +220,7 @@ export default defineComponent({
|
||||
const { collection, primaryKey } = toRefs(props);
|
||||
const { breadcrumb } = useBreadcrumb();
|
||||
|
||||
const revisionsDrawerDetail = ref<Vue>(null);
|
||||
const revisionsDrawerDetail = ref<Vue | null>(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<string>(null);
|
||||
const leaveTo = ref<string | null>(null);
|
||||
|
||||
const backLink = computed(() => `/${currentProjectKey.value}/collections/${collection.value}/`);
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ export default function useFolders() {
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
if (loading === null) loading = ref(false);
|
||||
if (folders === null) folders = ref<Folder[]>(null);
|
||||
if (folders === null) folders = ref<Folder[] | null>(null);
|
||||
if (error === null) error = ref(null);
|
||||
|
||||
if (folders.value === null && loading.value === false) {
|
||||
|
||||
@@ -99,7 +99,7 @@ export default defineComponent({
|
||||
components: { FilesNavigation, FilterDrawerDetail, LayoutDrawerDetail, AddFolder, SearchInput },
|
||||
props: {},
|
||||
setup() {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
const selection = ref<Item[]>([]);
|
||||
|
||||
@@ -71,7 +71,7 @@ export default defineComponent({
|
||||
return bytes(props.filesize, { decimalPlaces: 2, unitSeparator: ' ' }); // { locale: i18n.locale.split('-')[0] }
|
||||
});
|
||||
|
||||
const creationDate = ref<string>(null);
|
||||
const creationDate = ref<string | null>(null);
|
||||
|
||||
localizedFormat(new Date(props.uploaded_on), String(i18n.t('date-fns_datetime'))).then((result) => {
|
||||
creationDate.value = result;
|
||||
|
||||
@@ -177,7 +177,7 @@ export default defineComponent({
|
||||
const { breadcrumb } = useBreadcrumb();
|
||||
const fieldsStore = useFieldsStore();
|
||||
|
||||
const revisionsDrawerDetail = ref<Vue>(null);
|
||||
const revisionsDrawerDetail = ref<Vue | null>(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<string>(null);
|
||||
const leaveTo = ref<string | null>(null);
|
||||
|
||||
return {
|
||||
item,
|
||||
|
||||
@@ -148,7 +148,7 @@ export default defineComponent({
|
||||
};
|
||||
|
||||
const field = ref<any>({ ...defaults });
|
||||
const localType = ref<LocalType>(null);
|
||||
const localType = ref<LocalType | null>(null);
|
||||
|
||||
watch(
|
||||
() => props.active,
|
||||
|
||||
@@ -220,7 +220,7 @@ export default defineComponent({
|
||||
|
||||
function useFieldSetup() {
|
||||
const fieldSetupActive = ref(false);
|
||||
const editingField = ref<Field>(null);
|
||||
const editingField = ref<Field | null>(null);
|
||||
|
||||
return { fieldSetupActive, editingField, openFieldSetup, closeFieldSetup };
|
||||
|
||||
|
||||
@@ -81,10 +81,7 @@
|
||||
<div class="format-markdown" v-html="marked($t('page_help_settings_presets_browse'))" />
|
||||
</drawer-detail>
|
||||
<drawer-detail icon="help_outline" :title="$t('help_and_docs')">
|
||||
<div
|
||||
class="format-markdown"
|
||||
v-html="marked($t('page_help_settings_presets_browse'))"
|
||||
/>
|
||||
<div class="format-markdown" v-html="marked($t('page_help_settings_presets_browse'))" />
|
||||
</drawer-detail>
|
||||
</template>
|
||||
</private-view>
|
||||
@@ -163,7 +160,7 @@ export default defineComponent({
|
||||
|
||||
function usePresets() {
|
||||
const loading = ref(false);
|
||||
const presetsRaw = ref<PresetRaw[]>(null);
|
||||
const presetsRaw = ref<PresetRaw[] | null>(null);
|
||||
const error = ref(null);
|
||||
|
||||
const presets = computed<Preset[]>(() => {
|
||||
|
||||
@@ -306,7 +306,7 @@ export default defineComponent({
|
||||
function usePreset() {
|
||||
const loading = ref(false);
|
||||
const error = ref(null);
|
||||
const preset = ref<CollectionPreset>(null);
|
||||
const preset = ref<CollectionPreset | null>(null);
|
||||
|
||||
fetchPreset();
|
||||
|
||||
@@ -341,7 +341,7 @@ export default defineComponent({
|
||||
function useUsers() {
|
||||
const loading = ref(false);
|
||||
const error = ref(null);
|
||||
const users = ref<User[]>(null);
|
||||
const users = ref<User[] | null>(null);
|
||||
|
||||
fetchUsers();
|
||||
|
||||
@@ -373,7 +373,7 @@ export default defineComponent({
|
||||
function useRoles() {
|
||||
const loading = ref(false);
|
||||
const error = ref(null);
|
||||
const roles = ref<Role[]>(null);
|
||||
const roles = ref<Role[] | null>(null);
|
||||
|
||||
fetchRoles();
|
||||
|
||||
|
||||
@@ -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<boolean>(() => edits.value === null || Object.keys(edits.value).length === 0);
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ export default defineComponent({
|
||||
components: { SettingsNavigation },
|
||||
props: {},
|
||||
setup() {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
const selection = ref<Item[]>([]);
|
||||
|
||||
@@ -72,7 +72,7 @@ export default defineComponent({
|
||||
required: true,
|
||||
},
|
||||
savePermission: {
|
||||
type: Function,
|
||||
type: Function as PropType<(value: Partial<Permission>) => void>,
|
||||
required: true,
|
||||
},
|
||||
combined: {
|
||||
|
||||
@@ -235,7 +235,7 @@ export default defineComponent({
|
||||
required: true,
|
||||
},
|
||||
saveAll: {
|
||||
type: Function,
|
||||
type: Function as PropType<(create: Partial<Permission>[], update: Partial<Permission>[]) => void>,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -57,7 +57,7 @@ export default defineComponent({
|
||||
required: true,
|
||||
},
|
||||
savePermission: {
|
||||
type: Function,
|
||||
type: Function as PropType<(value: Partial<Permission>) => void>,
|
||||
required: true,
|
||||
},
|
||||
combined: {
|
||||
|
||||
@@ -51,7 +51,7 @@ export default defineComponent({
|
||||
default: null,
|
||||
},
|
||||
savePermission: {
|
||||
type: Function,
|
||||
type: Function as PropType<(values: Partial<Permission>) => {}>,
|
||||
required: true,
|
||||
},
|
||||
type: {
|
||||
|
||||
@@ -20,7 +20,7 @@ export type Permission = {
|
||||
export default function usePermissions(role: Ref<number>) {
|
||||
const loading = ref(false);
|
||||
const error = ref(null);
|
||||
const permissions = ref<Permission[]>(null);
|
||||
const permissions = ref<Permission[] | null>(null);
|
||||
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
|
||||
@@ -57,10 +57,7 @@
|
||||
</drawer-detail>
|
||||
<portal-target name="drawer" />
|
||||
<drawer-detail icon="help_outline" :title="$t('help_and_docs')">
|
||||
<div
|
||||
class="format-markdown"
|
||||
v-html="marked($t('page_help_settings_webhooks_browse'))"
|
||||
/>
|
||||
<div class="format-markdown" v-html="marked($t('page_help_settings_webhooks_browse'))" />
|
||||
</drawer-detail>
|
||||
</template>
|
||||
</private-view>
|
||||
@@ -85,7 +82,7 @@ export default defineComponent({
|
||||
components: { SettingsNavigation },
|
||||
props: {},
|
||||
setup() {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
const selection = ref<Item[]>([]);
|
||||
|
||||
@@ -8,7 +8,7 @@ let loading: Ref<boolean> | null = null;
|
||||
|
||||
export default function useNavigation() {
|
||||
if (roles === null) {
|
||||
roles = ref<Role[]>(null);
|
||||
roles = ref<Role[] | null>(null);
|
||||
}
|
||||
|
||||
if (loading === null) {
|
||||
|
||||
@@ -101,7 +101,7 @@ export default defineComponent({
|
||||
},
|
||||
},
|
||||
setup(props) {
|
||||
const layout = ref<LayoutComponent>(null);
|
||||
const layout = ref<LayoutComponent | null>(null);
|
||||
const projectsStore = useProjectsStore();
|
||||
|
||||
const selection = ref<Item[]>([]);
|
||||
|
||||
@@ -160,7 +160,7 @@ export default defineComponent({
|
||||
const { primaryKey } = toRefs(props);
|
||||
const { breadcrumb } = useBreadcrumb();
|
||||
|
||||
const revisionsDrawerDetail = ref<Vue>(null);
|
||||
const revisionsDrawerDetail = ref<Vue | null>(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<string>(null);
|
||||
const leaveTo = ref<string | null>(null);
|
||||
|
||||
return {
|
||||
title,
|
||||
@@ -261,8 +261,8 @@ export default defineComponent({
|
||||
function useUserPreview() {
|
||||
const loading = ref(false);
|
||||
const error = ref(null);
|
||||
const avatarSrc = ref<string>(null);
|
||||
const roleName = ref<string>(null);
|
||||
const avatarSrc = ref<string | null>(null);
|
||||
const roleName = ref<string | null>(null);
|
||||
|
||||
watch(() => props.primaryKey, getUserPreviewData);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user