diff options
3 files changed, 7 insertions, 17 deletions
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.scss b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.scss index 5232ad41c..463e69c67 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.scss +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.scss @@ -400,7 +400,7 @@ display: grid; justify-content: space-evenly; row-gap: 2rem; - grid-template-columns: repeat(auto-fill, minmax(225px, 30%)); + grid-template-columns: repeat(auto-fill, minmax(150px, 30%)); margin: 5px; width: calc(100% - 10px); height: 100%; @@ -1033,7 +1033,7 @@ .form-row-textarea { height: 24px; - width: 70px; + width: 110px; border-radius: 5px; background-color: rgb(50, 50, 50); border: 1px solid rgb(180, 180, 180); diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx index bd5c50aa0..e6db79339 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx @@ -81,7 +81,7 @@ export class DocCreatorMenu extends ObservableReactComponent<DocCreateMenuProps> // eslint-disable-next-line no-use-before-define static Instance: DocCreatorMenu; - private DEBUG_MODE: boolean = true; + private DEBUG_MODE: boolean = false; private _ref: HTMLDivElement | null = null; private templateManager: TemplateManager; @@ -914,23 +914,12 @@ export class DocCreatorMenu extends ObservableReactComponent<DocCreateMenuProps> ); } - private _newCondCache: Record<string, Conditional> = {}; - - getParams = (title: string, parameters?: Conditional): Conditional => { - if (parameters) return parameters; - - if (!this._newCondCache[title]) { - this._newCondCache[title] = { field: title, operator: '=', condition: '', target: '', attribute: '', value: '' }; - } - return this._newCondCache[title]; - }; - get dashboardContents() { const contentFieldTitles = this.fieldsInfos.filter(field => field.type !== TemplateFieldType.DATA).map(field => field.title).concat('Template'); const conditionForm = (title: string, parameters?: Conditional, empty: boolean = false) => { - const params: Conditional = this.getParams(title, parameters); + const params: Conditional = parameters ?? this._currEditingConditional; return ( <div className='form'> @@ -1047,7 +1036,7 @@ export class DocCreatorMenu extends ObservableReactComponent<DocCreateMenuProps> } <div className="conditionals-section"> <span className="conditionals-title">Conditional Logic</span> - {conditionForm(field.title, undefined, true)} + {conditionForm(field.title, this._currEditingConditional, true)} {this.templateManager.conditionalFieldLogic[field.title]?.map(condition => conditionForm(condition.field, condition))} </div> </> diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts index 232a9cf67..19be65351 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts @@ -102,8 +102,10 @@ export class Template { const fieldStatements: Conditional[] = logic[field.getTitle()]; const content = field.getContent() fieldStatements && fieldStatements.forEach(statement => { + console.log(statement); if (content === statement.condition) { if (statement.target === 'template') { + console.log('on template') this._mainField.renderedDoc![statement.attribute] = statement.value; } else { const targetField: TemplateField = this.getFieldByTitle(statement.target) as TemplateField; @@ -114,7 +116,6 @@ export class Template { } applyConditionalLogic = (logic: Record<string, Conditional[]>) => { - console.log('applying logic: ', logic) const fields: (TemplateField | TemplateDataField)[] = [...this.allFields, ...this.dataFields]; fields.forEach(field => this.applyConditionalLogicToField(field, logic)); } |