Skip to content

Commit e7156f1

Browse files
committed
use new field container data function for refresh
1 parent 499a571 commit e7156f1

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

resources/js/form/components/Form.vue

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import debounce from "lodash/debounce";
3030
import { api } from "@/api/api";
3131
import { route } from "@/utils/url";
32-
import { useParentCommands } from "@/commands/useCommands";
3332
import merge from 'lodash/merge';
33+
import { useFieldContainerData } from "@/form/useFieldContainerData";
3434
3535
const props = defineProps<{
3636
form: Form
@@ -82,14 +82,11 @@
8282
props.form.setMeta(fieldKey, { uploading });
8383
}
8484
85-
const parentCommands = useParentCommands();
85+
const fieldContainerData = useFieldContainerData(props.form);
8686
const refresh = debounce((data) => {
8787
api.post(route('code16.sharp.api.form.refresh.update', {
8888
entityKey: props.form.entityKey,
89-
instance_id: props.form.instanceId,
90-
embed_key: props.form.embedKey,
91-
entity_list_command_key: parentCommands?.commandContainer === 'entityList' ? props.form.commandKey : null,
92-
show_command_key: parentCommands?.commandContainer === 'show' ? props.form.commandKey : null,
89+
...fieldContainerData,
9390
}), data)
9491
.then(response => {
9592
merge(props.form.data, response.data.form.data);

resources/js/form/components/fields/Autocomplete.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import { route } from "@/utils/url";
2222
import { api } from "@/api/api";
2323
import { useParentForm } from "@/form/useParentForm";
24-
import { isCancel } from "axios";
2524
import { ComboboxItemIndicator } from "reka-ui";
26-
import { useParentCommands } from "@/commands/useCommands";
2725
import { useIsInDialog } from "@/components/ui/dialog/Dialog.vue";
2826
import { useFullTextSearch } from "@/composables/useFullTextSearch";
2927
import { useRemoteAutocomplete } from "@/composables/useRemoteAutocomplete";
@@ -37,7 +35,6 @@
3735
const searchTerm = ref('');
3836
const results = ref<FormAutocompleteItemData[]>([]);
3937
40-
const parentCommands = useParentCommands();
4138
const isInDialog = useIsInDialog();
4239
const { fullTextSearch } = useFullTextSearch(
4340
() => props.field.mode === 'local' ? props.field.localValues : null,
@@ -46,7 +43,7 @@
4643
searchKeys: props.field.mode === 'local' ? props.field.searchKeys : [],
4744
}
4845
);
49-
const fieldContainerData = useFieldContainerData();
46+
const fieldContainerData = useFieldContainerData(form);
5047
const { loading, search: remoteSearch } = useRemoteAutocomplete(({ query, signal, onSuccess, onError }) => {
5148
const field = props.field as FormAutocompleteRemoteFieldData;
5249
return api.post(

resources/js/form/components/fields/upload/Upload.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
uploadFieldKey: props.parentListField
101101
? `${props.parentListField.key}.${props.editorField?.key ?? props.field.key}`
102102
: props.editorField?.key ?? props.field.key,
103-
...useFieldContainerData(),
103+
...useFieldContainerData(form),
104104
}),
105105
fieldName: 'file',
106106
headers: {

resources/js/form/useFieldContainerData.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { RequestFieldContainerData } from "@/types";
2-
import { useParentForm } from "@/form/useParentForm";
32
import { useParentCommands } from "@/commands/useCommands";
3+
import { Form } from "@/form/Form";
44

55

6-
export function useFieldContainerData(): RequestFieldContainerData {
7-
const form = useParentForm();
6+
export function useFieldContainerData(form: Form): RequestFieldContainerData {
87
const parentCommands = useParentCommands();
98

109
return {

0 commit comments

Comments
 (0)