summaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/client/src/app/common/shared/shared.module.ts7
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts20
-rw-r--r--cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html2
-rw-r--r--cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html4
4 files changed, 9 insertions, 24 deletions
diff --git a/cds-ui/client/src/app/common/shared/shared.module.ts b/cds-ui/client/src/app/common/shared/shared.module.ts
index 4ee7cca87..8db020d52 100644
--- a/cds-ui/client/src/app/common/shared/shared.module.ts
+++ b/cds-ui/client/src/app/common/shared/shared.module.ts
@@ -25,16 +25,19 @@ import { HomeComponent } from './components/home/home.component';
import { CBAWizardComponent } from './components/cbawizard/cbawizard.component';
import { MatToolbarModule,MatIconModule, MatButtonModule, MatSidenavModule, MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material';
import { RouterModule } from "@angular/router";
+import { SearchPipe } from './pipes/search.pipe';
@NgModule({
declarations: [
HomeComponent,
- CBAWizardComponent
+ CBAWizardComponent,
+ SearchPipe
],
exports: [
HomeComponent,
- CBAWizardComponent
+ CBAWizardComponent,
+ SearchPipe
],
imports: [
CommonModule,
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 8368592fd..3a25e92f0 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
@@ -31,8 +31,7 @@ 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';
+import { AppMaterialModule } from '../../../app/common/modules/app-material.module';
@NgModule({
declarations: [
@@ -42,22 +41,7 @@ import { MatIconModule } from '@angular/material/icon';
CommonModule,
BlueprintRoutingModule,
SharedModule,
- MatToolbarModule,
- MatButtonModule,
- MatSidenavModule,
- MatIconModule,
- MatListModule,
- MatGridListModule,
- MatCardModule,
- MatMenuModule,
- MatTableModule,
- MatPaginatorModule,
- MatSortModule,
- MatInputModule,
- MatSelectModule,
- MatRadioModule,
- MatFormFieldModule,
- MatStepperModule,
+ AppMaterialModule,
SelectTemplateModule,
ModifyTemplateModule,
DeployTemplateModule,
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
index 83c9ae2c0..c488dfdd7 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
@@ -33,7 +33,7 @@
</div>
</mat-step>
<mat-step [stepControl]="step2FormGroup">
- <ng-template matStepLabel>Browse Template file</ng-template>
+ <ng-template matStepLabel>Browse or Search Resources</ng-template>
<app-upload-resource (change)="fileChange(fileupload.files)"></app-upload-resource><br><br>
<app-existing-model></app-existing-model>
<div>
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
index 6de9648bc..279842b83 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
@@ -19,6 +19,4 @@
*/-->
-<p>
- upload-resource works!
-</p>
+<input type="file" accept=".zip">