Skip to content
This repository has been archived by the owner on Nov 22, 2019. It is now read-only.

Commit

Permalink
Moves dataservice name entry to last page of wizard
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdrillin
mdrillin committed Dec 8, 2017
1 parent 6551bee commit 26e43f5
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 104 deletions.
67 changes: 26 additions & 41 deletions ngapp/src/app/dataservices/add-dataservice-wizard/add-dataservice-wizard.component.html
View file
Expand Up @@ -3,59 +3,44 @@
(onCancel)="cancelClicked($event)"
(onNext)="nextClicked($event)"
(onStepChange)="stepChanged($event)">
<!-- ----------------------------- -->
<!-- Step 1 : Name and Description -->
<!-- ----------------------------- -->
<pfng-wizard-step [config]="step1Config">
<h3><i>{{ step1InstructionMessage }}</i></h3>
<form [formGroup]=basicPropertyForm class="form-horizontal">
<div [ngClass]="nameValid ? 'form-group' : 'form-group has-error'">
<label class="col-sm-2 control-label">Name</label>
<div class="col-sm-5">
<input class="form-control" formControlName="name" title="">
<div class="help-block" *ngIf="!nameValid">{{ getBasicPropertyErrorMessage("name") }}</div>
</div>
</div>
<div [ngClass]="'form-group'">
<label class="col-sm-2 control-label">Description</label>
<div class="col-sm-5">
<input class="form-control" formControlName="description" title="">
</div>
</div>
</form>
</pfng-wizard-step>
<!-- ------------------------- -->
<!-- Step 2 : Table Selection -->
<!-- Step 1 : Table Selection -->
<!-- ------------------------- -->
<pfng-wizard-step [config]="step2Config">
<h3><i>{{ step2InstructionMessage }}</i></h3>
<app-connection-table-selector (tableSelectionChanged)="updatePage2ValidStatus()"></app-connection-table-selector>
<pfng-wizard-step [config]="step1Config">
<h3><i>{{ step1InstructionMessage }}</i></h3>
<br>
<app-connection-table-selector (tableSelectionChanged)="updatePage1ValidStatus()"></app-connection-table-selector>
</pfng-wizard-step>
<!-- -------------------------- -->
<!-- Step 3 : Review and Create -->
<!-- Step 2 : Review and Create -->
<!-- -------------------------- -->
<pfng-wizard-step [config]="step3Config">
<!-- Step 3A: Review -->
<pfng-wizard-substep [config]="step3aConfig">
<h3><i>{{ step3InstructionMessage }}</i></h3>
<h4>Dataservice Properties:</h4>
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">Name:</label>
<label class="col-sm-10">{{ dataserviceName }}</label>
<pfng-wizard-step [config]="step2Config">
<!-- Step 2A: Review -->
<pfng-wizard-substep [config]="step2aConfig">
<h3><i>{{ step2InstructionMessage }}</i></h3>
<br>
<form [formGroup]=basicPropertyForm class="form-horizontal">
<div [ngClass]="nameValid ? 'form-group' : 'form-group has-error'">
<label class="col-sm-2 control-label">Name</label>
<div class="col-sm-5">
<input class="form-control" formControlName="name" title="">
<div class="help-block" *ngIf="!nameValid">{{ getBasicPropertyErrorMessage("name") }}</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Description:</label>
<label class="col-sm-10">{{ dataserviceDescription }}</label>
<div [ngClass]="'form-group'">
<label class="col-sm-2 control-label">Description</label>
<div class="col-sm-5">
<input class="form-control" formControlName="description" title="">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Source Tables:</label>
<label class="col-sm-2 control-label">Selected Tables:</label>
<label class="col-sm-5">{{ dataserviceSourceTables }}</label>
</div>
</form>
</pfng-wizard-substep>
<!-- Step 3B: Create -->
<pfng-wizard-substep [config]="step3bConfig" (onShow)="createDataservice()">
<!-- Step 2B: Create -->
<pfng-wizard-substep [config]="step2bConfig" (onShow)="createDataservice()">
<div class="wizard-pf-contents">
<!-- In progress -->
<div class="wizard-pf-process blank-slate-pf" *ngIf="!createComplete">
Expand Down
96 changes: 36 additions & 60 deletions ngapp/src/app/dataservices/add-dataservice-wizard/add-dataservice-wizard.component.ts
View file
Expand Up @@ -65,11 +65,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {

// Wizard Step 2
public step2Config: WizardStepConfig;

// Wizard Step 3
public step3Config: WizardStepConfig;
public step3aConfig: WizardStepConfig;
public step3bConfig: WizardStepConfig;
public step2aConfig: WizardStepConfig;
public step2bConfig: WizardStepConfig;

@ViewChild("wizard") public wizard: WizardComponent;
@ViewChild(ConnectionTableSelectorComponent) public tableSelector: ConnectionTableSelectorComponent;
Expand Down Expand Up @@ -103,37 +100,29 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
this.onSourceVdbDeploymentStateChanged(status);
});

// Step 1 - Name and Description
// Step 1 - Select Tables
this.step1Config = {
id: "step1",
priority: 0,
title: "Name and Description",
title: "Select Tables",
allowClickNav: false
} as WizardStepConfig;

// Step 2 - Tables
// Step 2 - Review and Create
this.step2Config = {
id: "step2",
priority: 0,
title: "Table Selection",
allowClickNav: false
} as WizardStepConfig;

// Step 3 - Review and Create
this.step3Config = {
id: "step3",
priority: 0,
title: "Review and Create",
allowClickNav: false
} as WizardStepConfig;
this.step3aConfig = {
id: "step3a",
this.step2aConfig = {
id: "step2a",
priority: 0,
title: "Review",
allowClickNav: false
} as WizardStepConfig;
this.step3bConfig = {
id: "step3b",
this.step2bConfig = {
id: "step2b",
priority: 1,
title: "Create",
allowClickNav: false
Expand Down Expand Up @@ -193,17 +182,6 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
* Step 1 instruction message
*/
public get step1InstructionMessage(): string {
if (!this.nameValid) {
return "Please enter a name for the Dataservice";
} else {
return "Click Next to continue";
}
}

/*
* Step 2 instruction message
*/
public get step2InstructionMessage(): string {
if (!this.tableSelector.valid) {
return "Please select tables for the Dataservice";
} else {
Expand All @@ -214,8 +192,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
/*
* Step 3 instruction message
*/
public get step3InstructionMessage(): string {
return "Review your entries. When finished, click Create to create the Dataservice";
public get step2InstructionMessage(): string {
return "Review selections and enter a name. Click Create to create the Dataservice";
}

/*
Expand Down Expand Up @@ -256,8 +234,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {

const sourceVdbName = this.tableSelector.getSelectedTables()[0].getConnection().getId() + VdbsConstants.SOURCE_VDB_SUFFIX;

this.step3bConfig.nextEnabled = false;
this.step3bConfig.previousEnabled = false;
this.step2bConfig.nextEnabled = false;
this.step2bConfig.previousEnabled = false;
this.sourceVdbUnderDeployment = sourceVdbName;

const self = this;
Expand All @@ -271,8 +249,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
} else {
self.createComplete = true;
self.createSuccessful = false;
self.step3bConfig.nextEnabled = false;
self.step3bConfig.previousEnabled = true;
self.step2bConfig.nextEnabled = false;
self.step2bConfig.previousEnabled = true;
self.sourceVdbUnderDeployment = null;
}
},
Expand All @@ -281,8 +259,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
self.setErrorDetails(error);
self.createComplete = true;
self.createSuccessful = false;
self.step3bConfig.nextEnabled = false;
self.step3bConfig.previousEnabled = true;
self.step2bConfig.nextEnabled = false;
self.step2bConfig.previousEnabled = true;
self.sourceVdbUnderDeployment = null;
}
);
Expand Down Expand Up @@ -332,8 +310,8 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
} else if (status.isFailed()) {
this.createComplete = true;
this.createSuccessful = false;
this.step3bConfig.nextEnabled = false;
this.step3bConfig.previousEnabled = true;
this.step2bConfig.nextEnabled = false;
this.step2bConfig.previousEnabled = true;
}
}
}
Expand All @@ -343,14 +321,12 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
if ($event.step.config.id === "step1") {
this.updatePage1ValidStatus();
this.wizardConfig.nextTitle = "Next >";
} else if ($event.step.config.id === "step2") {
this.updatePage2ValidStatus();
this.wizardConfig.nextTitle = "Next >";
} else if ($event.step.config.id === "step3a") {
} else if ($event.step.config.id === "step2a") {
this.updatePage2aValidStatus();
this.wizardConfig.nextTitle = "Create";
} else if ($event.step.config.id === "step3b") {
} else if ($event.step.config.id === "step2b") {
// Note: The next button is not disabled by default when wizard is done
this.step3Config.nextEnabled = false;
this.step2Config.nextEnabled = false;
} else {
this.wizardConfig.nextTitle = "Next >";
}
Expand Down Expand Up @@ -385,9 +361,9 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
return tableStr;
}

public updatePage2ValidStatus( ): void {
this.step2Config.nextEnabled = this.tableSelector.valid();
this.setNavAway(this.step2Config.nextEnabled);
public updatePage1ValidStatus( ): void {
this.step1Config.nextEnabled = this.tableSelector.valid();
this.setNavAway(this.step1Config.nextEnabled);
}

/**
Expand All @@ -411,17 +387,17 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
});
// Responds to basic property changes - updates the page status
this.basicPropertyForm.valueChanges.subscribe((val) => {
this.updatePage1ValidStatus( );
this.updatePage2aValidStatus( );
});
}

private setNavAway(allow: boolean): void {
this.step1Config.allowNavAway = allow;
}

private updatePage1ValidStatus( ): void {
this.step1Config.nextEnabled = this.basicPropertyForm.valid;
this.setNavAway(this.step1Config.nextEnabled);
private updatePage2aValidStatus( ): void {
this.step2aConfig.nextEnabled = this.basicPropertyForm.valid;
this.setNavAway(this.step2aConfig.nextEnabled);
}

/*
Expand All @@ -444,22 +420,22 @@ export class AddDataserviceWizardComponent implements OnInit, OnDestroy {
if (wasSuccess) {
self.createComplete = true;
self.createSuccessful = true;
self.step3bConfig.nextEnabled = false;
this.step3bConfig.previousEnabled = true;
self.step2bConfig.nextEnabled = false;
this.step2bConfig.previousEnabled = true;
} else {
self.createComplete = true;
self.createSuccessful = false;
self.step3bConfig.nextEnabled = false;
this.step3bConfig.previousEnabled = true;
self.step2bConfig.nextEnabled = false;
this.step2bConfig.previousEnabled = true;
}
},
(error) => {
self.logger.error("[AddDataserviceWizardComponent] Error: %o", error);
self.setErrorDetails(error);
self.createComplete = true;
self.createSuccessful = false;
self.step3bConfig.nextEnabled = false;
this.step3bConfig.previousEnabled = true;
self.step2bConfig.nextEnabled = false;
this.step2bConfig.previousEnabled = true;
}
);
}
Expand Down
6 changes: 3 additions & 3 deletions ngapp/src/app/dataservices/shared/vdb.service.ts
View file
Expand Up @@ -316,10 +316,10 @@ export class VdbService extends ApiService {
// Filter values for the model
let catName = table.getCatalogName();
let schemaName = table.getSchemaName();
let tableName = table.getName();
// let tableName = table.getName();
catName = (!catName || catName.length < 1) ? "%" : catName;
schemaName = (!schemaName || schemaName.length < 1) ? "%" : schemaName;
tableName = (!tableName || tableName.length < 1) ? "%" : tableName;
// tableName = (!tableName || tableName.length < 1) ? "%" : tableName;
// Set the importer properties for the physical model
const props: NameValue[] = [];
props.push(new NameValue("importer.TableTypes", "TABLE"));
Expand All @@ -328,7 +328,7 @@ export class VdbService extends ApiService {
props.push(new NameValue("importer.UseCatalogName", "false"));
props.push(new NameValue("importer.catalog", catName));
props.push(new NameValue("importer.schemaPattern", schemaName));
props.push(new NameValue("importer.tableNamePattern", tableName));
props.push(new NameValue("importer.tableNamePattern", "%")); // TODO improve tablePattern when possible
vdbModel.setProperties(props);

// VdbModelSource to create
Expand Down

0 comments on commit 26e43f5

Please sign in to comment.