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.

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

Feature/FOUR-18114:STORY Record List from Collections UI Update) #1740

Merged
merged 24 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
45e2d87
Saving progress 1 Dropdown Table Style ok
CarliPinell Oct 10, 2024
1679dcc
Saving progress 2, row highlight, b-table with border new icons
CarliPinell Oct 11, 2024
2f15f74
saving progress delete popover ok
CarliPinell Oct 12, 2024
680c514
ready for PR
CarliPinell Oct 14, 2024
29d5479
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 14, 2024
3e6757e
Removing unused code
CarliPinell Oct 14, 2024
0b4049d
Apllying Modern color palette
CarliPinell Oct 15, 2024
4ebf020
saving progress
CarliPinell Oct 15, 2024
c366265
Ready for PR
CarliPinell Oct 15, 2024
67a2055
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 15, 2024
ed39685
Merge branch 'release-2024-fall' into feature/FOUR-18114-e-EDIT
CarliPinell Oct 16, 2024
86a2f29
Adding missing files
CarliPinell Oct 16, 2024
c60979b
Merge branch 'feature/FOUR-18114' of github.com:ProcessMaker/screen-b…
CarliPinell Oct 16, 2024
b67b706
Merge branch 'release-2024-fall' into feature/FOUR-18114
CarliPinell Oct 16, 2024
80f8afb
Merge branch 'release-2024-fall' into feature/FOUR-18114
CarliPinell Oct 18, 2024
3d92aee
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 18, 2024
0d86705
Bump VFE version
nolanpro Oct 18, 2024
107fcd2
Remove next from ci config
nolanpro Oct 18, 2024
42a8924
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 21, 2024
09cd5f3
Merge branch 'release-2024-fall' into feature/FOUR-18114
CarliPinell Oct 21, 2024
36f314d
Merge branch 'feature/FOUR-18114' of github.com:ProcessMaker/screen-b…
CarliPinell Oct 22, 2024
6cefd3c
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 22, 2024
2250ad9
Adding code someone removed solving conflicts
CarliPinell Oct 22, 2024
3d1db8d
Adding code someone removes in conflicts
CarliPinell Oct 22, 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
3 changes: 3 additions & 0 deletions src/assets/Shape.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/pencil-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/accordions.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default [
},
{
name: 'Design',
fields: ['color', 'bgcolor', 'variant', 'toggle', 'height', 'width'],
fields: ['color', 'bgcolor', 'variant', 'toggle', 'height', 'width', 'designerMode', 'bgcolormodern'],
open: false,
},
{
Expand Down
1 change: 0 additions & 1 deletion src/components/inspector/collection-data-source.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"variableStore",
"dataSelectionOptions",
"singleField"

];
export default {
components: {
Expand Down
65 changes: 65 additions & 0 deletions src/components/inspector/collection-designer-mode.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<template>
<div>
<div>
<label for="collectiondesigner">{{ $t("Table Style") }}</label>
<b-form-select
id="collectiondesigner"
v-model="designerOptions"
:options="designerListOptions"
data-cy="inspector-collection-designer-model"
/>
</div>
</div>
</template>
<script>

import { cloneDeep } from "lodash";

const CONFIG_FIELDS = [
"designerOptions"
];
export default {
props: ["value", "screenType"],
data() {
return {
fields: [],
designerOptions: "Classic",
designerListOptions: [
{
text: this.$t('Classic'),
value: 'Classic',
},
{
text: this.$t('Modern'),
value: 'Modern',
},
],
};
},
computed: {
options() {
return Object.fromEntries(
CONFIG_FIELDS.map((field) => [field, this[field]])
);
}
},
watch: {
value: {
handler(value) {
if (!value) {
return;
}
CONFIG_FIELDS.forEach((field) => (this[field] = value[field]));
},
immediate: true
},
options: {
handler() {
this.$emit("input", this.options);
this.$root.$emit("style-mode", this.options.designerOptions);
},
deep: true
},
},
};
</script>
101 changes: 101 additions & 0 deletions src/components/inspector/color-select-modern.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<template>
<div class="form-group">
<div>
<b-button-toolbar>
<b-button-group size="lg">
<b-button
v-for="option in options"
:key="option.value"
size="sm"
variant="outline-light"
class="color-option"
:class="['bg-' + parsedColor(option.value)]"
:title="option.content"
>
<i
class="fas fa-check"
:class="[
option.value === value
? 'text-light'
: 'text-' + parsedColor(option.value)
]"
@click="selectColor(option.value)"
/>
</b-button>
</b-button-group>
</b-button-toolbar>
</div>
</div>
</template>

<script>
export default {
components: {},
props: {
/**
* The label for the color select
*/
label: {},
/**
* The value of the color select. eg. `alert alert-success`
*/
value: {},
/**
* The helper text for the color select (not visible yet)
*/
helper: {},
/**
* The options for the color select
*/
options: {},
},
data() {
return {
newColor: ""
};
},
computed: {
hasColor() {
return Boolean(this.value);
}
},
methods: {
emitChanges(value) {
this.$emit("input", value);
this.$emit("update-state");
},
checkColor() {
if (this.hasColor) {
this.emitChanges("");
}
},
selectColor(color) {
this.emitChanges(color);
},
parsedColor(color) {
return color.split("-")[1];
}
}
};
</script>

<style lang="scss" scoped>
.image-preview {
border: 1px solid #ced4da;
border-radius: 4px;
height: 4em;
text-align: center;
overflow: hidden;
}
.color-option {
left: -8px;
border-radius: 4px;
width: 48px;
height: 48px;
margin-right: 15px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
</style>
3 changes: 3 additions & 0 deletions src/components/inspector/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ export { default as CollectionSelectList } from "./collection-select-list.vue";
export { default as CollectionRecordsList } from "./collection-records-list.vue";
export { default as collectionDataSource } from "./collection-data-source.vue";
export { default as CollectionDisplayMode } from "./collection-display-mode.vue";
export { default as CollectionDesignerMode } from "./collection-designer-mode.vue";
export { default as ColorSelect } from "./color-select.vue";
export { default as ColorSelectRecord } from "./color-select.vue";
export { default as ColorSelectModern } from "./color-select-modern.vue";
export { default as ColumnSetup } from "./column-setup.vue";
export { default as ContainerColumns } from "./container-columns.vue";
export { default as DataMapping } from "./data-mapping.vue";
Expand Down
Loading
Loading