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

Form builder Dynamic section changes - bug fixes #953

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Form builder Dynamic section changes - bug fixes #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed8b92e
fix: delete button is not shown for some of the conversation properties
gowtham-balaganesh Nov 15, 2024
3aa2cc0
fix: don't show tooltip for default fields
gowtham-balaganesh Nov 18, 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
8 changes: 4 additions & 4 deletions ...yons-extended/custom-objects/src/components/form-builder/components/fb-field-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,11 @@ export class FbFieldDropdown {
dpSource.length > 0
? dpSource
.map((dataItem, index) => {
const isNewChoice = !hasCustomProperty(dataItem, 'id');
const isNewChoice = !hasCustomProperty(dataItem, 'id'),
hasSection = !!dataItem?.choice_options?.section_name;
const isChoiceDisabled =
!isNewChoice &&
(this.disabled || !!dataItem?.choice_options?.section_name);
if (isChoiceDisabled) {
!isNewChoice && (this.disabled || hasSection);
if (hasSection) {
return (
<fw-tooltip
placement='bottom'
Expand Down
43 changes: 25 additions & 18 deletions ...s/crayons-extended/custom-objects/src/components/form-builder/components/field-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ import {
validateLevels,
} from '../utils/form-builder-utils';

import { parseBoolean } from '../../../utils/utils';

@Component({
tag: 'fw-field-editor',
styleUrl: 'field-editor.scss',
Expand Down Expand Up @@ -301,7 +303,9 @@ export class FieldEditor {
hasCustomProperty(objDP, 'isSection') && objDP?.isSection === true
? true
: false;
this.editSectionField = objDP.field_options?.is_section_field;
this.editSectionField = parseBoolean(
objDP.field_options?.is_section_field
);
// Currently supports dropdown format
this.isDependentField = objDP.type === 'DEPENDENT_FIELD';

Expand Down Expand Up @@ -2032,7 +2036,7 @@ export class FieldEditor {
}
} else if (
this.dataProvider.isSectionFieldMatch &&
this.dataProvider?.field_options?.is_section_field &&
parseBoolean(this.dataProvider?.field_options?.is_section_field) &&
this.disabledSort
) {
const elDefaultCustomTag = this.renderFwLabel({
Expand Down Expand Up @@ -2085,6 +2089,13 @@ export class FieldEditor {
this.createDynamicSection ||
this.sectionCreatedForAllChoices;

const showDeleteBtn =
!this.expanded &&
!this.isPrimaryField &&
!this.isDeleting &&
!this.isDefaultNonCustomField &&
!this.editSectionField;

return (
<Host tabIndex='-1'>
<div
Expand Down Expand Up @@ -2162,22 +2173,18 @@ export class FieldEditor {
</fw-button>
</fw-tooltip>
)}
{!this.expanded &&
!this.isPrimaryField &&
!this.isDeleting &&
!this.isDefaultNonCustomField &&
!this.editSectionField && (
<fw-button
part='delete-field-btn'
size='icon'
color='secondary'
disabled={boolDisableDelete}
class={`${strBaseClassName}-delete-button`}
onFwClick={this.deleteFieldClickHandler}
>
<fw-icon name='delete'></fw-icon>
</fw-button>
)}
{showDeleteBtn && (
<fw-button
part='delete-field-btn'
size='icon'
color='secondary'
disabled={boolDisableDelete}
class={`${strBaseClassName}-delete-button`}
onFwClick={this.deleteFieldClickHandler}
>
<fw-icon name='delete'></fw-icon>
</fw-button>
)}
{/* {!this.expanded && this.isDefaultNonCustomField && (
<span class={`${strBaseClassName}-lock-container`}>
<fw-icon name='lock'></fw-icon>
Expand Down
3 changes: 2 additions & 1 deletion packages/crayons-extended/custom-objects/src/components/form-builder/form-builder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import presetSchema from './assets/form-builder-preset.json';
import formMapper from './assets/form-mapper.json';
import { debounce } from '../../utils/utils';
import { TranslationController } from '../../global/Translation';
import { parseBoolean } from '../../utils/utils';

@Component({
tag: 'fw-form-builder',
Expand Down Expand Up @@ -691,7 +692,7 @@ export class FormBuilder {
return fields.reduce((results, field) => {
// Check if the field label matches the search text
if (field.label.toLowerCase().includes(strSearchableText)) {
if (field?.field_options?.is_section_field) {
if (parseBoolean(field?.field_options?.is_section_field)) {
field.isSectionFieldMatch = true;
}
results.push(field);
Expand Down
7 changes: 7 additions & 0 deletions packages/crayons-extended/custom-objects/src/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,10 @@ export const debounce = (fn, context, timeout = 1000) => {
}, timeout);
};
};

export const parseBoolean = (value: any) => {
if (typeof value === 'string') {
return value === 'true';
}
return !!value;
};
Loading