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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
- Added a “Default Row Values” setting to Table fields. ([#3621](https://github.com/craftcms/cms/issues/3621))
- `CraftCms\Cms\Field\Contracts\FieldInterface::modifyQuery()` now accepts an `Illuminate\Database\Query\Builder` object for its `$query` argument, and has a new `CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface $elementQuery` argument, and a `void` return type. ([#19562](https://github.com/craftcms/cms/pull/19562), [#19585](https://github.com/craftcms/cms/pull/19585))
- Moved legacy relation-field settings HTML and entry-title input HTML into the Yii adapter. ([#19591](https://github.com/craftcms/cms/pull/19591))
- Restored “Copy value from site” functionality. ([#19683](https://github.com/craftcms/cms/pull/19683))
- Fixed multiple bugs with Table fields, including new columns moving or defaulting to Checkbox, settings rows not being draggable, and element edit forms failing when the field value was null. ([#19687](https://github.com/craftcms/cms/pull/19687))

### Entries & Sections
Expand Down
66 changes: 66 additions & 0 deletions resources/js/modules/forms/CrossSiteCopyModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<script setup lang="ts">
import '@craftcms/ui/components/select/select';
import {t} from '@craftcms/ui';
import {nextTick, ref, useTemplateRef, watch} from 'vue';
import ModalForm from '@/common/components/ModalForm.vue';

const props = defineProps<{
active: boolean;
label?: string | null;
sites: Array<{id: number; name: string}>;
loading: boolean;
}>();
const emit = defineEmits<{
(event: 'close'): void;
(event: 'submit', siteId: number): void;
}>();
const select = useTemplateRef<HTMLSelectElement>('select');
const siteId = ref<number>();

watch(
() => props.active,
async (active) => {
if (!active) {
return;
}

siteId.value = props.sites[0]?.id;
await nextTick();
select.value?.focus();
}
);

function submit(): void {
if (siteId.value !== undefined) {
emit('submit', siteId.value);
}
}
</script>

<template>
<ModalForm
:is-active="active"
:title="t('Copy “{name}” value', {name: label || t('Field')})"
:submit-label="t('Copy')"
:loading="loading"
width="sm"
@close="emit('close')"
@submit="submit"
>
<div data-cross-site-copy-modal>
<craft-select :label="t('Copy from')" required>
<select
ref="select"
slot="input"
:value="siteId"
required
@change="siteId = Number(($event.target as HTMLSelectElement).value)"
>
<option v-for="site in sites" :key="site.id" :value="site.id">
{{ site.name }}
</option>
</select>
</craft-select>
</div>
</ModalForm>
</template>
147 changes: 126 additions & 21 deletions resources/js/modules/forms/FieldNode.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<script setup lang="ts">
import '@craftcms/ui/components/field/field';
// Leaf module, not the barrel — the barrel registers every `craft-*` element.
import {actionClient} from '@craftcms/ui';
import {t} from '@craftcms/ui/utilities/translate';
import {useEventListener} from '@vueuse/core';
import axios from 'axios';
import {
computed,
getCurrentInstance,
inject,
onErrorCaptured,
provide,
shallowRef,
useTemplateRef,
watch,
} from 'vue';
import CopyElementValuesController from '@/actions/CraftCms/Cms/Http/Controllers/Elements/CopyElementValuesController';
import CrossSiteCopyModal from './CrossSiteCopyModal.vue';
import FormNodeList from './FormNodeList.vue';
import {
FieldActionItems,
Expand All @@ -32,6 +39,23 @@
FormValue,
} from './types';

type CrossSiteCopyDetail = {
trigger?: unknown;
elementType: string;
elementId: number;
draftId: number | null;
siteId: number;
layoutElementUid: string;
label?: string | null;
siteIds: number[];
};

type CrossSiteCopyResponse = {
message: string;
field: FormNodePayload<FieldNodeProps>;
values: FormPayload['values'];
};

type FieldNodeProps = {
label?: string | null;
/** Visually hides the label, keeping it available to screen readers. */
Expand Down Expand Up @@ -63,14 +87,19 @@
const emit = defineEmits<{
(event: 'change', change: FormChange): void;
}>();
const resolvedNode = shallowRef(props.node);
watch(
() => props.node,
(node) => (resolvedNode.value = node)
);
const invalidate = inject(FormFailure)!;
provide(
FieldLabelSrOnly,
computed(() => Boolean(props.node.props.labelSrOnly))
computed(() => Boolean(resolvedNode.value.props.labelSrOnly))
);
const overrides = inject(FormControlOverrides, {});
const components = getCurrentInstance()!.appContext.components;
const control = computed(() => props.node.control!);
const control = computed(() => resolvedNode.value.control!);
const component = computed(() => {
const component = components[control.value.component];

Expand All @@ -83,7 +112,7 @@
return component;
});
const override = computed(() => overrides[control.value.path.join('.')]);
const actions = computed(() => props.node.children ?? []);
const actions = computed(() => resolvedNode.value.children ?? []);

provide(FieldActionItems, shallowRef());

Expand Down Expand Up @@ -168,10 +197,10 @@
control: control.value,
value: value.value,
values: props.values,
label: props.node.props.label ?? undefined,
label: resolvedNode.value.props.label ?? undefined,
editable: editable.value,
invalid: controlErrors.value.length > 0,
required: Boolean(props.node.props.required),
required: Boolean(resolvedNode.value.props.required),
setValue,
});
}
Expand All @@ -183,29 +212,93 @@
emit('change', formChange);
}
}

const field = useTemplateRef<HTMLElement>('field');
const copyDetail = shallowRef<CrossSiteCopyDetail>();
const copySites = shallowRef<Array<{id: number; name: string}>>([]);
const copying = shallowRef(false);

useEventListener(window, 'craft:copy-value-from-site', (event: Event) => {
const detail = (event as CustomEvent<CrossSiteCopyDetail>).detail;

if (
!detail ||
!(detail.trigger instanceof HTMLElement) ||
detail.trigger.closest('craft-field') !== field.value
) {
return;
}

copyDetail.value = detail;
copySites.value = Craft.sites.filter((site) =>
detail.siteIds.includes(site.id)
);
});

async function copyValue(fromSiteId: number): Promise<void> {
const detail = copyDetail.value;

if (!detail) {
return;
}

copying.value = true;

try {
const {data} = await actionClient.post<CrossSiteCopyResponse>(
CopyElementValuesController.url(),
{
elementType: detail.elementType,
elementId: detail.elementId,
draftId: detail.draftId,
siteId: detail.siteId,
layoutElementUid: detail.layoutElementUid,
fromSiteId,
namespace: props.scope.join('.') || null,
}
);

resolvedNode.value = data.field;
setValue(controlValueAt(data.values, data.field.control!));
copyDetail.value = undefined;
Craft.cp?.displayNotice?.(data.message);
} catch (error) {
const message = axios.isAxiosError<{message?: string}>(error)
? error.response?.data?.message
: undefined;
Craft.cp?.displayError?.(
message ?? t('Couldn’t copy the field value from the selected site.')
);
} finally {
copying.value = false;
}
}
</script>

<template>
<craft-field
ref="field"
:id="fieldId(control.path)"
:label="node.props.label ?? undefined"
:label-sr-only="node.props.labelSrOnly || undefined"
:help-text="node.props.instructions ?? undefined"
:instructions-position="node.props.instructionsPosition"
:required="Boolean(node.props.required)"
:label="resolvedNode.props.label ?? undefined"
:label-sr-only="resolvedNode.props.labelSrOnly || undefined"
:help-text="resolvedNode.props.instructions ?? undefined"
:instructions-position="resolvedNode.props.instructionsPosition"
:required="Boolean(resolvedNode.props.required)"
:readonly="control.mode === 'readOnly'"
:disabled="control.mode === 'disabled'"
:has-errors="controlErrors.length > 0"
:status="modified ? 'modified' : node.props.status"
:status="modified ? 'modified' : resolvedNode.props.status"
:status-label="
modified ? t('This field has been modified.') : node.props.statusLabel
modified
? t('This field has been modified.')
: resolvedNode.props.statusLabel
"
:class="{
[`width-${node.props.width}`]: Boolean(node.props.width),
hidden: Boolean(node.props.hidden),
[`width-${resolvedNode.props.width}`]: Boolean(resolvedNode.props.width),
hidden: Boolean(resolvedNode.props.hidden),
}"
:hidden="node.props.hidden || undefined"
:data-layout-element="node.props.layoutUid"
:hidden="resolvedNode.props.hidden || undefined"
:data-layout-element="resolvedNode.props.layoutUid"
>
<div v-if="actions.length" slot="actions">
<FormNodeList
Expand All @@ -218,11 +311,15 @@
@change="onChange"
/>
</div>
<span v-if="node.props.tipHtml" slot="tip" v-html="node.props.tipHtml" />
<span
v-if="node.props.warningHtml"
v-if="resolvedNode.props.tipHtml"
slot="tip"
v-html="resolvedNode.props.tipHtml"
/>
<span
v-if="resolvedNode.props.warningHtml"
slot="warning"
v-html="node.props.warningHtml"
v-html="resolvedNode.props.warningHtml"
/>
<div
v-if="override"
Expand All @@ -240,10 +337,10 @@
slot="input"
:control="control"
:value="value"
:label="node.props.label ?? undefined"
:label="resolvedNode.props.label ?? undefined"
:editable="editable"
:invalid="controlErrors.length > 0"
:required="Boolean(node.props.required)"
:required="Boolean(resolvedNode.props.required)"
:values="values"
:errors="errors"
:touched-paths="touchedPaths"
Expand All @@ -259,4 +356,12 @@
<li v-for="error in controlErrors" :key="error">{{ error }}</li>
</ul>
</craft-field>
<CrossSiteCopyModal
:active="Boolean(copyDetail)"
:label="copyDetail?.label"
:sites="copySites"
:loading="copying"
@close="copyDetail = undefined"
@submit="copyValue"
/>
</template>
Loading
Loading