diff options
Diffstat (limited to 'cds-ui')
3 files changed, 8 insertions, 7 deletions
diff --git a/cds-ui/client/angular.json b/cds-ui/client/angular.json index 96b4df009..c5800f050 100644 --- a/cds-ui/client/angular.json +++ b/cds-ui/client/angular.json @@ -30,7 +30,8 @@ "src/styles.scss", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "./node_modules/material-design-icons/iconfont/material-icons.css", - "./node_modules/font-awesome/css/font-awesome.css" + "./node_modules/font-awesome/css/font-awesome.css", + "./node_modules/bootstrap/dist/css/bootstrap.min.css" ], "scripts": [ "./node_modules/ace-builds/src-min/ace.js", diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html index ea4c298e8..5a3973a5e 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html @@ -17,7 +17,6 @@ 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============================================ --> - <div class="containerDiv"> <div class="fileViewContainer"> <!-- <div style="width:inherit; height: inherit; position: fixed;z-index: 1; background-color: rgb(0,0,0);background-color: rgba(0,0,0,0.4);"></div> --> @@ -46,7 +45,7 @@ limitations under the License. </mat-tree-node> </mat-tree> </div> - <div class="editorConatiner"> + <div class="editorConatiner" [ngClass] = "{ 'apply-scrol-to-editor-container' : viewTemplateMode}"> <!-- <i class="fa fa-save save-icon" style="font-size:24px" (click)="updateBlueprint()"></i> <ace-editor [(text)]="text" [(mode)]="mode" #editor class="aceEditor"></ace-editor> --> <div class="normal-editor-mode" [ngClass]="{ 'resource-mapping-mode': viewTemplateMode}"> diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts index c630ce060..c1f7f9640 100644 --- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts +++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts @@ -135,14 +135,15 @@ export class BlueprintRestController { }); } - @get('/download-blueprint/{id}') + @get('/download-blueprint/{name}/{version}') async download( - @param.path.string('id') id: string, - @inject(RestBindings.Http.REQUEST) request: Request, + @param.path.string('name') name: string, + @param.path.string('version') version:string, + // @inject(RestBindings.Http.REQUEST) request: Request, @inject(RestBindings.Http.RESPONSE) response: Response, ): Promise<any> { return new Promise((resolve, reject) => { - this.downloadFileFromBlueprintController("/blueprint-model/download/" + id).then(resp=>{ + this.downloadFileFromBlueprintController("/blueprint-model/download/by-name/"+name+"/version/"+version).then(resp=>{ response.setHeader("X-ONAP-RequestID", resp.headers['x-onap-requestid']); response.setHeader("Content-Disposition", resp.headers['content-disposition']); resolve(resp.body); |