Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import { DatasetFileSelectorComponent } from "./workspace/component/dataset-file
import { DatasetVersionSelectorComponent } from "./workspace/component/dataset-version-selector/dataset-version-selector.component";
import { DatasetSelectionModalComponent } from "./workspace/component/dataset-selection-modal/dataset-selection-modal.component";
import { ReActStepDetailModalComponent } from "./workspace/component/agent/agent-panel/react-step-detail-modal/react-step-detail-modal.component";
import { CollabWrapperComponent } from "./common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component";
import { NzSwitchModule } from "ng-zorro-antd/switch";
import { NzRadioModule } from "ng-zorro-antd/radio";
import { AboutComponent } from "./hub/component/about/about.component";
Expand Down Expand Up @@ -341,7 +340,6 @@ registerLocaleData(en);
DatasetVersionSelectorComponent,
DatasetSelectionModalComponent,
ReActStepDetailModalComponent,
CollabWrapperComponent,
AboutComponent,
UserWorkflowListItemComponent,
UserProjectListItemComponent,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions frontend/src/app/common/formly/formly-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { FormlyFieldConfig } from "@ngx-formly/core";
import { CodeareaCustomTemplateComponent } from "../../workspace/component/codearea-custom-template/codearea-custom-template.component";
import { PresetWrapperComponent } from "./preset-wrapper/preset-wrapper.component";
import { DatasetFileSelectorComponent } from "../../workspace/component/dataset-file-selector/dataset-file-selector.component";
import { CollabWrapperComponent } from "./collab-wrapper/collab-wrapper/collab-wrapper.component";
import { FormlyRepeatDndComponent } from "./repeat-dnd/repeat-dnd.component";
import { UiUdfParametersComponent } from "../../workspace/component/ui-udf-parameters/ui-udf-parameters.component";
import { DatasetVersionSelectorComponent } from "../../workspace/component/dataset-version-selector/dataset-version-selector.component";
Expand Down Expand Up @@ -89,10 +88,7 @@ export const TEXERA_FORMLY_CONFIG = {
{ name: "repeat-section-dnd", component: FormlyRepeatDndComponent },
{ name: "ui-udf-parameters", component: UiUdfParametersComponent, wrappers: ["form-field"] },
],
wrappers: [
{ name: "preset-wrapper", component: PresetWrapperComponent },
{ name: "collab-wrapper", component: CollabWrapperComponent },
],
wrappers: [{ name: "preset-wrapper", component: PresetWrapperComponent }],
};

export function minItemsValidationMessage(err: any, field: FormlyFieldConfig) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import { SimpleChange } from "@angular/core";
import { cloneDeep } from "lodash-es";

import Ajv from "ajv";
import { COLLAB_DEBOUNCE_TIME_MS } from "../../../../common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component";
import { FormlyNgZorroAntdModule } from "@ngx-formly/ng-zorro-antd";
import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service";
import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service";
Expand All @@ -61,6 +60,13 @@ import { DynamicSchemaService } from "../../../service/dynamic-schema/dynamic-sc
import { NotificationService } from "../../../../common/service/notification/notification.service";
import { WorkflowGraph } from "../../../service/workflow-graph/model/workflow-graph";

/**
* Drains the short timers scheduled while the fixture is being set up, before the form change
* under test. Unrelated to FORM_DEBOUNCE_TIME_MS, which is what the assertions below actually wait
* on; this previously borrowed COLLAB_DEBOUNCE_TIME_MS (also 10ms) from an unrelated component.
*/
const SETUP_FLUSH_MS = 10;

const { marbles } = configure({ run: false });

describe("Aggregate attribute requirement", () => {
Expand Down Expand Up @@ -182,7 +188,7 @@ describe("OperatorPropertyEditFrameComponent", () => {
currentOperatorId: new SimpleChange(undefined, mockScanPredicate.operatorID, true),
});
fixture.detectChanges();
tick(COLLAB_DEBOUNCE_TIME_MS);
tick(SETUP_FLUSH_MS);

// stimulate a form change by the user
const formChangeValue = { tableName: "twitter_sample" };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1089,21 +1089,6 @@ export class OperatorPropertyEditFrameComponent implements OnInit, OnChanges, On
);
}

// TODO: we temporarily disable this due to Yjs update causing issues in Formly.

// if (
// this.currentOperatorId !== undefined &&
// ["string", "textarea"].includes(mappedField.type as string) &&
// (mappedField.key as string) !== "password"
// ) {
// CollabWrapperComponent.setupFieldConfig(
// mappedField,
// this.workflowActionService.getTexeraGraph().getOperator(this.currentOperatorId).operatorType,
// this.currentOperatorId,
// mappedField.wrappers?.includes("preset-wrapper")
// );
// }

if (this.currentOperatorSchema?.operatorType === "Projection" && mappedField.key === "attributes") {
mappedField.type = "repeat-section-dnd";
mappedField.props = {
Expand Down
Loading