diff options
17 files changed, 220 insertions, 12 deletions
diff --git a/cds-ui/client/src/app/common/core/store/models/blueprint.model.ts b/cds-ui/client/src/app/common/core/store/models/blueprint.model.ts index a061a4364..f4989fb73 100644 --- a/cds-ui/client/src/app/common/core/store/models/blueprint.model.ts +++ b/cds-ui/client/src/app/common/core/store/models/blueprint.model.ts @@ -21,10 +21,10 @@ limitations under the License. import { IMetaData } from './metadata.model'; import { IImportModel } from './imports.model'; - +import { ITopologyTemplate } from './itopologytemplate.model'; export interface IBlueprint { metadata: IMetaData; fileImports: Array<IImportModel> - toplogyTemplates: string; + toplogyTemplates: ITopologyTemplate; }
\ No newline at end of file diff --git a/cds-ui/client/src/app/common/core/store/models/itopologytemplate.model.ts b/cds-ui/client/src/app/common/core/store/models/itopologytemplate.model.ts new file mode 100644 index 000000000..cadf4f9e3 --- /dev/null +++ b/cds-ui/client/src/app/common/core/store/models/itopologytemplate.model.ts @@ -0,0 +1,26 @@ +/* +============LICENSE_START========================================== +=================================================================== +Copyright (C) 2018 IBM Intellectual Property. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END============================================ +*/ + +export interface ITopologyTemplate { + inputs: object; + node_template: object; + workflow: object; +}
\ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts index e10dd409f..8368592fd 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts @@ -26,6 +26,13 @@ import { BlueprintComponent } from './blueprint.component'; import { BlueprintRoutingModule } from './blueprint-routing.module'; import { SharedModule } from '../../../app/common/shared/shared.module'; +import { SelectTemplateModule } from './select-template/select-template.module'; +import { ModifyTemplateModule } from './modify-template/modify-template.module'; +import { DeployTemplateModule } from './deploy-template/deploy-template.module'; +import { TestTemplateModule } from './test-template/test-template.module'; + +import { MatToolbarModule, MatButtonModule, MatSidenavModule, MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material'; +import { MatIconModule } from '@angular/material/icon'; @NgModule({ declarations: [ @@ -34,7 +41,27 @@ import { SharedModule } from '../../../app/common/shared/shared.module'; imports: [ CommonModule, BlueprintRoutingModule, - SharedModule + SharedModule, + MatToolbarModule, + MatButtonModule, + MatSidenavModule, + MatIconModule, + MatListModule, + MatGridListModule, + MatCardModule, + MatMenuModule, + MatTableModule, + MatPaginatorModule, + MatSortModule, + MatInputModule, + MatSelectModule, + MatRadioModule, + MatFormFieldModule, + MatStepperModule, + SelectTemplateModule, + ModifyTemplateModule, + DeployTemplateModule, + TestTemplateModule ] }) export class BlueprintModule { } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts index 86538ec1c..7458601fc 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.module.ts @@ -26,6 +26,9 @@ import { MetadataComponent } from './metadata/metadata.component'; import { SelectTemplateComponent } from './select-template.component'; import { SelectTemplateRoutingModule } from './select-template-routing.module'; +import { MatToolbarModule, MatButtonModule, MatSidenavModule, MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material'; +import { MatIconModule } from '@angular/material/icon'; + @NgModule({ declarations: [ TemplateOptionsComponent, @@ -33,9 +36,31 @@ import { SelectTemplateRoutingModule } from './select-template-routing.module'; MetadataComponent, SelectTemplateComponent ], + exports: [ + TemplateOptionsComponent, + SearchTemplateComponent, + MetadataComponent, + SelectTemplateComponent + ], imports: [ CommonModule, - SelectTemplateRoutingModule + SelectTemplateRoutingModule, + MatToolbarModule, + MatButtonModule, + MatSidenavModule, + MatIconModule, + MatListModule, + MatGridListModule, + MatCardModule, + MatMenuModule, + MatTableModule, + MatPaginatorModule, + MatSortModule, + MatInputModule, + MatSelectModule, + MatRadioModule, + MatFormFieldModule, + MatStepperModule, ] }) export class SelectTemplateModule { } diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts index 2ece3cef7..e4fcf1378 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts @@ -28,7 +28,16 @@ import { MatToolbarModule,MatIconModule, MatButtonModule, MatSidenavModule, Mat import { UploadResourceComponent } from './upload-resource/upload-resource.component'; @NgModule({ - declarations: [ResourceCreationComponent], + declarations: [ + ResourceCreationComponent, + ResourceTemplateOptionsComponent, + UploadResourceComponent + ], + exports: [ + ResourceCreationComponent, + ResourceTemplateOptionsComponent, + UploadResourceComponent + ], imports: [ CommonModule, ResourceCreationRoutingModule, diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts index aa19c936d..986c28844 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts @@ -22,7 +22,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ResourceDefinitionComponent } from './resource-definition.component'; - const routes: Routes = [ { path: '', diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html index df6cc7363..6d3186c98 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html @@ -18,6 +18,32 @@ * ============LICENSE_END========================================================= */--> -<app-cbawizard [appName]="appName"></app-cbawizard> -<router-outlet></router-outlet> - +<!-- <app-cbawizard [appName]="appName"></app-cbawizard> +<router-outlet></router-outlet> --> +<mat-card class="CBAform"> + <mat-card-content> + <mat-horizontal-stepper [linear]="isLinear" #stepper> + <mat-step [stepControl]="firstFormGroup"> + <ng-template matStepLabel>Resource creation Method</ng-template> + <app-resource-creation></app-resource-creation> + <div> + <button mat-button matStepperNext style="color:white;background:gray">Proceed</button> + </div> + </mat-step> + <mat-step [stepControl]="secondFormGroup"> + <ng-template matStepLabel>Resource Edit/Validate </ng-template> + <app-resource-edit></app-resource-edit> + <!-- <div> + <button mat-button matStepperNext style="color:white;background:gray">Proceed</button> + </div> --> + </mat-step> + <mat-step [stepControl]="thirdFormGroup"> + <ng-template matStepLabel>Save in Database</ng-template> + <app-save-resource></app-save-resource> + <div> + <button mat-button matStepperNext style="color:white;background:gray">Save</button> + </div> + </mat-step> + </mat-horizontal-stepper> + </mat-card-content> +</mat-card>
\ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts index 45b062f82..c618e2748 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts @@ -24,6 +24,12 @@ import { CommonModule } from '@angular/common'; import { ResourceDefinitionRoutingModule } from './resource-definition-routing.module'; import { ResourceDefinitionComponent } from './resource-definition.component'; import { SharedModule } from '../../../app/common/shared/shared.module'; +import { SaveResourceModule } from './save-resource/save-resource.module'; +import { ResourceCreationModule } from './resource-creation/resource-creation.module'; +import { ResourceEditModule } from './resource-edit/resource-edit.module'; + +import { MatToolbarModule, MatButtonModule, MatSidenavModule, MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material'; +import { MatIconModule } from '@angular/material/icon'; @NgModule({ @@ -32,7 +38,26 @@ import { SharedModule } from '../../../app/common/shared/shared.module'; imports: [ CommonModule, ResourceDefinitionRoutingModule, - SharedModule + SharedModule, + SaveResourceModule, + ResourceCreationModule, + ResourceEditModule, + MatToolbarModule, + MatButtonModule, + MatSidenavModule, + MatIconModule, + MatListModule, + MatGridListModule, + MatCardModule, + MatMenuModule, + MatTableModule, + MatPaginatorModule, + MatSortModule, + MatInputModule, + MatSelectModule, + MatRadioModule, + MatFormFieldModule, + MatStepperModule, ] }) export class ResourceDefinitionModule { } diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts index 6e64fb9fc..3efab6724 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts @@ -25,7 +25,8 @@ import { ResourceEditComponent } from './resource-edit.component'; import { ResourceEditRoutingModule } from './resource-edit-routing.module'; @NgModule({ - declarations: [ResourceEditComponent], + declarations: [ ResourceEditComponent ], + exports: [ ResourceEditComponent ], imports: [ CommonModule, ResourceEditRoutingModule diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts index cd343755b..d87cfe31b 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts @@ -26,6 +26,7 @@ import { SaveResourceRoutingModule } from './save-resource-routing.module'; @NgModule({ declarations: [SaveResourceComponent], + exports: [ SaveResourceComponent ], imports: [ CommonModule, SaveResourceRoutingModule diff --git a/docs/index.rst b/docs/index.rst index f6b249144..60bdaa6cc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -5,4 +5,25 @@ CONTROLLER DESIGN STUDIO DOCUMENTATION REPOSITORY ------------------------------------------------- .. toctree:: - :maxdepth: 1
\ No newline at end of file + :maxdepth: 1 + +Introduction: +------------- +The system is designed to be self service, which means that users, not just programmers, can reconfigure the software system as needed to meet customer requirements. To accomplish this goal, the system is built around models that provide for real-time changes in how the system operates. Users merely need to change a model to change how a service operates. + +Self service is a completely new way of delivering services. It removes the dependence on code releases and the delays they cause and puts the control of services into the hands of the service providers. They can change a model and its parameters and create a new service without writing a single line of code. +This makes SERVICE PROVIDER(S) more responsive to its customers and able to deliver products that more closely match the needs of its customers. + +Sections +++++++++ + +.. toctree:: + :maxdepth: 1 + :glob: + + sections/architecture/index + sections/installation/index + sections/configuration/index + sections/development/index + sections/logging + sections/release-notes
\ No newline at end of file diff --git a/docs/logging.rst b/docs/logging.rst new file mode 100644 index 000000000..b82b061d6 --- /dev/null +++ b/docs/logging.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Logging +------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file diff --git a/docs/release-notes.rst b/docs/release-notes.rst new file mode 100644 index 000000000..a53419f67 --- /dev/null +++ b/docs/release-notes.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Release-Notes +------------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file diff --git a/docs/sections/architecture/index.rst b/docs/sections/architecture/index.rst new file mode 100644 index 000000000..9c8b9d42b --- /dev/null +++ b/docs/sections/architecture/index.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Architecture +------------------------------------------------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file diff --git a/docs/sections/configuration/index.rst b/docs/sections/configuration/index.rst new file mode 100644 index 000000000..d3ce2c068 --- /dev/null +++ b/docs/sections/configuration/index.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Configuration +-------------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file diff --git a/docs/sections/development/index.rst b/docs/sections/development/index.rst new file mode 100644 index 000000000..cd7e4af9e --- /dev/null +++ b/docs/sections/development/index.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Development +------------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file diff --git a/docs/sections/installation/index.rst b/docs/sections/installation/index.rst new file mode 100644 index 000000000..8cd89a2f7 --- /dev/null +++ b/docs/sections/installation/index.rst @@ -0,0 +1,8 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. Copyright (C) 2019 IBM. + +Installation +------------- +.. toctree:: + :maxdepth: 1
\ No newline at end of file |