diff options
Diffstat (limited to 'src')
15 files changed, 45 insertions, 86 deletions
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateManager.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateManager.ts index 6fcca7e30..78235d000 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateManager.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateManager.ts @@ -2,7 +2,7 @@ import { action, makeAutoObservable } from 'mobx'; import { Col } from '../DocCreatorMenu'; import { FieldSettings, TemplateField } from '../TemplateFieldTypes/TemplateField'; import { Template } from '../Template'; -import { Doc, NumListCast } from '../../../../../../fields/Doc'; +import { NumListCast } from '../../../../../../fields/Doc'; import { DataVizBox } from '../../DataVizBox'; import { TemplateFieldType } from '../TemplateBackend'; import { TemplateMenuAIUtils } from './TemplateMenuAIUtils'; diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateMenuAIUtils.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateMenuAIUtils.ts index 9bc2bfce2..162b7a1b1 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateMenuAIUtils.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Backend/TemplateMenuAIUtils.ts @@ -1,5 +1,3 @@ -import { action } from "mobx"; -import { Upload } from "openai/resources"; import { ClientUtils } from "../../../../../../ClientUtils"; import { Networking } from "../../../../../Network"; import { gptImageCall, gptAPICall, GPTCallType } from "../../../../../apis/gpt/GPT"; @@ -7,9 +5,6 @@ import { Col } from "../DocCreatorMenu"; import { TemplateFieldSize, TemplateFieldType } from "../TemplateBackend"; import { TemplateField, ViewType } from "../TemplateFieldTypes/TemplateField"; import { Template } from "../Template"; -import { Doc } from "../../../../../../fields/Doc"; -import { DrawingFillHandler } from "../../../../smartdraw/DrawingFillHandler"; -import { CollectionFreeFormView } from "../../../../collections/collectionFreeForm"; export class TemplateMenuAIUtils { @@ -30,6 +25,7 @@ export class TemplateMenuAIUtils { public static renderGPTImageCall = async (template: Template, col: Col, fieldNumber: number): Promise<boolean> => { const generateAndLoadImage = async (id: number, prompt: string) => { const url = await this.generateGPTImage(prompt); + // eslint-disable-next-line var field: TemplateField = template.getFieldByID(id); field.setContent(url ?? '', ViewType.IMG); diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx index 9a84e69a9..ebfa3fc65 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx @@ -1,44 +1,31 @@ -import { Colors } from '@dash/components'; + import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { action, computed, makeObservable, observable, runInAction } from 'mobx'; import { observer } from 'mobx-react'; -import { IDisposer } from 'mobx-utils'; import * as React from 'react'; -import ReactLoading from 'react-loading'; -import { ClientUtils, returnEmptyFilter, returnFalse, setupMoveUpEvents } from '../../../../../ClientUtils'; +import { returnFalse, setupMoveUpEvents } from '../../../../../ClientUtils'; import { emptyFunction } from '../../../../../Utils'; -import { Doc, NumListCast, StrListCast, returnEmptyDoclist } from '../../../../../fields/Doc'; +import { Doc, StrListCast } from '../../../../../fields/Doc'; import { Id } from '../../../../../fields/FieldSymbols'; -import { ImageCast, StrCast } from '../../../../../fields/Types'; -import { ImageField } from '../../../../../fields/URLField'; -import { Upload } from '../../../../../server/SharedMediaTypes'; -import { Networking } from '../../../../Network'; -import { GPTCallType, gptAPICall, gptImageCall } from '../../../../apis/gpt/GPT'; -import { Docs, DocumentOptions } from '../../../../documents/Documents'; +import { GPTCallType, gptAPICall } from '../../../../apis/gpt/GPT'; import { DragManager } from '../../../../util/DragManager'; import { SnappingManager } from '../../../../util/SnappingManager'; -import { Transform } from '../../../../util/Transform'; import { UndoManager, undoable } from '../../../../util/UndoManager'; import { ObservableReactComponent } from '../../../ObservableReactComponent'; -import { DefaultStyleProvider } from '../../../StyleProvider'; import { CollectionFreeFormView } from '../../../collections/collectionFreeForm/CollectionFreeFormView'; -import { DocumentView, DocumentViewInternal } from '../../DocumentView'; +import { DocumentView } from '../../DocumentView'; import { OpenWhere } from '../../OpenWhere'; import { DataVizBox } from '../DataVizBox'; import './DocCreatorMenu.scss'; -import { TemplateField, ViewType } from './TemplateFieldTypes/TemplateField'; +import { ViewType } from './TemplateFieldTypes/TemplateField'; import { Template } from './Template'; import { TemplateFieldSize, TemplateFieldType, TemplateLayouts } from './TemplateBackend'; -import { Conditional, TemplateManager } from './Backend/TemplateManager'; -import { DrawingFillHandler } from '../../../smartdraw/DrawingFillHandler'; -import { CgPathIntersect } from 'react-icons/cg'; -import { StaticContentField } from './TemplateFieldTypes/StaticContentField'; +import { TemplateManager } from './Backend/TemplateManager'; import { TemplateMenuAIUtils } from './Backend/TemplateMenuAIUtils' import { TemplatePreviewGrid } from './Menu/TemplatePreviewGrid'; import { FireflyStructureOptions, TemplateEditingWindow } from './Menu/TemplateEditingWindow'; import { DocCreatorMenuButton } from './Menu/DocCreatorMenuButton'; -import { ConditionalsTextArea } from './Menu/ConditionalsTextarea'; import { TemplatesRenderPreviewWindow } from './Menu/TemplateRenderPreviewWindow'; import { TemplateMenuFieldOptions } from './Menu/TemplateMenuFieldOptions'; @@ -500,7 +487,7 @@ export class DocCreatorMenu extends ObservableReactComponent<DocCreateMenuProps> }; generateVariations = async (onDoc: Doc, prompt: string, options: FireflyStructureOptions): Promise<string[]> => { - const { numVariations, temperature, useStyleRef } = options; + // const { numVariations, temperature, useStyleRef } = options; this.variations = []; const mainCollection = this._dataViz?.DocumentView?.().containerViewPath?.().lastElement()?.ComponentView as CollectionFreeFormView; @@ -509,7 +496,7 @@ export class DocCreatorMenu extends ObservableReactComponent<DocCreateMenuProps> clone.x = 10000; clone.y = 10000; - await DrawingFillHandler.drawingToImage(clone, 100 - temperature, prompt, useStyleRef ? clone : undefined, this, numVariations) + // await DrawingFillHandler.drawingToImage(clone, 100 - temperature, prompt, useStyleRef ? clone : undefined, this, numVariations) return this.variations; } diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/ConditionalsTextarea.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/ConditionalsTextarea.tsx index 2ca0bde3f..89c2e44ff 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/ConditionalsTextarea.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/ConditionalsTextarea.tsx @@ -51,7 +51,7 @@ export class ConditionalsTextArea extends ObservableReactComponent<ConditionalsT value={this.props.conditional[this.props.property] ?? ''} onChange={e => { runInAction(() => { - this.props.conditional[this.props.property] = e.target.value as any; + this.props.conditional[this.props.property] = e.target.value as "=" | ">" | "<" | "contains"; }); this.updateInputWidth(); }} diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/DocCreatorMenuButton.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/DocCreatorMenuButton.tsx index 1d8139d40..48d2de4de 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/DocCreatorMenuButton.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/DocCreatorMenuButton.tsx @@ -9,13 +9,14 @@ import { observer } from "mobx-react"; interface DocCreatorMenuButtonProps { icon: IconProp; + // eslint-disable-next-line function: () => any; styles?: string; } @observer export class DocCreatorMenuButton extends ObservableReactComponent<DocCreatorMenuButtonProps> { - + // eslint-disable-next-line setupButtonClick = (e: React.PointerEvent, func: (...args: any) => void) => { setupMoveUpEvents( this, diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx index 3eaed79b6..b50fff9e0 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx @@ -1,7 +1,6 @@ -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { action, makeAutoObservable, makeObservable, observable, reaction, runInAction } from "mobx"; +import { action, makeObservable, observable, reaction, runInAction } from "mobx"; import React from "react"; -import { returnFalse, returnEmptyFilter, returnTrue } from "../../../../../../ClientUtils"; +import { returnFalse, returnEmptyFilter } from "../../../../../../ClientUtils"; import { emptyFunction } from "../../../../../../Utils"; import { Doc, returnEmptyDoclist } from "../../../../../../fields/Doc"; import { DefaultStyleProvider } from "../../../../StyleProvider"; @@ -11,14 +10,10 @@ import { TemplatePreviewGrid } from "./TemplatePreviewGrid"; import { observer } from "mobx-react"; import { Transform } from "../../../../../util/Transform"; import { Template } from "../Template"; -import { TemplateMenuAIUtils } from "../Backend/TemplateMenuAIUtils"; import { ObservableReactComponent } from "../../../../ObservableReactComponent"; import { IDisposer } from "mobx-utils"; -import { ImageField } from "../../../../../../fields/URLField"; import { DocCreatorMenuButton } from "./DocCreatorMenuButton"; -import { TbHistory } from "react-icons/tb"; import { IconProp } from "@fortawesome/fontawesome-svg-core"; -import { docStyle } from "pdfjs-dist/types/web/ui_utils"; export type FireflyStructureOptions = { numVariations: number; @@ -56,7 +51,7 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat cloneTemplate.setMatteBackground(); const doc: Doc = cloneTemplate.getRenderedDoc()!; this._variationURLs = await this._props.menu.generateVariations(doc, this.prompt, this.fireflyOptions); - this._variationURLs.forEach(url => { + this._variationURLs.forEach(() => { const newTemplate: Template = this._props.template.clone(true); this._props.menu._variations.push(newTemplate); }); @@ -72,7 +67,9 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat this.promptInput = node; } + // eslint-disable-next-line private optionsButtonOpts: [IconProp, () => any] = ['gear', () => {}]; + // eslint-disable-next-line private previewBoxRightButtonOpts: [IconProp, () => any] = ['gear', () => this.forceUpdate()]; render() { @@ -93,7 +90,7 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat <textarea className="docCreatorMenu-variation-prompt-input-textbox" ref={this.setPromptInputRef} - onChange={e => this.prompt = e.target.value} + onChange={e => { this.prompt = e.target.value }} onInput={() => { if (this.promptInput !== null) { this.promptInput.style.height = 'auto'; @@ -108,7 +105,7 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat <nav className="options‑menu"> <label className="menu‑item switch"> <input type="checkbox" checked={this.fireflyOptions.useStyleRef} - onChange={(e) => runInAction(() => this.fireflyOptions.useStyleRef = e.target.checked)} + onChange={(e) => runInAction(() => { this.fireflyOptions.useStyleRef = e.target.checked })} /> <span className="slider round"></span> <span className="firefly-option-label">Use template as style guide</span> @@ -119,7 +116,7 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat min="1" max="5" value={this.fireflyOptions.numVariations} - onChange={(e) => runInAction(() => this.fireflyOptions.numVariations = Number(e.target.value))} + onChange={(e) => runInAction(() => { this.fireflyOptions.numVariations = Number(e.target.value) })} /> <span className="value" id="varVal">{this.fireflyOptions.numVariations}</span> </div> @@ -129,7 +126,7 @@ export class FireflyVariationsTab extends ObservableReactComponent<FireflyVariat min="1" max="100" value={this.fireflyOptions.temperature} - onChange={(e) => runInAction(() => this.fireflyOptions.temperature = Number(e.target.value))} + onChange={(e) => runInAction(() => { this.fireflyOptions.temperature = Number(e.target.value) })} /> <span className="value" id="tempVal">{this.fireflyOptions.temperature}</span> </div> diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateMenuFieldOptions.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateMenuFieldOptions.tsx index beda45ac3..a4da54392 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateMenuFieldOptions.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateMenuFieldOptions.tsx @@ -15,7 +15,7 @@ interface TemplateMenuFieldOptionsProps { @observer export class TemplateMenuFieldOptions extends ObservableReactComponent<TemplateMenuFieldOptionsProps> { - @observable _collapsedCols: String[] = []; //any columns whose options panels are hidden + @observable _collapsedCols: string[] = []; //any columns whose options panels are hidden constructor(props: TemplateMenuFieldOptionsProps) { super(props); @@ -43,7 +43,7 @@ export class TemplateMenuFieldOptions extends ObservableReactComponent<TemplateM conditionForm = (title: string, parameters?: Conditional, empty: boolean = false) => { const contentFieldTitles = this._props.menu.fieldsInfos.filter(field => field.type !== TemplateFieldType.DATA).map(field => field.title).concat('Template'); - var params: Conditional = this.getParams(title, parameters); + const params: Conditional = this.getParams(title, parameters); return ( <div className='form'> @@ -56,27 +56,27 @@ export class TemplateMenuFieldOptions extends ObservableReactComponent<TemplateM </div> <input className="form-row-textarea" - onChange={e => runInAction(() => params.condition = e.target.value)} + onChange={e => runInAction(() => { params.condition = e.target.value })} placeholder='value' value={params.condition} /> <div className='form-row-plain-text'>then</div> <div className="operator-options-dropdown"> <span className="operator-dropdown-current">{params.target ?? 'Own'}</span> - {contentFieldTitles.map(fieldTitle => - <div className='operator-dropdown-option' onPointerDown={() => {params.target = fieldTitle}}>{fieldTitle === title ? 'Own' : fieldTitle}</div> + {contentFieldTitles.map((fieldTitle, i) => + <div className='operator-dropdown-option' key={i} onPointerDown={() => {params.target = fieldTitle}}>{fieldTitle === title ? 'Own' : fieldTitle}</div> )} </div> <input className="form-row-textarea" - onChange={e => runInAction(() => params.attribute = e.target.value)} + onChange={e => runInAction(() => { params.attribute = e.target.value })} placeholder='attribute' value={params.attribute} /> <div className='form-row-plain-text'>{'becomes'}</div> <input className="form-row-textarea" - onChange={e => runInAction(() => params.value = e.target.value)} + onChange={e => runInAction(() => { params.value = e.target.value })} placeholder='value' value={params.value} /> diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx index de2f9e455..dc4c35789 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx @@ -1,7 +1,7 @@ import { Colors } from "@dash/components/src"; import { FontAwesomeIcon} from "@fortawesome/react-fontawesome"; import { Template } from "../Template"; -import { makeObservable, observable, reaction, runInAction } from "mobx"; +import { makeObservable, observable } from "mobx"; import React from "react"; import { ObservableReactComponent } from "../../../../ObservableReactComponent"; import { DocCreatorMenu } from "../DocCreatorMenu"; @@ -12,15 +12,12 @@ import { returnEmptyFilter, returnFalse } from "../../../../../../ClientUtils"; import { Transform } from "../../../../../util/Transform"; import { DefaultStyleProvider } from "../../../../StyleProvider"; import { Doc, returnEmptyDoclist } from "../../../../../../fields/Doc"; -import { IDisposer } from "mobx-utils"; -import { ImageField } from "../../../../../../fields/URLField"; -import { ImageCast } from "../../../../../../fields/Types"; import { observer } from "mobx-react"; export interface TemplatePreviewBoxProps { template: Template; - menu: DocCreatorMenu; - leftButtonOpts?: [icon: IconProp, func: (...args: any) => void] + menu: DocCreatorMenu; // eslint-disable-next-line + leftButtonOpts?: [icon: IconProp, func: (...args: any) => void] // eslint-disable-next-line rightButtonOpts?: [icon: IconProp, func: (...args: any) => void] } diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx index d53853c52..da4851f84 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx @@ -1,6 +1,4 @@ -import { Colors } from "@dash/components/src"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { action, makeObservable, observable, runInAction } from "mobx"; +import { makeObservable, runInAction } from "mobx"; import React from "react"; import ReactLoading from "react-loading"; import { Doc } from "../../../../../../fields/Doc"; @@ -18,10 +16,10 @@ export interface SuggestedTemplatesProps { loading?: boolean; templates: Template[]; title: string; - styles?: string; - optionsButtonOpts?: [IconProp, (...args: any) => any]; - previewBoxLeftButtonOpts?: [IconProp, (...args: any) => any]; - previewBoxRightButtonOpts?: [IconProp, (...args: any) => any]; + styles?: string; // eslint-disable-next-line + optionsButtonOpts?: [IconProp, (...args: any) => any]; // eslint-disable-next-line + previewBoxLeftButtonOpts?: [IconProp, (...args: any) => any]; // eslint-disable-next-line + previewBoxRightButtonOpts?: [IconProp, (...args: any) => any]; } @observer @@ -46,8 +44,9 @@ export class TemplatePreviewGrid extends ObservableReactComponent<SuggestedTempl (<div className="loading-spinner"> <ReactLoading type="spin" color={StrCast(Doc.UserDoc().userVariantColor)} height={30} width={30} /> </div>) - : this.props.templates.map(template => ( + : this.props.templates.map((template, i) => ( <TemplatePreviewBox + key={i} template={template} menu={this.props.menu} leftButtonOpts={["magnifying-glass", (template: Template) => { this.props.menu.setExpandedView(template); this.forceUpdate(); }]} diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateRenderPreviewWindow.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateRenderPreviewWindow.tsx index 219152549..f281f770e 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateRenderPreviewWindow.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateRenderPreviewWindow.tsx @@ -1,7 +1,7 @@ import { action, computed, makeObservable, observable, runInAction } from "mobx"; import { observer } from "mobx-react"; import { ObservableReactComponent } from "../../../../ObservableReactComponent"; -import { DataVizTemplateLayout, DocCreatorMenu, LayoutType } from "../DocCreatorMenu"; +import { DocCreatorMenu, LayoutType } from "../DocCreatorMenu"; import React from "react"; import { IconProp } from "@fortawesome/fontawesome-svg-core"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; @@ -15,7 +15,6 @@ import { DefaultStyleProvider } from "../../../../StyleProvider"; import { DocumentView } from "../../../DocumentView"; import { Transform } from "../../../../../util/Transform"; import { Docs, DocumentOptions } from "../../../../../documents/Documents"; -import { Template } from "../Template"; interface TemplatesRenderPreviewWindowProps { menu: DocCreatorMenu; diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts index fd87ae973..7591740e0 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Template.ts @@ -4,8 +4,6 @@ import { TemplateFieldType, TemplateLayouts } from './TemplateBackend'; import { DynamicField } from './TemplateFieldTypes/DynamicField'; import { FieldSettings, TemplateField, ViewType } from './TemplateFieldTypes/TemplateField'; import { Conditional } from './Backend/TemplateManager'; -import { ImageField } from '../../../../../fields/URLField'; -import { Doc } from '../../../../../fields/Doc'; import { TemplateDataField } from './TemplateFieldTypes/DataField'; export class Template { @@ -72,12 +70,6 @@ export class Template { setupMainField = (templateInfo: FieldSettings) => TemplateField.CreateField(templateInfo, 1, undefined) as DynamicField; - printFieldInfo = () => { - this.allFields.forEach(field => { - const doc = field.renderedDoc; - }); - }; - assignColToField = (fieldID: number, col: Col) => { const field = this.getFieldByID(fieldID); field.setContent(col.defaultContent ?? '', col.type === TemplateFieldType.VISUAL ? ViewType.IMG : ViewType.TEXT); @@ -102,7 +94,6 @@ 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') { this._mainField.renderedDoc![statement.attribute] = statement.value; diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DataField.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DataField.ts index aaa475bed..6b4086483 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DataField.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DataField.ts @@ -1,6 +1,5 @@ -import { Template } from "../Template"; -import { TemplateField, ViewType } from "./TemplateField"; +import { ViewType } from "./TemplateField"; export class TemplateDataField { diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DynamicField.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DynamicField.ts index 1576dd240..b9042258b 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DynamicField.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/DynamicField.ts @@ -1,6 +1,5 @@ -import { reaction } from 'mobx'; import { IDisposer } from 'mobx-utils'; -import { Doc, DocListCast } from '../../../../../../fields/Doc'; +import { Doc } from '../../../../../../fields/Doc'; import { DocData } from '../../../../../../fields/DocSymbols'; import { List } from '../../../../../../fields/List'; import { NumCast } from '../../../../../../fields/Types'; @@ -48,10 +47,7 @@ export class DynamicField extends TemplateField { addField = (field: TemplateField, layer: number = 0) => { if (!this._subfields.includes(field)) { - console.log('success') - console.log('subs: ', this._subfields) this._subfields.splice(layer, 0, field); - console.log('subffelds: ', this._subfields) } }; @@ -98,7 +94,6 @@ export class DynamicField extends TemplateField { const dynClone = super.makeClone(parent) as DynamicField; dynClone._subfields = this.getSubfields.map(field => { if (field === this.backgroundField) { - console.log('background found') const backgroundField: TemplateField = field.makeClone(dynClone, true); dynClone.makeBackgroundField(backgroundField); return backgroundField; @@ -113,7 +108,7 @@ export class DynamicField extends TemplateField { } initRenderDoc = (settings: FieldSettings) => { - this._disposers.fieldList = reaction(() => DocListCast(this._renderDoc?.[Doc.LayoutFieldKey(this._renderDoc)]), this.handleFieldUpdate); + //this._disposers.fieldList = reaction(() => DocListCast(this._renderDoc?.[Doc.LayoutFieldKey(this._renderDoc)]), this.handleFieldUpdate); this._subfields = settings.subfields?.map((fieldSettings, index) => {return TemplateField.CreateField(fieldSettings, index, this)}) || []; const renderedSubfields = this._subfields.filter(field => field.renderedDoc).map(field => field.renderedDoc!); settings.opts.title = settings.title; diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/StaticContentField.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/StaticContentField.ts index 2a8e4f09b..569c43af4 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/StaticContentField.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/StaticContentField.ts @@ -1,4 +1,3 @@ -import { FontSize } from '@dash/components'; import { FieldResult } from '../../../../../../fields/Doc'; import { DocData } from '../../../../../../fields/DocSymbols'; import { RichTextField } from '../../../../../../fields/RichTextField'; diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/TemplateField.ts b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/TemplateField.ts index a1107caf3..c100d1cce 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/TemplateField.ts +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateFieldTypes/TemplateField.ts @@ -1,7 +1,6 @@ /* eslint-disable no-use-before-define */ import { Doc } from '../../../../../../fields/Doc'; import { DocumentOptions } from '../../../../../documents/Documents'; -import { Conditional } from '../Backend/TemplateManager'; import { Col } from '../DocCreatorMenu'; import { Template } from '../Template'; import { TemplateFieldSize, TemplateFieldType } from '../TemplateBackend'; @@ -95,7 +94,7 @@ export abstract class TemplateField { exchangeFields(newField: TemplateField, oldField: TemplateField) { throw new Error('Only DynamicField can exchange fields.' + newField._title + ' ' + oldField._title); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars + changeFieldType = (newType: ViewType): TemplateField => { this._settings.viewType = newType; const newField = TemplateField.CreateField(this._settings, this._id, this._parent, true); |