This is an automated email from the ASF dual-hosted git repository.
linxinyuan pushed a commit to branch xinyuan-source-port
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/xinyuan-source-port by this
push:
new 160b42264e update
160b42264e is described below
commit 160b42264ec9a1d623769cf2180872616cfe50f9
Author: Xinyuan Lin <[email protected]>
AuthorDate: Fri Apr 10 14:19:25 2026 -0700
update
---
.../dataset/DatasetSelectorSourceOpDesc.scala | 2 +-
.../dataset-version-selector.component.html | 63 +++++++++-------------
.../dataset-version-selector.component.scss | 9 ----
.../dataset-version-selector.component.ts | 14 +----
4 files changed, 28 insertions(+), 60 deletions(-)
diff --git
a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/dataset/DatasetSelectorSourceOpDesc.scala
b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/dataset/DatasetSelectorSourceOpDesc.scala
index e99be7aa0d..c0aa8a1d04 100644
---
a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/dataset/DatasetSelectorSourceOpDesc.scala
+++
b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/dataset/DatasetSelectorSourceOpDesc.scala
@@ -32,7 +32,7 @@ import org.apache.texera.amber.util.JSONUtils.objectMapper
class DatasetSelectorSourceOpDesc extends LogicalOp {
@JsonProperty(required = true)
- @JsonSchemaTitle("Dataset Version")
+ @JsonSchemaTitle("Dataset")
var datasetVersionPath: String = _
override def getPhysicalOp(
diff --git
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.html
b/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.html
index ae4152d230..1a2ff4889b 100644
---
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.html
+++
b/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.html
@@ -17,42 +17,29 @@
under the License.
-->
-<div class="dataset-version-selector">
- <nz-select
- nzShowSearch
- nzAllowClear
- nzPlaceHolder="Select dataset"
- [ngModel]="selectedDataset"
- (ngModelChange)="selectedDataset = $event; onDatasetChange()"
- [nzLoading]="isLoadingDatasets"
- class="selector">
- <nz-option
- *ngFor="let dataset of datasets"
- [nzValue]="dataset"
- [nzLabel]="dataset.dataset.name">
- </nz-option>
- </nz-select>
+<nz-select
+ nzShowSearch
+ nzAllowClear
+ nzPlaceHolder="dataset"
+ [ngModel]="selectedDataset"
+ (ngModelChange)="selectedDataset = $event; onDatasetChange()">
+ <nz-option
+ *ngFor="let dataset of datasets"
+ [nzValue]="dataset"
+ [nzLabel]="dataset.dataset.name">
+ </nz-option>
+</nz-select>
- <nz-select
- nzShowSearch
- nzAllowClear
- nzPlaceHolder="Select version"
- [ngModel]="selectedVersion"
- (ngModelChange)="selectedVersion = $event; onVersionChange()"
- [nzLoading]="isLoadingVersions"
- [disabled]="!selectedDataset"
- class="selector">
- <nz-option
- *ngFor="let version of datasetVersions"
- [nzValue]="version"
- [nzLabel]="version.name">
- </nz-option>
- </nz-select>
-</div>
-
-<div
- class="alert alert-danger"
- role="alert"
- *ngIf="props.showError && formControl.errors">
- <formly-validation-message [field]="field"></formly-validation-message>
-</div>
+<nz-select
+ nzShowSearch
+ nzAllowClear
+ nzPlaceHolder="version"
+ [ngModel]="selectedVersion"
+ (ngModelChange)="selectedVersion = $event; onVersionChange()"
+ [disabled]="!selectedDataset">
+ <nz-option
+ *ngFor="let version of datasetVersions"
+ [nzValue]="version"
+ [nzLabel]="version.name">
+ </nz-option>
+</nz-select>
diff --git
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.scss
b/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.scss
deleted file mode 100644
index 67d32ed69a..0000000000
---
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.dataset-version-selector {
- display: flex;
- flex-direction: column;
- gap: 8px;
-}
-
-.selector {
- width: 100%;
-}
diff --git
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.ts
b/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.ts
index 154d06b4cb..6fa7b97f09 100644
---
a/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.ts
+++
b/frontend/src/app/workspace/component/dataset-version-selector/dataset-version-selector.component.ts
@@ -28,38 +28,30 @@ import { DatasetService } from
"../../../dashboard/service/user/dataset/dataset.
@Component({
selector: "texera-dataset-version-selector-template",
templateUrl: "./dataset-version-selector.component.html",
- styleUrls: ["./dataset-version-selector.component.scss"],
})
export class DatasetVersionSelectorComponent extends
FieldType<FieldTypeConfig> implements OnInit {
datasets: ReadonlyArray<DashboardDataset> = [];
datasetVersions: ReadonlyArray<DatasetVersion> = [];
selectedDataset?: DashboardDataset;
selectedVersion?: DatasetVersion;
- isLoadingDatasets = false;
- isLoadingVersions = false;
constructor(private datasetService: DatasetService) {
super();
}
ngOnInit(): void {
- this.loadDatasets();
- }
-
- private loadDatasets(): void {
- this.isLoadingDatasets = true;
this.datasetService
.retrieveAccessibleDatasets()
.pipe(untilDestroyed(this))
.subscribe(datasets => {
this.datasets = datasets;
- this.isLoadingDatasets = false;
this.restoreSelectionFromValue();
});
}
private restoreSelectionFromValue(): void {
const parsed = this.parseDatasetVersionPath(this.formControl.value);
+
if (!parsed) {
return;
}
@@ -68,7 +60,7 @@ export class DatasetVersionSelectorComponent extends
FieldType<FieldTypeConfig>
dataset =>
dataset.ownerEmail === parsed.ownerEmail && dataset.dataset.name ===
parsed.datasetName
);
-
+ console.log("parsed", this.selectedDataset);
if (this.selectedDataset?.dataset.did !== undefined) {
this.loadVersions(this.selectedDataset.dataset.did, parsed.versionName);
}
@@ -96,13 +88,11 @@ export class DatasetVersionSelectorComponent extends
FieldType<FieldTypeConfig>
}
private loadVersions(did: number, versionNameToSelect?: string): void {
- this.isLoadingVersions = true;
this.datasetService
.retrieveDatasetVersionList(did)
.pipe(untilDestroyed(this))
.subscribe(versions => {
this.datasetVersions = versions;
- this.isLoadingVersions = false;
if (versionNameToSelect) {
this.selectedVersion = versions.find(version => version.name ===
versionNameToSelect);
} else if (versions.length > 0) {
