[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[5.x] Extra values for field conditions. Add extra asset values.#10588

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

Merged
jasonvarga merged 5 commits into from
Oct 21, 2024
Merged

[5.x] Extra values for field conditions. Add extra asset values. #10588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04164a0
Send mimetype and duration with asset resource
daun Aug 7, 2024
bebfeca
Provide asset data as hidden fields
daun Aug 7, 2024
dc7b06b
Merge branch '5.x' into feature/asset-editor-with-meta
daun Oct 18, 2024
959a478
Merge branch '5.x' into feature/asset-editor-with-meta
jasonvarga Oct 21, 2024
67c141c
introduce extra values concept rather than hacking in hidden fields
jasonvarga Oct 21, 2024
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
5 changes: 5 additions & 0 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@
:name="publishContainer"
:blueprint="fieldset"
:values="values"
:extra-values="extraValues"
:meta="meta"
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
Expand DownExpand Up@@ -204,6 +205,7 @@ import FocalPointEditor from './FocalPointEditor.vue';
import PdfViewer from './PdfViewer.vue';
import PublishFields from '../../publish/Fields.vue';
import HasHiddenFields from '../../publish/HasHiddenFields';
import pick from 'underscore/modules/pick';

export default {

Expand DownExpand Up@@ -245,6 +247,7 @@ export default {
asset: null,
publishContainer: 'asset',
values: {},
extraValues: {},
meta: {},
fields: null,
fieldset: null,
Expand DownExpand Up@@ -347,6 +350,8 @@ export default {
.flatten(true)
.value();

this.extraValues = pick(this.asset, ['filename', 'basename', 'extension', 'path', 'mimeType', 'width', 'height', 'duration']);

this.loading = false;
});
},
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export default {
}

// Use validation to determine whether field should be shown.
let validator = new Validator(field, this.values, dottedFieldPath, this.$store, this.storeName);
let validator = new Validator(field, {...this.values, ...this.extraValues}, dottedFieldPath, this.$store, this.storeName);
let passes = validator.passesConditions();

// If the field is configured to always save, never omit value.
Expand Down
6 changes: 6 additions & 0 deletions resources/js/components/publish/Container.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,10 @@ export default {
type: Object,
default: () => {}
},
extraValues: {
type: Object,
default: () => {}
},
meta: {
type: Object,
default: () => {}
Expand DownExpand Up@@ -78,6 +82,7 @@ export default {
const initial = {
blueprint: _.clone(this.blueprint),
values: _.clone(this.values),
extraValues: _.clone(this.extraValues),
meta: _.clone(this.meta),
localizedFields: _.clone(this.localizedFields),
site: this.site,
Expand All@@ -97,6 +102,7 @@ export default {
state: {
blueprint: initial.blueprint,
values: initial.values,
extraValues: initial.extraValues,
hiddenFields: {},
jsonSubmittingFields: [],
revealerFields: [],
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/publish/Fields.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,10 @@ export default {
return this.state.values;
},

extraValues() {
return this.state.extraValues || {};
},

meta() {
return this.state.meta;
},
Expand Down
15 changes: 14 additions & 1 deletion resources/js/tests/FieldConditionsValidator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,8 @@ const Fields = new Vue({
data() {
return {
storeName: 'base',
values: {}
values: {},
extraValues: {},
}
},
methods: {
Expand All@@ -78,6 +79,9 @@ const Fields = new Vue({
}
Store.commit('publish/base/setValues', storeValues);
},
setExtraValues(values) {
this.extraValues = values;
},
setStoreValues(values) {
Store.commit('publish/base/setValues', values);
},
Expand DownExpand Up@@ -106,6 +110,7 @@ let showFieldIf = function (conditions=null, dottedFieldPath=null) {

afterEach(() => {
Fields.values = {};
Fields.extraValues = {};
Store.commit('publish/base/reset');
});

Expand DownExpand Up@@ -1010,3 +1015,11 @@ test('it properly omits nested revealer-hidden fields when multiple conditions a
// Though this third venue is hidden by a revealer, it's also disabled by a regular toggle condition, so it should actually be omitted...
expect(Store.state.publish.base.hiddenFields['nested.event_venue_three'].omitValue).toBe(true);
});

test('it can use extra values in conditions', () => {
Fields.setValues({});
Fields.setExtraValues({hello: 'world'});

expect(showFieldIf({hello: 'world'})).toBe(true);
expect(showFieldIf({hello: 'there'})).toBe(false);
});
4 changes: 2 additions & 2 deletions src/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1071,12 +1071,12 @@ protected function defaultAugmentedRelations()
return $this->selectedQueryRelations;
}

private function hasDimensions()
public function hasDimensions()
{
return $this->isImage() || $this->isSvg() || $this->isVideo();
}

private function hasDuration()
public function hasDuration()
{
return $this->isAudio() || $this->isVideo();
}
Expand Down
14 changes: 13 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ public function toArray($request)
'size' => Str::fileSizeForHumans($this->size()),
'lastModified' => $this->lastModified()->inPreferredFormat(),
'lastModifiedRelative' => $this->lastModified()->diffForHumans(),
'mimeType' => $this->mimeType(),
'isImage' => $this->isImage(),
'isSvg' => $this->isSvg(),
'isAudio' => $this->isAudio(),
Expand All@@ -31,10 +32,21 @@ public function toArray($request)
'isPdf' => $this->isPdf(),
'isPreviewable' => $this->isPreviewable(),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
$this->mergeWhen($this->hasDimensions(), function () {
return [
'width' => $this->width(),
'height' => $this->height(),
];
}),

$this->mergeWhen($this->hasDuration(), function () {
return [
'duration' => $this->duration(),
];
}),

$this->mergeWhen($this->isImage() || $this->isSvg(), function () {
return [
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
];
Expand Down