diff options
Diffstat (limited to 'cds-ui/designer-client/src')
23 files changed, 256 insertions, 259 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html index 305ffa6f3..3efc68838 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html @@ -18,6 +18,8 @@ <a class="nav-link mr-2" href="https://wiki.onap.org/display/DW/CDS+Designer+Guide" target="_blank" [delay]="300" tooltip="Help" placement="bottom"><i class="icon-info" aria-hidden="true"></i></a> </li> --> + <!--Version--> + <div class="nav-item copyright">v1.0.0</div> <!--Help Menu--> <div class="nav-item dropdown helpMenu"> <input class="dropdown-toggle" type="text"> @@ -26,7 +28,7 @@ <li> <i class="icon-get_started" aria-hidden="true"></i> <p> - <input id="clicker3" type="checkbox"/> + <input id="clicker3" type="checkbox" /> <label for="clicker"> Getting Started <span>Quick steps to help you get started</span> @@ -73,16 +75,13 @@ </li> </ul> </div> - </ul> </nav> </div> </div> </header> - - <div class="container-fluid body-container"> - <ngx-ui-loader></ngx-ui-loader> + <ngx-ui-loader></ngx-ui-loader> <div class="container"> <div class="creat-action-container"> @@ -91,7 +90,7 @@ <span>Save</span> </button> <button data-target="#discardChangesModal" data-toggle="modal" class="action-button" - [disabled]="!isSaveEnabled"> + [disabled]="!isSaveEnabled"> <i class="icon-discard-sm" aria-hidden="true"></i> <span>Discard Changes</span> </button> @@ -108,7 +107,7 @@ </a> <a class="action-button" - (click)="downloadPackage(viewedPackage.artifactName,viewedPackage.artifactVersion)"> + (click)="downloadPackage(viewedPackage.artifactName,viewedPackage.artifactVersion)"> <i class="icon-download" aria-hidden="true"></i> <span>Download</span> </a> @@ -118,7 +117,6 @@ <span>Delete</span> </a> </div> - <div class="card creat-card view-package-container"> <div class="row"> <div class="col-1 text-center"><i class="package-type-icon icon-topologyView-active"></i></div> @@ -149,19 +147,19 @@ <ul class="package-contributers"> <li> <button type="button" class="border-fade" data-toggle="tooltip" - data-placement="bottom" title="User name"> + data-placement="bottom" title="User name"> <img src="/assets/img/img-user1.jpeg"> </button> </li> <li> <button type="button" data-toggle="tooltip" data-placement="bottom" - title="User name"> + title="User name"> <img src="/assets/img/img-user2.jpg"> </button> </li> <li> <button type="button" data-toggle="tooltip" data-placement="bottom" - title="User name"> + title="User name"> <img src="/assets/img/img-user3.jpg"> </button> </li> @@ -179,24 +177,24 @@ <!-- Button trigger modal - 1st Action --> <button (click)="checkSkipTypesOfAction()" type="button" class="btn btn-sm btn-primary mb-2" - data-toggle="modal" [attr.data-target]="dataTarget"> + data-toggle="modal" [attr.data-target]="dataTarget"> <i class="icon-topologyView-active"></i> Designer Mode </button> <!-- Designer Modal --> <div class="modal fade createActionModal" id="exampleModalLong" tabindex="-1" role="dialog" - aria-labelledby="exampleModalLongTitle" aria-hidden="true"> + aria-labelledby="exampleModalLongTitle" aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title" id="exampleModalLongTitle"></h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close" - title="Close"> + title="Close"> <i class="icon-action-close"></i> </button> </div> <div class="modal-body"> <div id="carouselExampleIndicators" class="carousel slide" - data-ride="carousel" data-interval="false"> + data-ride="carousel" data-interval="false"> <div class="carousel-inner"> <!--OPTIONS SLIDE--> <div class="carousel-item active"> @@ -206,15 +204,15 @@ <!--Custom Action--> <div class="col-3 d-flex"> <a class="d-flex" - data-target="#carouselExampleIndicators" - data-slide-to="1"> + data-target="#carouselExampleIndicators" + data-slide-to="1"> <div class="card actionType custom"> <div class="card-body"> <h3>Custom</h3> <p>Start with your own settings</p> <button - data-target="#carouselExampleIndicators" - data-slide-to="1" class="btn"> + data-target="#carouselExampleIndicators" + data-slide-to="1" class="btn"> Create </button> </div> @@ -224,16 +222,16 @@ <!--Default Action--> <div class="col-3 d-flex"> <a class="d-flex" - data-target="#carouselExampleIndicators" - data-slide-to="2"> + data-target="#carouselExampleIndicators" + data-slide-to="2"> <div class="card actionType default"> <div class="card-body"> <h3>Default</h3> <p>Explore preset actions from CDS Action Catalog</p> <button - data-target="#carouselExampleIndicators" - data-slide-to="2" class="btn"> + data-target="#carouselExampleIndicators" + data-slide-to="2" class="btn"> Select </button> </div> @@ -243,8 +241,8 @@ <!--Recent Action--> <div class="col-3 d-flex"> <a class="d-flex" - data-target="#carouselExampleIndicators" - data-slide-to="3"> + data-target="#carouselExampleIndicators" + data-slide-to="3"> <div class="card actionType recent"> <div class="card-body"> <h3>Recent</h3> @@ -252,8 +250,8 @@ recent packages</p> <button - data-target="#carouselExampleIndicators" - data-slide-to="3" class="btn"> + data-target="#carouselExampleIndicators" + data-slide-to="3" class="btn"> Select </button> </div> @@ -263,15 +261,15 @@ <!--Import Action--> <div class="col-3 d-flex"> <a class="d-flex" - data-target="#carouselExampleIndicators" - data-slide-to="4"> + data-target="#carouselExampleIndicators" + data-slide-to="4"> <div class="card actionType import"> <div class="card-body"> <h3>Import</h3> <p>Import your own action files</p> <button - data-target="#carouselExampleIndicators" - data-slide-to="4" class="btn"> + data-target="#carouselExampleIndicators" + data-slide-to="4" class="btn"> Browse </button> </div> @@ -282,7 +280,7 @@ <div class="row"> <div class="col text-center"> <button class="btn skip-btn" data-dismiss="modal" - (click)="goToDesignerMode(viewedPackage.id)"> + (click)="goToDesignerMode(viewedPackage.id)"> Skip to Designer Canvas </button> @@ -292,16 +290,16 @@ <!--Custom Action Form--> <div class="carousel-item"> <button data-target="#carouselExampleIndicators" - data-slide-to="0" title="Back" class="btn back"><i + data-slide-to="0" title="Back" class="btn back"><i class="icon-action-back"></i></button> <h1>Create Custom Action</h1> <div class="form-group text-center"> <input type="text" [(ngModel)]="customActionName" - class="form-control customAction" - placeholder="Type Action Name" autofocus> + class="form-control customAction" + placeholder="Type Action Name" autofocus> <button type="button" data-dismiss="modal" - (click)="goToDesignerMode(viewedPackage.id)" - class="btn submit">Start + (click)="goToDesignerMode(viewedPackage.id)" + class="btn submit">Start </button> </div> @@ -309,7 +307,7 @@ <!--Default Actions Form--> <div class="carousel-item"> <button data-target="#carouselExampleIndicators" - data-slide-to="0" title="Back" class="btn back"><i + data-slide-to="0" title="Back" class="btn back"><i class="icon-action-back"></i></button> <h1>Choose Action(s) from CDS Default Package </h1> <div class="actionFormWrapper"> @@ -331,7 +329,7 @@ </div> <div class="col"> <input type="text" class="form-control searchInput" - placeholder="Search"> + placeholder="Search"> </div> </div> <div class="row actionsListScroll"> @@ -339,11 +337,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation1" - required> + class="custom-control-input" + id="customControlValidation1" required> <label class="custom-control-label" - for="customControlValidation1">config-assign</label> + for="customControlValidation1">config-assign</label> </div> </div> </div> @@ -351,11 +348,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation2" - required> + class="custom-control-input" + id="customControlValidation2" required> <label class="custom-control-label" - for="customControlValidation2">config-assign-test</label> + for="customControlValidation2">config-assign-test</label> </div> </div> </div> @@ -363,11 +359,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation3" - required> + class="custom-control-input" + id="customControlValidation3" required> <label class="custom-control-label" - for="customControlValidation3">config-deploy</label> + for="customControlValidation3">config-deploy</label> </div> </div> </div> @@ -375,11 +370,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation4" - required> + class="custom-control-input" + id="customControlValidation4" required> <label class="custom-control-label" - for="customControlValidation4">config-modify</label> + for="customControlValidation4">config-modify</label> </div> </div> </div> @@ -387,11 +381,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -399,11 +392,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -411,11 +403,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -423,11 +414,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -435,11 +425,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -447,11 +436,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -459,11 +447,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -472,8 +459,8 @@ <div class="col text-center"> <p class="selectedActions">0 selected</p> <button type="button" data-dismiss="modal" - (click)="goToDesignerMode(viewedPackage.id)" - class="btn submit">Start + (click)="goToDesignerMode(viewedPackage.id)" + class="btn submit">Start </button> </div> </div> @@ -482,7 +469,7 @@ <!--Recent Actions Form--> <div class="carousel-item"> <button data-target="#carouselExampleIndicators" - data-slide-to="0" title="Back" class="btn back"><i + data-slide-to="0" title="Back" class="btn back"><i class="icon-action-back"></i></button> <h1>Choose Action(s) from Recent Packages</h1> <div class="actionFormWrapper"> @@ -512,7 +499,7 @@ </div> <div class="col"> <input type="text" class="form-control searchInput" - placeholder="Search"> + placeholder="Search"> </div> </div> <div class="row actionsListScroll"> @@ -520,11 +507,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation1" - required> + class="custom-control-input" + id="customControlValidation1" required> <label class="custom-control-label" - for="customControlValidation1">config-assign</label> + for="customControlValidation1">config-assign</label> </div> </div> </div> @@ -532,11 +518,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation2" - required> + class="custom-control-input" + id="customControlValidation2" required> <label class="custom-control-label" - for="customControlValidation2">config-assign-test</label> + for="customControlValidation2">config-assign-test</label> </div> </div> </div> @@ -544,11 +529,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation3" - required> + class="custom-control-input" + id="customControlValidation3" required> <label class="custom-control-label" - for="customControlValidation3">config-deploy</label> + for="customControlValidation3">config-deploy</label> </div> </div> </div> @@ -556,11 +540,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation4" - required> + class="custom-control-input" + id="customControlValidation4" required> <label class="custom-control-label" - for="customControlValidation4">config-modify</label> + for="customControlValidation4">config-modify</label> </div> </div> </div> @@ -568,11 +551,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -580,11 +562,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -592,11 +573,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -604,11 +584,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -616,11 +595,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -628,11 +606,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -640,11 +617,10 @@ <div class="actionName"> <div class="custom-control custom-checkbox"> <input type="checkbox" - class="custom-control-input" - id="customControlValidation5" - required> + class="custom-control-input" + id="customControlValidation5" required> <label class="custom-control-label" - for="customControlValidation5">config-assign1</label> + for="customControlValidation5">config-assign1</label> </div> </div> </div> @@ -661,30 +637,30 @@ <!--Import Actions Form--> <div class="carousel-item"> <button data-target="#carouselExampleIndicators" - data-slide-to="0" title="Back" class="btn back"><i + data-slide-to="0" title="Back" class="btn back"><i class="icon-action-back"></i></button> <h1>Import Action(s)</h1> <div class="actionFormWrapper"> <div class="row"> <div class="col"> <ngx-file-drop accept=".json" - dropZoneLabel="Drop files here" - (onFileDrop)="dropped($event)" - (onFileOver)="fileOver($event)" - (onFileLeave)="fileLeave($event)"> + dropZoneLabel="Drop files here" + (onFileDrop)="dropped($event)" + (onFileOver)="fileOver($event)" + (onFileLeave)="fileLeave($event)"> <ng-template ngx-file-drop-content-tmp - let-openFileSelector="openFileSelector"> + let-openFileSelector="openFileSelector"> <div class="folder-upload"> <img - src="assets/img/folder-upload.svg"/> + src="assets/img/folder-upload.svg" /> </div> <div class="folder-upload-text"> Drag & Drop file </div> <div class="folder-upload-text">or <button type="button" - class="btn btn-sm btn-primary" - (click)="openFileSelector()"> + class="btn btn-sm btn-primary" + (click)="openFileSelector()"> Browse Files </button> @@ -698,17 +674,17 @@ <div class="upload-table"> <table class="table"> <thead> - <tr + <tr *ngFor="let item of uploadedFiles; let i=index"> - <th width="40"><img - src="assets/img/icon-file-code.svg"/> - </th> - <th>{{ item.name }}</th> - <th width="40" class="text-right"> - <img - src="assets/img/icon-remove-file.svg"/> - </th> - </tr> + <th width="40"><img + src="assets/img/icon-file-code.svg" /> + </th> + <th>{{ item.name }}</th> + <th width="40" class="text-right"> + <img + src="assets/img/icon-remove-file.svg" /> + </th> + </tr> </thead> </table> </div> @@ -728,9 +704,8 @@ </div> </div> </div> - <button type="button" class="btn btn-sm mb-2 btn-enrich" - (click)="enrichBluePrint()"> - <!-- data-toggle="modal" data-target="#enrichModal"--> + <button type="button" class="btn btn-sm mb-2 btn-enrich" (click)="enrichBluePrint()"> + <!-- data-toggle="modal" data-target="#enrichModal"--> <i class="icon-enrich" aria-hidden="true"></i> Enrich </button> @@ -749,20 +724,20 @@ <div class="col"> <div class="nav nav-tabs " id="nav-tab" role="tablist"> <a [classList]="metadataClasses" id="nav-metadata-tab" data-toggle="tab" - href="#nav-metadata" role="tab" aria-controls="nav-metadata" aria-selected="true" - autofocus #nameit (focusout)="saveMetaData()">METADATA</a> + href="#nav-metadata" role="tab" aria-controls="nav-metadata" aria-selected="true" + autofocus #nameit (focusout)="saveMetaData()">METADATA</a> <a class="nav-item nav-link" id="nav-template-tab" data-toggle="tab" href="#nav-template" - role="tab" aria-controls="nav-template" aria-selected="false">TEMPLATE & MAPPING</a> + role="tab" aria-controls="nav-template" aria-selected="false">TEMPLATE & MAPPING</a> <a class="nav-item nav-link" id="nav-scripts-tab" data-toggle="tab" href="#nav-scripts" - role="tab" aria-controls="nav-scripts" aria-selected="false">SCRIPTS</a> + role="tab" aria-controls="nav-scripts" aria-selected="false">SCRIPTS</a> <a class="nav-item nav-link" id="nav-imports-tab" data-toggle="tab" href="#nav-imports" - role="tab" aria-controls="nav-imports" aria-selected="false">DEFINITIONS</a> + role="tab" aria-controls="nav-imports" aria-selected="false">DEFINITIONS</a> <a class="nav-item nav-link" id="nav-authentication-tab" data-toggle="tab" - href="#nav-authentication" role="tab" aria-controls="nav-authentication" - aria-selected="false">EXTERNAL SYSTEM AUTHENTICATION PROPERTIES</a> + href="#nav-authentication" role="tab" aria-controls="nav-authentication" + aria-selected="false">EXTERNAL SYSTEM AUTHENTICATION PROPERTIES</a> <a class="nav-item nav-link" id="nav-topologytemplate-tab" data-toggle="tab" - href="#nav-topologytemplate" role="tab" aria-controls="nav-authentication" - aria-selected="false">Topology Template</a> + href="#nav-topologytemplate" role="tab" aria-controls="nav-authentication" + aria-selected="false">Topology Template</a> </div> </div> @@ -771,24 +746,24 @@ <div class="col"> <div class="tab-content" id="nav-tabContent" (change)="clickEvent()"> <div class="tab-pane fade show active" id="nav-metadata" role="tabpanel" - aria-labelledby="nav-metadata-tab"> + aria-labelledby="nav-metadata-tab"> <app-metadata-tab></app-metadata-tab> </div> <div class="tab-pane fade" id="nav-template" role="tabpanel" - aria-labelledby="nav-template-tab"> + aria-labelledby="nav-template-tab"> <app-template-mapping></app-template-mapping> </div> <div class="tab-pane fade" id="nav-scripts" role="tabpanel" - aria-labelledby="nav-scripts-tab"> + aria-labelledby="nav-scripts-tab"> <app-scripts-tab></app-scripts-tab> </div> <div class="tab-pane fade" id="nav-imports" role="tabpanel" - aria-labelledby="nav-imports-tab"> + aria-labelledby="nav-imports-tab"> <app-imports-tab></app-imports-tab> </div> <div class="tab-pane fade" id="nav-authentication" role="tabpanel" - aria-labelledby="nav-authentication-tab"> + aria-labelledby="nav-authentication-tab"> <div class="card creat-card"> <div class="editor-container"> <app-dsl-definitions-tab></app-dsl-definitions-tab> @@ -796,7 +771,7 @@ </div> </div> <div class="tab-pane fade" id="nav-topologytemplate" role="tabpanel" - aria-labelledby="nav-authentication-tab"> + aria-labelledby="nav-authentication-tab"> <div class="card creat-card"> <div class="editor-container"> <app-topology-template></app-topology-template> @@ -810,16 +785,15 @@ </div> </div> </div> - <!-- Enrich Modal --> <div class="modal fade enrichModal" id="enrichModal" tabindex="-1" role="dialog" aria-labelledby="enrichModalLabel" - aria-hidden="true"> + aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title" id="enrichModalLabel">Manual Enrich</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <img src="assets/img/icon-close.svg"/> + <img src="assets/img/icon-close.svg" /> </button> </div> <div class="modal-body"> @@ -829,15 +803,14 @@ <li>2. Press <b>Enrich</b> button</li> </ul> <ace-editor [(text)]="this.vlbDefinition.topology_template.content" [mode]="'json'" - [autoUpdateContent]="true" [durationBeforeCallback]="1000" [theme]="'eclipse'" - (textChanged)="textChanged($event)" - #editor style="height:300px;"> + [autoUpdateContent]="true" [durationBeforeCallback]="1000" [theme]="'eclipse'" + (textChanged)="textChanged($event)" #editor style="height:250px;"> </ace-editor> </div> <div class="modal-footer"> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> <button type="button" data-dismiss="modal" class="btn btn-primary btn-enrich" - (click)="enrichBluePrint()">Enrich + (click)="enrichBluePrint()">Enrich </button> </div> </div> @@ -845,7 +818,7 @@ </div> <!-- Delete Modal --> <div class="modal fade" id="removePackageModal" tabindex="-1" role="dialog" aria-labelledby="removePackageModalLabel" - aria-hidden="true"> + aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> @@ -867,7 +840,7 @@ </div> <div class="modal fade" id="discardChangesModal" tabindex="-1" role="dialog" aria-labelledby="discardChangesModalLabel" - aria-hidden="true"> + aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> @@ -887,4 +860,4 @@ </div> </div> </div> -</div> +</div>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts index e9affecc7..b3894fe94 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts @@ -169,13 +169,13 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl bluePrintDetailModels => { if (bluePrintDetailModels) { const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1]; - this.toastService.info('package updated successfully '); + this.toastService.info('Package Updated Successfully '); this.isSaveEnabled = false; this.router.navigate(['/packages/package/' + id]); this.refreshCurrentPackage(id); } }, error => { - this.toastService.error('error happened when editing ' + error.message); + this.toastService.error('Error occured when editing ' + error.message); console.log('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -268,14 +268,14 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl this.packageCreationStore.clear(); this.packageCreationExtractionService.extractBlobToStore(this.currentBlob); this.isSaveEnabled = true; - this.toastService.info('enriched successfully '); + this.toastService.success('Enriched Done Successfully'); }, err => { this.handleError(err); }, () => { this.ngxService.stop(); }); }, error => { - this.toastService.error('error happened when enrich ' + error.message); + this.toastService.error('Error occured during enrichment process' + error.message); console.error('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -287,7 +287,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl this.zipFile.generateAsync({ type: 'blob' }) .then(blob => { this.packageCreationService.deploy(blob).subscribe(response => { - this.toastService.info('deployed successfully '); + this.toastService.info('Package Deployed Successfully '); const id = response.toString().split('id')[1].split(':')[1].split('"')[1]; this.isSaveEnabled = false; this.router.navigate(['/packages/package/' + id]); @@ -335,10 +335,10 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl // server-side error errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`; } - this.toastService.error('error happened when deploying ' + errorMessage); + this.toastService.error('Error occured when deploying ' + errorMessage); console.log('Error -' + errorMessage); this.ngxService.stop(); - this.toastService.error('error happened when deploying' + error.message); + this.toastService.error('Error occured when deploying' + error.message); return throwError(errorMessage); } } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html index c26fe00c2..8746569ba 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html @@ -427,7 +427,7 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-primary" (click)="submitAttributes()">Submit Attributes</button> </div> </div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css index 1b8826fe3..7cb6c5255 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css @@ -137,6 +137,7 @@ header{ height: 16px; */ text-align: center; font-size: 14px; + color: #fff; } .topology-actions .dropdown-text, .dropdown-toggle:hover ~ .dropdown-text, @@ -174,7 +175,7 @@ header{ box-shadow: 0 2px 6px rgba(47, 83, 151, .15) } .topology-actions .dropdown-content a{ - padding: 0 20px 0 15px; + padding: 0 12px; color: #1B3E6F; font-size: 13px; } @@ -445,7 +446,7 @@ p.compType-4{ } */ .functionsList .joint-paper{ width: 100% !important; - height: 72vh !important; + height: 100% !important; /*72vh*/ margin: 0 !important; } .actionBtns .btn{ @@ -612,12 +613,6 @@ p.compType-4{ background-color: #1B3E6F !important; color: #fff; } -.viewBtns .topologySource{ - background-image: url(src/assets/img/icon-topologyView-active.svg); -} -.viewBtns .topologyView{ - background-image: url(src/assets/img/icon-topologySource.svg); -} .card.actionContainer{ margin: 20px 20px 40px 60px; background: transparent; @@ -889,7 +884,7 @@ p.compType-4{ .action-attributes .form-group{ display: inline-block; width: 100%; - padding-left: 12px; + /* padding-left: 12px; */ /* line-height: 30px; */ } .action-attributes .form-group:hover{ @@ -1094,14 +1089,20 @@ p.compType-4{ } .viewBtns .btn{ - margin-top: 14px; - padding-left: 30px!important; + margin-top: 16px; + padding: 0 12px !important; border: 0; font-size: 11px; + line-height: 32px; color: #1B3E6F !important; background-color: #fff !important; - background-repeat: no-repeat; - background-position: 10px center; + /* background-repeat: no-repeat; */ + /* background-position: 10px center; */ +} +.viewBtns .btn i{ + margin-right: 5px; + font-size: 16px; + vertical-align: text-bottom; } .viewBtns .btn.active{ background-color: #1B3E6F !important; @@ -1143,7 +1144,7 @@ ul.editor{ box-shadow: none; } .ace_editor{ - top: 5.4vh; + top: 45px; height: 92vh !important; } .dsl-editor { @@ -1300,7 +1301,8 @@ ul.editor{ border: 0; } .container{ - min-height: 66px; + min-height: 33px; + margin-bottom: 15px; border-bottom: solid 1px #EFEFF4; line-height: 24px; } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html index 96e4bda16..e11302d90 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html @@ -96,8 +96,7 @@ <a (click)="enrichBluePrint()"><i class="icon-enrich" aria-hidden="true"></i> Enrich</a> </li> --> <li> - <a (click)="enrichBluePrint()"><i class="fa fa-play-circle" aria-hidden="true"></i> - Enrich & Deploy</a> + <a (click)="enrichBluePrint()"><i class="fa fa-play-circle" aria-hidden="true"></i> Enrich & Deploy</a> </li> </ul> </div> @@ -165,9 +164,9 @@ <ul class="navbar ml-2" style="list-style: none"> <li class="nav-item"> <div class="btn-group viewBtns" role="group"> - <button type="button" class="btn btn-secondary topologySource active">Designer</button> + <button type="button" class="btn btn-secondary topologySource active"><i class="icon-topologyView-active" aria-hidden="true"></i> Designer</button> <button [routerLink]="['/designer/source', packageId]" type="button" - class="btn btn-secondary topologyView">Scripting + class="btn btn-secondary topologyView"><i class="icon-topologySource" aria-hidden="true"></i>Scripting </button> </div> </li> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts index 0c70a497b..0f6e38c38 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts @@ -510,7 +510,7 @@ export class DesignerComponent implements OnInit, OnDestroy { this.ngxService.stop(); }); }, error => { - this.toastService.error(error.mesasge, 'error happened '); + this.toastService.error(error.mesasge, 'Error occurs during enrichment process'); console.error('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -532,12 +532,12 @@ export class DesignerComponent implements OnInit, OnDestroy { .then(blob => { this.packageCreationService.savePackage(blob).subscribe( bluePrintDetailModels => { - this.toastService.info('success updating the package'); + this.toastService.success('Package is successfully updated '); const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1]; this.router.navigate(['/packages/designer/' + id]); console.log('success'); }, error => { - this.toastService.error('error happened when editing ' + error.message); + this.toastService.error('Error occured when editing ' + error.message); console.log('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -583,11 +583,11 @@ export class DesignerComponent implements OnInit, OnDestroy { saveAs(blob, this.viewedPackage.artifactName + '-' + this.viewedPackage.artifactVersion + '-CBA.zip'); }, err => { - this.toastService.error('package ' + this.viewedPackage.artifactName + 'has error when downloading' + + this.toastService.error('Package ' + this.viewedPackage.artifactName + 'has error when downloading' + err.message); this.ngxService.stop(); }, () => { - this.toastService.success('package ' + this.viewedPackage.artifactName + 'downloaded successfully'); + this.toastService.success('Package ' + this.viewedPackage.artifactName + 'has been downloaded successfully'); this.ngxService.stop(); }); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html index 8879d539d..ea17f888d 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html @@ -59,7 +59,8 @@ <div class="custom-control custom-radio custom-control-inline"> <input type="radio" id="functionRadioInline" name="functionRadioInline" [checked]="!currentFuncion['inputs']['artifact-prefix-names']?.get_input" - (click)="setArtifact(true)" class="custom-control-input"> + (click)="setArtifact(true)" + class="custom-control-input"> <label class="custom-control-label" for="functionRadioInline">Pre-defined Template</label> </div> @@ -205,6 +206,7 @@ </div> </div> </div> + <br/> <button class="btn btn-select-template m-auto" (click)="saveFunctionData()">Save</button> </div> @@ -221,20 +223,21 @@ </button> </div> <div class="modal-body createAttributeTabs"> - <div class="col-4" *ngFor="let file of getKeys(templateAndMappingMap)"> + <div class="row"> + <div class="col-6" *ngFor="let file of getKeys(templateAndMappingMap)"> <a class="template-mapping-list float" [class.active]="selectedTemplates.has(file)"> <p (click)="setTemplate(file)">{{file}}</p> <span *ngIf="getValue(file,templateAndMappingMap).isMapping">Mapping</span> <span *ngIf="getValue(file,templateAndMappingMap).isTemplate">Template</span> </a> - + </div> </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" (click)="cancel()" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" (click)="cancel()" data-dismiss="modal">Close</button> <button type="button" class="btn btn-primary" data-dismiss="modal" (click)="addTemplates()">Add - Templates</button> + Template</button> </div> </div> </div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html index 1042024f3..30f657d12 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html @@ -126,24 +126,23 @@ </li> <li class="nav-item"> - <div class="btn-group viewBtns" role="group"> + <div class="btn-group viewBtns source-view-bar" role="group"> <button (click)="convertAndOpenInDesingerView(viewedPackage.id)" type="button" - class="btn btn-secondary topologySource">Designer</button> - <button type="button" class="btn btn-secondary topologyView active">Scripting</button> + class="btn btn-secondary topologySource"><i class="icon-topologyView-active" aria-hidden="true"></i> Designer</button> + <button type="button" class="btn btn-secondary topologyView active"><i class="icon-topologySource" aria-hidden="true"></i>Scripting</button> </div> </li> </ul> - </div> </nav> <ng-sidebar-container class="sidebar-container"> - <!-- Controller SideBar --> + <ng-sidebar [(opened)]="controllerSideBar" [sidebarClass]="'demo-sidebar controllerSidebar container-fluid'" [mode]="'push'" #sidebarLeft> <div class="row"> <div class="col"> - <input type="text" class="form-control input-search-controller" placeholder="Search Functions"> + <input type="text" class="form-control input-search-controller" placeholder="Search"> </div> </div> @@ -157,4 +156,5 @@ [theme]="'tomorrow_night_bright'" #editor style="height:500px"> </ace-editor> - </div>
\ No newline at end of file + </div> + </ng-sidebar-container>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html index e93ee72ca..51cf9f974 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html @@ -1,10 +1,10 @@ <ul class="defintionsNote"> - <li><b>To add new property: </b></li> + <li><b>To add new dsl_definitions: </b></li> <li>1. Use Copy and paste option or</li> - <li>2. Write them manually </li> + <li>2. Write them manually in the editor below</li> </ul> <ace-editor [(text)]="dslDefinition.content" [mode]="'javascript'" [autoUpdateContent]="true" - [durationBeforeCallback]="1000" (textChanged)="textChanged($event)" [theme]="'eclipse'" #editor style="height:300px;"> + [durationBeforeCallback]="1000" (textChanged)="textChanged($event)" [theme]="'eclipse'" #editor style="height:340px;"> </ace-editor> <!-- <app-source-editor [lang]="'javascript'" (textChanged)="textChanged($event)" [(text)]="dslDefinition.content"></app-source-editor> --> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html index e011d47cd..cca0dbcc1 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html @@ -61,7 +61,7 @@ </div> <div class="single-line-model"> - <label class="label-name">Tags</label> + <label class="label-name">Tags <span>*</span></label> <div class="label-input"> <input tourAnchor="mt-packageTags" type="input" (keyup.enter)="addTag($event)" (keyup.Space)="addTag($event)" placeholder="Ex., vDNS-CDS"> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html index fb21d3bd7..238906e2b 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html @@ -14,6 +14,8 @@ <div class="col profile-help"> <nav class="navbar navbar-expand-lg navbar-light"> <ul class="navbar-nav ml-auto"> + <!--Version--> + <div class="nav-item copyright">v1.0.0</div> <!--Help Menu--> <div class="nav-item dropdown helpMenu"> <input class="dropdown-toggle" type="text"> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts index 96d798c86..1d2340534 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts @@ -135,12 +135,12 @@ export class PackageCreationComponent extends ComponentCanDeactivate implements bluePrintDetailModels => { if (bluePrintDetailModels) { const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1]; - this.toastService.info('package updated successfully '); + this.toastService.success('Package Updated Successfully '); this.isSaveEnabled = false; this.router.navigate(['/packages/package/' + id]); } }, error => { - // this.toastService.error('error happened when editing ' + error.message); + // this.toastService.error('Error occure during editng process ' + error.message); console.log('Error -' + error.message); }, () => { this.ngxService.stop(); diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html index 36525c3f8..8431e7733 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html @@ -327,7 +327,7 @@ <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> - <h5 class="modal-title" id="templateDeletionModal2Label">Delete Script</h5> + <h5 class="modal-title" id="templateDeletionModal2Label">Delete Template</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> <img src="assets/img/icon-close.svg" /> </button> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html index f2aaf5d3a..19db27fb4 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html @@ -1,22 +1,7 @@ <div class="dropdown packagesFilter w-100"> <input class="dropdown-toggle" type="text"> <div class="dropdown-text">Filter By Tags <span - class="fillteredTags">{{checkBoxTages.substr(0,checkBoxTages.length-1)}}</span></div> - <!-- <ul class="dropdown-content w-100"> - <li> - <div class="form-group"> - <input type="text" (input)="reloadChanges($event)" class="form-control" placeholder="Search" autofocus> - </div> - </li> - <li *ngFor="let tag of viewedTags"> - <div class="custom-control custom-checkbox"> - <input type="checkbox" (click)="reloadPackages($event)" class="custom-control-input" id={{tag}} #checkboxes> - <label class="custom-control-label" for={{tag}}>{{tag}}</label> - </div> - </li> - <li class="reset-filter"><a (click)="resetFilter()">Reset filter</a></li> - </ul> --> - + class="fillteredTags">{{checkBoxTages.substr(0,checkBoxTages.length-2)}}</span></div> <div class="dropdown-content w-100"> <div class="form-group"> <input type="text" (input)="reloadChanges($event)" class="form-control" placeholder="Search" autofocus> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts index 6f02bbab8..4939e940b 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts @@ -96,7 +96,7 @@ export class TagsFilteringComponent implements OnInit { this.checkBoxTages = this.checkBoxTages.replace(event.target.id + ',', '') .replace(event.target.id, ''); } else { - this.checkBoxTages += event.target.id.trim() + ','; + this.checkBoxTages += event.target.id.trim() + ', '; } const tagsSelected = this.checkBoxTages.split(',').filter(item => { if (item) { diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html index 0632fb47d..2d5591106 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html @@ -46,11 +46,11 @@ </button> <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0" data-dismiss="modal" (click)="importAndSave()"> - Import&Save + Import & Save </button> <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0" data-dismiss="modal" (click)="importAndDeploy()"> - Import&Deploy + Import & Deploy </button> <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0" data-dismiss="modal" (click)="importPackageAndViewIt()"> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts index 5797d18d5..c6c75eb9c 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts @@ -115,11 +115,11 @@ export class ImportPackageComponent implements OnInit { this.zipFile.generateAsync({type: 'blob'}).then(blob => { this.packageCreationService.savePackage(blob).subscribe( bluePrintDetailModels => { - this.toastService.info('package is imported and saved successfully '); + this.toastService.info('Package is imported and saved successfully '); this.router.navigate(['/packages']); this.packagesStore.getAll(); }, error => - this.toastService.error('there is an error happened ' + error)); + this.toastService.error('Errot occured ' + error)); }); }); } @@ -134,11 +134,11 @@ export class ImportPackageComponent implements OnInit { this.zipFile.generateAsync({type: 'blob'}).then(blob => { this.packageCreationService.deploy(blob).subscribe( bluePrintDetailModels => { - this.toastService.info('package is imported and deployed successfully '); + this.toastService.info('Package is imported and deployed successfully '); this.router.navigate(['/packages']); this.packagesStore.getAll(); }, error => - this.toastService.error('there is an error happened ' + error)); + this.toastService.error('Errot occured ' + error)); }); }); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html index dea94dbe6..b824058d4 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html @@ -82,7 +82,7 @@ <p class="mb-2">By {{bluePrint.updatedBy.split('<')[0]}}</p> <p class="package-desc" [delay]="300" tooltip="{{bluePrint.artifactDescription}}" placement="bottom left">{{bluePrint.artifactDescription}}</p> - <p>{{bluePrint.tags}}</p> + <span class="packageTag">{{bluePrint.tags}}</span> <ul class="package-contributers"> <li> <button type="button" class="border-fade" data-toggle="tooltip" data-placement="bottom" diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts index 7e6bbbe59..0f5210230 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts @@ -64,11 +64,11 @@ export class PackageListComponent implements OnInit { deletePackage(id: string) { this.configurationDashboardService.deletePackage(id).subscribe(res => { - this.toastService.info('package deleted successfully '); + this.toastService.success('Package Deleted Successfully '); this.router.navigate(['/packages']); this.packagesStore.getAll(); }, err => { - this.toastService.error('error deleting package' + err.message); + this.toastService.error('Error occured during deleting package ' + err.message); }); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html index 4efb9a20e..25604cd3a 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html @@ -60,4 +60,5 @@ <app-sort-packages></app-sort-packages> </div> </div> + <!-- <div class="copyright text-center w-100 m-auto">Copyright @2020 CDS Designer UI - v1.0.0</div> --> </div>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html index 17955ec4e..4b428032f 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html @@ -7,6 +7,8 @@ <div class="col profile-help"> <nav class="navbar navbar-expand-lg navbar-light"> <ul class="navbar-nav ml-auto"> + <!--Version--> + <div class="nav-item copyright">v1.0.0</div> <!--Help Menu--> <div class="nav-item dropdown helpMenu"> <input class="dropdown-toggle" type="text"> diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html index 5ecb38743..c824a6f88 100644 --- a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html +++ b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html @@ -1,5 +1,6 @@ <div class="primary-nav"> - <img class="logo-icon open-panel nav-toggle" src="../assets/img/logo-icon.svg" title="CDS"> + <img class="logo-icon open-panel nav-toggle" src="../assets/img/logo-icon.svg" title="CDS Home"> + <!-- <span class="app_version">v1.0.1</span> --> <nav role="navigation" class="menu"> <img class="logotype" src="../assets/img/logo-text.svg"> <div class="overflow-container"> diff --git a/cds-ui/designer-client/src/styles.css b/cds-ui/designer-client/src/styles.css index c52788aa3..a25e63fc0 100644 --- a/cds-ui/designer-client/src/styles.css +++ b/cds-ui/designer-client/src/styles.css @@ -147,6 +147,14 @@ button:focus{ vertical-align: middle; } /*Components*/ +.copyright{ + margin-right: 6px; + padding: 9px 6px 0px; + font-size: 10px; + color: #8D96A3; + background: #F4F9FE; + border-radius: 3px; +} /* Menu Styles */ .primary-nav{ /* left: 0; */ @@ -179,6 +187,14 @@ button:focus{ z-index: 1000; cursor: pointer; } +.app_version{ + color: #1B3E6F; + position: absolute; + top: 46px; + z-index: 100000; + font-size: 8px; + left: 14px; +} .primary-nav .menu li{ position: relative; } @@ -592,6 +608,7 @@ height: 40px; } .packages-card p.package-desc{ margin-top: 6px; + margin-bottom: 6px; font-size: 13px; text-align: left; display: -webkit-box; @@ -604,7 +621,15 @@ height: 40px; color: #1B3E6F !important; text-decoration: underline; } - +.packageTag{ + margin-bottom: 9px; + margin-right: 3px; + padding: 3px 7px; + font-size: 12px; + background: #F4F9FE; + border-radius: 12px; + color: #2A81ED; +} .packages-card [data-tooltip]::before, .packages-card .tooltip::before{ border: 0 !important; @@ -626,7 +651,7 @@ height: 40px; box-shadow: 0 2px 6px 0 rgba(47, 83, 151, 0.18) !important; } .addPaackage-card .card-body img{ - width: 30%; + width: 35%; vertical-align: text-top; } .addPaackage-card a{ @@ -855,7 +880,7 @@ height: 40px; .dropdown-content{ position: absolute; top: 32px; - width: 160px; + width: 140px; margin: 0; padding: 0; opacity: 0; @@ -1234,6 +1259,9 @@ height: 40px; font-weight: bold; border-radius: 4px; } +.fillteredTags:empty{ + visibility: hidden; +} /**Packages Sort**/ .sort-packages{ font-size: 12px; @@ -1459,6 +1487,7 @@ height: 40px; /***Contributers***/ ul.package-contributers{ + margin-top: 12px; margin-bottom: 9px !important; padding-left: 0 !important; } |