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

Vue: Disable ArrayListRenderer add if control.data.length exceeds or is equal to maxItems #2154

Merged
merged 13 commits into from
Jul 11, 2023
Merged

Vue: Disable ArrayListRenderer add if control.data.length exceeds or is equal to maxItems #2154

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cbfde84
Disables Add button in ArrayListRenderer if MaxItems is exceeded
Droxx Jul 4, 2023
b0b9be7
ensured changes are functional after testing
Droxx Jul 4, 2023
cd80ab9
Extracted disabled logic into computed property, using scope.schema i…
Droxx Jul 10, 2023
f076fbd
removed appliedOptions.restrict since I do not see it in use on other…
Droxx Jul 10, 2023
3e2205b
Added delete minItems checking
Droxx Jul 10, 2023
0274b7e
removed submodule
Droxx Jul 10, 2023
c2503a1
whitespace
Droxx Jul 10, 2023
4c26e63
Added unit tests for new functionality
Droxx Jul 10, 2023
91b21e9
reverted package.lock
Droxx Jul 10, 2023
bab7782
Added control.enabled checks on other buttons & Added appliedOptions.…
Droxx Jul 10, 2023
9845ae2
reverted package.lock to master
Droxx Jul 10, 2023
bec9d01
Fixes failure with linter
Droxx Jul 10, 2023
274854e
modify example to showcase restrict on arrays
sdirix Jul 10, 2023
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
15 changes: 14 additions & 1 deletion packages/vue/vue-vanilla/src/array/ArrayListRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
:class="styles.arrayList.addButton"
type="button"
@click="addButtonClick"
>
:disabled="!control.enabled ||
(arraySchema !== undefined &&
arraySchema.maxItems !== undefined &&
control.data !== undefined &&
control.data.length >= arraySchema.maxItems)"
>
Droxx marked this conversation as resolved.
Show resolved Hide resolved
+
</button>
<label :class="styles.arrayList.label">
Expand Down Expand Up @@ -50,6 +55,8 @@ import {
rankWith,
ControlElement,
schemaTypeIs,
Resolve,
JsonSchema
} from '@jsonforms/core';
import { defineComponent } from 'vue';
import {
Expand Down Expand Up @@ -77,6 +84,12 @@ const controlRenderer = defineComponent({
noData(): boolean {
return !this.control.data || this.control.data.length === 0;
},
arraySchema(): JsonSchema | undefined {
return Resolve.schema(
this.control.rootSchema,
Droxx marked this conversation as resolved.
Show resolved Hide resolved
this.control.uischema.scope,
this.control.rootSchema);
}
},
methods: {
composePaths,
Expand Down