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.

Sign up for GitHub

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

Jump to bottom

Fix default values #15710

Merged
merged 16 commits into from Apr 10, 2023
Merged

Fix default values #15710

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8116f12
Fix default values
Nitwel Sep 22, 2022
2fe8039
Merge remote-tracking branch 'origin/main' into fix-15569
Nitwel Jan 4, 2023
0ba8438
run linter
Nitwel Jan 4, 2023
ca41fb8
Merge branch 'main' into fix-15569
rijkvanzanten Jan 6, 2023
364f9c3
Merge branch 'main' into fix-15569
br41nslug Jan 24, 2023
faae57b
Merge branch 'main' into fix-15569
br41nslug Feb 2, 2023
db38667
Merge remote-tracking branch 'origin/main' into fix-15569
Nitwel Feb 3, 2023
1cebf4b
use assign
Nitwel Feb 3, 2023
0e47fed
Merge branch 'main' into fix-15569
paescuj Mar 2, 2023
b01b4c0
Merge branch 'main' into fix-15569
azrikahar Mar 10, 2023
aaacb54
fix working with permissions
Nitwel Mar 21, 2023
45f0770
run linter
Nitwel Mar 21, 2023
0084a07
fix set related item to empty when having junction
Nitwel Mar 21, 2023
77d9e96
check for empty
Nitwel Mar 21, 2023
63809a4
Update app/src/views/private/components/drawer-item.vue
azrikahar Mar 21, 2023
a4aeac5
Merge branch 'main' into fix-15569
rijkvanzanten Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/src/views/private/components/drawer-item.vue
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@
<script setup lang="ts">
import api from '@/api';
import FilePreview from '@/views/private/components/file-preview.vue';
import { isEmpty, merge, set } from 'lodash';
import { assign, isEmpty, merge, set } from 'lodash';
import { computed, ref, toRefs, watch } from 'vue';
import { useI18n } from 'vue-i18n';

Expand Down Expand Up @@ -411,7 +411,11 @@ function useActions() {
internalEdits.value[primaryKeyField.value.field] = props.primaryKey;
}

emit('input', internalEdits.value);
const noNullDefaultValues = Object.fromEntries(
Object.entries(defaultValues.value).filter(([_, value]) => value !== null)
);

emit('input', assign({}, noNullDefaultValues, internalEdits.value));
Nitwel marked this conversation as resolved.
Show resolved Hide resolved

internalActive.value = false;
internalEdits.value = {};
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/composables/use-collection.ts
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ export function useCollection(collectionKey: string | Ref<string | null>): Usabl
const defaults: Record<string, any> = {};

for (const field of fields.value) {
if (field.schema?.default_value) {
if (field.schema !== null && 'default_value' in field.schema) {
defaults[field.field] = field.schema.default_value;
}
}
Expand Down