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
8 changes: 0 additions & 8 deletions frontend/.eslint/legacy-files.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,8 @@
"src/shared/banner/banner.vue",
"src/shared/empty-state/empty-state-cta.vue",
"src/shared/empty-state/empty-state.vue",
"src/shared/form/array-input.vue",
"src/shared/form/autocomplete-many-input.vue",
"src/shared/form/autocomplete-one-input.vue",
"src/shared/form/form-errors.vue",
"src/shared/form/form-item.vue",
"src/shared/form/inline-select-input.vue",
"src/shared/form/keywords-input.vue",
"src/shared/image/image.vue",
"src/shared/layout/page-wrapper.vue",
Expand Down Expand Up @@ -448,10 +444,6 @@
"src/shared/avatar/avatar-new-badge.vue",
"src/shared/components/globals.vue",
"src/shared/dialog/delete-confirm-dialog.vue",
"src/shared/form/array-input.vue",
"src/shared/form/form-errors.vue",
"src/shared/form/form-item.vue",
"src/shared/form/inline-select-input.vue",
"src/shared/image/image.vue",
"src/shared/loading/page-loader.vue",
"src/shared/message/toaster-container.vue",
Expand Down
55 changes: 23 additions & 32 deletions frontend/src/shared/form/array-input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,33 @@
</article>
</template>

<script setup>
import { computed, defineEmits, defineProps } from 'vue';
<script setup lang="ts">
import { computed } from 'vue';
import { required } from '@vuelidate/validators';
import useVuelidate from '@vuelidate/core';
import useVuelidate, { type ValidationArgs } from '@vuelidate/core';
import AppFormItem from '@/shared/form/form-item.vue';

const props = defineProps({
modelValue: {
type: String,
required: true,
},
placeholder: {
type: String,
default: null,
},
disabled: {
type: Boolean,
default: false,
},
inputClass: {
type: String,
default: '',
},
inputLabel: {
type: String,
default: '',
},
defineOptions({ name: 'AppArrayInput' });

const props = withDefaults(defineProps<{
modelValue: string;
placeholder?: string | null;
disabled?: boolean;
inputClass?: string;
inputLabel?: string;
}>(), {
placeholder: null,
disabled: false,
inputClass: '',
inputLabel: '',
});

const emit = defineEmits(['update:modelValue']);
const emit = defineEmits<{(e: 'update:modelValue', value: string): void;
}>();

defineSlots<{
after?:() => unknown;
}>();

const rules = {
required,
Expand All @@ -69,11 +66,5 @@ const model = computed({
},
});

const $v = useVuelidate(rules, model);
</script>

<script>
export default {
name: 'AppArrayInput',
};
const $v = useVuelidate<string, ValidationArgs>(rules, model);
</script>
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { ref, computed } from 'vue';
import {
ref, computed, type Ref, type ComputedRef,
} from 'vue';

export default function elementChangeDetector(element) {
export default function elementChangeDetector(element: Ref<unknown>): {
temporaryElement: Ref<string>;
elementSnapshot: () => void;
hasElementChanged: ComputedRef<boolean>;
} {
const temporaryElement = ref('');

function elementSnapshot() {
function elementSnapshot(): void {
temporaryElement.value = JSON.stringify(element.value);
}

Expand Down
17 changes: 0 additions & 17 deletions frontend/src/shared/form/form-change.js

This file was deleted.

23 changes: 23 additions & 0 deletions frontend/src/shared/form/form-change.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import {
ref, computed, type Ref, type ComputedRef,
} from 'vue';

export default function formChangeDetector(form: object): {
temporaryForm: Ref<string>;
formSnapshot: () => void;
hasFormChanged: ComputedRef<boolean>;
} {
const temporaryForm = ref('');

function formSnapshot(): void {
temporaryForm.value = JSON.stringify(form);
}

const hasFormChanged = computed(() => temporaryForm.value !== JSON.stringify(form));

return {
temporaryForm,
formSnapshot,
hasFormChanged,
};
}
55 changes: 19 additions & 36 deletions frontend/src/shared/form/form-errors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,29 @@
</div>
</template>

<script setup>
import { computed, defineProps } from 'vue';
<script setup lang="ts">
import { computed, unref } from 'vue';
import type { ErrorObject } from '@vuelidate/core';

const props = defineProps({
validation: {
required: false,
type: Object,
default: () => ({}),
},
errorMessages: {
required: false,
type: Object,
default: () => ({}),
},
hideDefault: {
required: false,
type: Boolean,
default: false,
},
errorIcon: {
required: false,
type: String,
default: '',
},
errorClass: {
required: false,
type: String,
default: '',
},
defineOptions({ name: 'AppFormErrors' });

const props = withDefaults(defineProps<{
validation?: { $errors?: ErrorObject[] };
errorMessages?: Record<string, string>;
hideDefault?: boolean;
errorIcon?: string;
errorClass?: string;
}>(), {
validation: () => ({}),
errorMessages: () => ({}),
hideDefault: false,
errorIcon: '',
errorClass: '',
});

const errors = computed(() => props.validation?.$errors || []);

const errorMessage = (error) => {
const errorMessage = (error: ErrorObject) => {
const prop = `${error.$property}-${error.$validator}`;
if (
props.errorMessages
Expand All @@ -52,14 +41,8 @@ const errorMessage = (error) => {
return props.errorMessages[prop];
}
if (!props.hideDefault) {
return error.$message;
return unref(error.$message);
}
return '';
};
</script>

<script>
export default {
name: 'AppFormErrors',
};
</script>
89 changes: 32 additions & 57 deletions frontend/src/shared/form/form-item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,79 +33,54 @@
</div>
</template>

<script setup>
import { computed } from 'vue';
<script setup lang="ts">
import { computed, unref } from 'vue';
import type { ErrorObject } from '@vuelidate/core';

const props = defineProps({
validation: {
required: false,
type: Object,
default: () => ({}),
},
label: {
required: false,
type: String,
default: '',
},
formId: {
required: false,
type: String,
default: '',
},
required: {
required: false,
type: Boolean,
default: false,
},
errorMessages: {
required: false,
type: Object,
default: () => ({}),
},
filterErrors: {
required: false,
type: Array,
default: () => null,
},
showError: {
required: false,
type: Boolean,
default: true,
},
errorIcon: {
required: false,
type: String,
default: '',
},
errorClass: {
required: false,
type: String,
default: '',
},
defineOptions({ name: 'AppFormItem' });

const props = withDefaults(defineProps<{
validation?: { $errors?: ErrorObject[] };
label?: string;
formId?: string;
required?: boolean;
errorMessages?: Record<string, string>;
filterErrors?: string[] | null;
showError?: boolean;
errorIcon?: string;
errorClass?: string;
}>(), {
validation: () => ({}),
label: '',
formId: '',
required: false,
errorMessages: () => ({}),
filterErrors: null,
showError: true,
errorIcon: '',
errorClass: '',
});

defineSlots<{
default?:() => unknown;
}>();

const errors = computed(() => props.validation?.$errors || []);

const enabledError = (errors) => {
const enabledError = (errors: ErrorObject[]) => {
if (props.filterErrors && props.filterErrors.length > 0 && errors.length > 0) {
return props.filterErrors.includes(errors[0].$validator);
}
return errors.length > 0;
};

const errorMessage = (error) => {
const errorMessage = (error: ErrorObject) => {
if (
props.errorMessages
&& props.errorMessages[error.$validator]
) {
return props.errorMessages[error.$validator];
}
return error.$message;
};
</script>

<script>
export default {
name: 'AppFormItem',
return unref(error.$message);
};
</script>
Loading
Loading