Skip to content

Template edit form support Toggle info #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilhelmguo merged 8 commits into from
Mar 15, 2019
Merged

Template edit form support Toggle info #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a643fc
frontend: collapse component add & deployment-tpl deploy
BennieMeng Mar 14, 2019
33904ca
frontend: statefulset
BennieMeng Mar 14, 2019
7caa37d
frontend: cronjob
BennieMeng Mar 14, 2019
b1acf0e
frontend: daemonset
BennieMeng Mar 14, 2019
d91d51f
frontend: adapt cannot set two router enter in one component:alien:
BennieMeng Mar 14, 2019
ce8b9f6
frontend: ingress
BennieMeng Mar 14, 2019
0c5f3c8
frontend: other tpl
BennieMeng Mar 14, 2019
4330ad1
Merge branch 'master' into toggle
BennieMeng Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 68 additions & 66 deletions ...src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,78 @@
<div class="clr-row" style="padding-left: 5%">
<div class="clr-row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h3 class="header-title">{{'HPA.CREATE_TEMPLATE' | translate}}</h3>
</div>
<form #ngForm="ngForm" style="padding-right: 30px;width: 100%">
<section class="form-block wrap">
<label class="label-level1">{{'TEMPLATE.RELEASE_MESSAGE' | translate}}</label>
<div class="form-group form-group-padding">
<label class="clr-col-md-3 form-group-label-override required">{{'TEMPLATE.RELEASE_EXPLAIN' | translate}}</label>
<textarea name="description"
[(ngModel)]="template.description"
required
rows="3"
style="width: 700px;">
</textarea>
</div>
</section>
<section class="form-block wrap" style="overflow:hidden">
<div style="float: left;width: 60%">
<label class="label-level1">{{'TEMPLATE.RESOURCE_CONFIG' | translate}}</label>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.TYPE' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input readonly type="text"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.scaleTargetRef.kind">
</label>
</div>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.NAME' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<wayne-select inputable name="deploy_name" [(ngModel)]="kubeResource.spec.scaleTargetRef.name"
searchable
[placeholder]="'PLACEHOLDER.CHOOSE' | translate">
<wayne-option *ngFor="let deploy of deploys" [value]="deploy.name">{{deploy.name}}</wayne-option>
</wayne-select>
</label>
<wayne-box>
<div class="clr-row" style="padding-left: 5%">
<div class="clr-row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h3 class="header-title">{{'HPA.CREATE_TEMPLATE' | translate}}</h3>
</div>
<form #ngForm="ngForm" style="padding-right: 30px;width: 100%">
<section class="form-block wrap">
<label class="label-level1">{{'TEMPLATE.RELEASE_MESSAGE' | translate}}</label>
<div class="form-group form-group-padding">
<label class="clr-col-md-3 form-group-label-override required">{{'TEMPLATE.RELEASE_EXPLAIN' | translate}}</label>
<textarea name="description"
[(ngModel)]="template.description"
required
rows="3"
style="width: 700px;">
</textarea>
</div>

<label class="label-level1">{{'TEMPLATE.SCHEDULING_CONFIG' | translate}}</label>
</section>
<section class="form-block wrap" style="overflow:hidden">
<div style="float: left;width: 60%">
<label class="label-level1">{{'TEMPLATE.RESOURCE_CONFIG' | translate}}</label>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.TYPE' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input readonly type="text"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.scaleTargetRef.kind">
</label>
</div>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.NAME' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<wayne-select inputable name="deploy_name" [(ngModel)]="kubeResource.spec.scaleTargetRef.name"
searchable
[placeholder]="'PLACEHOLDER.CHOOSE' | translate">
<wayne-option *ngFor="let deploy of deploys" [value]="deploy.name">{{deploy.name}}</wayne-option>
</wayne-select>
</label>
</div>

<label class="label-level1">{{'TEMPLATE.SCHEDULING_CONFIG' | translate}}</label>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.MIN_REPLICAS' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input type="number"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.minReplicas">
</label>
</div>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.MIN_REPLICAS' | translate}}</label>
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.MAX_REPLICAS' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input type="number"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.minReplicas">
[(ngModel)]="kubeResource.spec.maxReplicas">
</label>
</div>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.MAX_REPLICAS' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input type="number"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.maxReplicas">
</label>
</div>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.CPU_THRESHOLD' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input type="number"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.targetCPUUtilizationPercentage">
</label>
<div class="form-group form-group-padding" >
<label class="clr-col-md-4 form-group-label-override required">{{'TEMPLATE.CPU_THRESHOLD' | translate}}</label>
<label aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left">
<input type="number"
[ngModelOptions]="{standalone: true}"
[(ngModel)]="kubeResource.spec.targetCPUUtilizationPercentage">
</label>
</div>


</div>


</section>
<div class="clr-wizard-footer-buttons" style="padding-top: 30px">
<button type="button" class="btn btn-outline" (click)="onCancel()">{{ 'BUTTON.CANCEL' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="onOpenModal()">{{'BUTTON.ADVANCED_CONFIG' | translate}}</button>
<button type="button" class="btn btn-primary" [disabled]="!isValid" (click)="onSubmit()">{{ 'BUTTON.SUBMIT' | translate}}</button>
</div>
</section>
<div class="clr-wizard-footer-buttons" style="padding-top: 30px">
<button type="button" class="btn btn-outline" (click)="onCancel()">{{ 'BUTTON.CANCEL' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="onOpenModal()">{{'BUTTON.ADVANCED_CONFIG' | translate}}</button>
<button type="button" class="btn btn-primary" [disabled]="!isValid" (click)="onSubmit()">{{ 'BUTTON.SUBMIT' | translate}}</button>
</div>
</form>
</div>
</form>
</div>
</wayne-box>
<wayne-ace-editor (outputObj)="saveResourceTemplate($event)"></wayne-ace-editor>
2 changes: 1 addition & 1 deletion src/frontend/src/app/portal/base/base.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="content-area" style="position: relative;padding: .75rem .75rem .75rem .75rem;">
<wayne-box style="padding: 15px;">
<wayne-box [disabled]="!showBox" [ngStyle]="{padding: showBox ? '15px' : 0}">
<router-outlet></router-outlet>
</wayne-box>
</div>
Expand Down
24 changes: 20 additions & 4 deletions src/frontend/src/app/portal/base/base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Component, OnInit, HostBinding } from '@angular/core';
import { Component, OnInit, HostBinding, OnDestroy } from '@angular/core';
import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/distinctUntilChanged';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs';
import { ActivatedRoute, Router, NavigationStart } from '@angular/router';
import { AuthService } from '../../shared/auth/auth.service';
import { App } from '../../shared/model/v1/app';
import { AppService } from '../../shared/client/v1/app.service';
Expand All @@ -12,9 +13,10 @@ import { CacheService } from '../../shared/auth/cache.service';
templateUrl: 'base.component.html',
styleUrls: ['base.scss']
})
export class BaseComponent implements OnInit {
export class BaseComponent implements OnInit, OnDestroy {
appId: number;

showBox = false;
routerEvent: Subscription;
@HostBinding('class.content-container') field = true;

constructor(public authService: AuthService,
Expand Down Expand Up @@ -52,7 +54,21 @@ export class BaseComponent implements OnInit {
}

ngOnInit() {
this.showBox = /tpl/g.test(this.router.url) ? false : true;
this.authService.setAppPermissionById(this.appId);
this.routerEvent = this.router.events.subscribe(events => {
if (events instanceof NavigationStart) {
if (/tpl/g.test(events.url)) {
this.showBox = false;
} else {
this.showBox = true;
}
}
});
}

ngOnDestroy() {
this.routerEvent.unsubscribe();
}

appBetaMode(metaData: string) {
Expand Down
6 changes: 3 additions & 3 deletions ...src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="clr-row" style="padding-left: 5%;">
<div class="clr-row" style="padding-left: 20px">
<div class="clr-row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
<h3 class="header-title">{{'CONFIGMAP.CREATE_TMP' | translate}}</h3>
</div>
<form [formGroup]="currentForm" style="padding-right: 30px;width: 100%">
<section class="form-block wrap">
<wayne-box class="form-block wrap">
<div *ngIf="clusters" formArrayName="clusters" class="form-group form-group-padding">
<label class="clr-col-md-3 form-group-label-override required">{{'TITLE.CLUSTER' | translate}}</label>
<span class="warning-text" *ngIf="!clusters || clusters && clusters.length === 0">{{'CONFIGMAP.CREATE_EDIT_TMP.CLUSTER_MESSAGE' | translate}}</span>
Expand Down Expand Up @@ -52,7 +52,7 @@ <h3 class="header-title">{{'CONFIGMAP.CREATE_TMP' | translate}}</h3>
</div>
</div>
</div>
</section>
</wayne-box>
</form>
</div>
<div class="clr-wizard-footer-buttons tpl-bottom" [style.top.px]="top">
Expand Down
Loading
⚡