KNOX-1040: Added ability to edit provider params, service params, and provider URLs.
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/d47e382e Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/d47e382e Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/d47e382e Branch: refs/heads/master Commit: d47e382e6412ebd6f515dc80e111d0871822283e Parents: f595f47 Author: Phil Zampino <[email protected]> Authored: Thu Feb 8 10:57:31 2018 -0500 Committer: Phil Zampino <[email protected]> Committed: Sun Feb 11 22:52:06 2018 -0500 ---------------------------------------------------------------------- .../resource-detail.component.html | 148 ++++++++++++------- .../resource-detail.component.ts | 129 +++++++++++++--- gateway-admin-ui/src/index.html | 6 +- .../applications/admin-ui/app/index.html | 5 +- .../app/inline.2f727e6f73f32920fc6d.bundle.js | 1 + .../app/inline.e0d8c7408caf97685893.bundle.js | 1 - .../app/main.3323b90a117ac8faffa1.bundle.js | 1 + .../app/main.823edabc06e8cc0c56a3.bundle.js | 1 - 8 files changed, 206 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html ---------------------------------------------------------------------- diff --git a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html index 685a1a3..b1d919b 100644 --- a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html +++ b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html @@ -9,36 +9,50 @@ <div class="panel-body" *ngIf="hasSelectedResource() && resourceType === 'Provider Configurations'"> <div *ngIf="hasSelectedResource()"> <div class="panel panel-default" *ngFor="let provider of providers"> - <span [class]="'clickable glyhpicon glyphicon-' + (provider.show ? 'minus' : 'plus')" - (click)="provider.show = !provider.show"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowProvider(provider) ? 'minus' : 'plus')" + (click)="toggleShowProvider(provider)"></span> <span><b>{{ provider.name }}</b></span> - <span class="clickable glyphicon glyphicon-remove-sign pull-right" + <span class="clickable glyphicon glyphicon-remove pull-right btn btn-xs" [title]="'Remove ' + provider.name" (click)="onRemoveProvider(provider.name)" data-toggle="tooltip"></span> - <div *ngIf="provider.show"> + <div *ngIf="isShowProvider(provider)"> <b>Role</b> {{ provider.role }}<br> <b>Enabled</b> <input type="checkbox" [checked]="isProviderEnabled(provider)" (click)="onProviderEnabled(provider)"><br> <div> <span> </span> - <span [class]="'clickable glyhpicon glyphicon-' + (provider.showParamDetails ? 'minus' : 'plus')" - (click)="provider.showParamDetails = !provider.showParamDetails"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowProviderParams(provider) ? 'minus' : 'plus')" + (click)="toggleShowProviderParams(provider)"></span> <span><b>Params</b></span> - <span class="clickable glyphicon glyphicon-plus-sign pull-right" data-toggle="tooltip" title="Add Param"></span> + <span class="clickable glyphicon glyphicon-plus-sign btn btn-xs pull-right" data-toggle="tooltip" title="Add Param"></span> - <div class="panel panel-default table-responsive" *ngIf="provider.showParamDetails"> + <div class="panel panel-default table-responsive" *ngIf="isShowProviderParams(provider)"> <table class="table table-sm"> <tr *ngFor="let key of getParamKeys(provider)"> <td> - <span class="clickable glyphicon glyphicon-remove-sign" + <span class="clickable glyphicon glyphicon-remove btn btn-xs" title="Remove Param" (click)="onRemoveProviderParam(provider, key)" data-toggle="tooltip"></span> </td> <td><b>{{ key }}</b></td> - <td>{{ provider.params[key] }}</td> + <td> + <span class="clickable" + (click)="setProviderParamEditFlag(provider, key, true)" + *ngIf="!getProviderParamEditFlag(provider, key)">{{provider.params[key]}}</span> + <span *ngIf="getProviderParamEditFlag(provider, key)"> + <input type="text" [ngModel]="provider.params[key]" id="{{provider.name}}{{key}}Value"> + <button class="btn btn-xs" + (click)="setProviderParamEditFlag(provider, key, false);onUpdateProviderConfigParam(provider, key, getInputElementValue(provider.name+key+'Value'))"> + <span class="glyphicon glyphicon-ok"></span> + </button> + <button class="btn btn-xs" (click)="setProviderParamEditFlag(provider, key, false)"> + <span class="glyphicon glyphicon-remove"></span> + </button> + </span> + </td> </tr> </table> </div> @@ -90,7 +104,7 @@ <span class="col-md-sm" *ngIf="editModePC"> <input type="text" [(ngModel)]="descriptor.providerConfig" #providerConfig> <button class="btn btn-xs" - (click)="editModePC=false;onUpdateDescriptorProperty(descriptor,'providerConfig', providerConfig.value)"> + (click)="editModePC=false;onUpdateDescriptorProperty('providerConfig', providerConfig.value)"> <span class="glyphicon glyphicon-ok"></span> </button> <button class="btn btn-xs" (click)="editModePC=false"> @@ -115,55 +129,83 @@ <br><br> <div class="panel panel-default col-md-12"> - <span [class]="'clickable glyhpicon glyphicon-' + (showServiceDetails ? 'minus' : 'plus')" - (click)="showServiceDetails = !showServiceDetails"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowServices() ? 'minus' : 'plus')" + (click)="toggleShowServices()"></span> <span><b>Services</b></span> - <span class="clickable glyphicon glyphicon-plus-sign pull-right" data-toggle="tooltip" title="Add Service"></span> - <div class="col-md-12 table-responsive" *ngIf="showServiceDetails"> + <span class="clickable glyphicon glyphicon-plus-sign btn btn-xs pull-right" data-toggle="tooltip" title="Add Service"></span> + <div class="col-md-12 table-responsive" *ngIf="isShowServices()"> <table class="table table-striped table-sm"> <tr *ngFor="let service of descriptor.services"> <td> <div> <span><b>{{ service.name }}</b></span> - <span class="clickable glyphicon glyphicon-remove-sign pull-right" + <span class="clickable glyphicon glyphicon-remove btn btn-xs pull-right" [title]="'Remove ' + service.name" (click)="onRemoveDescriptorService(service.name)" data-toggle="tooltip"></span> </div> <div> - <span [class]="'clickable glyhpicon glyphicon-' + (service.showParams ? 'minus' : 'plus')" - (click)="service.showParams = !service.showParams"></span> - <span>Params</span><span> </span><span class="glyphicon glyphicon-plus-sign" data-toggle="tooltip" title="Add param"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowServiceParams(service) ? 'minus' : 'plus')" + (click)="toggleShowServiceParams(service)"></span> + <span>Params</span><span> </span><span class="glyphicon glyphicon-plus-sign btn btn-xs" data-toggle="tooltip" title="Add param"></span> </div> - <div class="table-responsive" *ngIf="service.showParams"> + <div class="table-responsive" *ngIf="isShowServiceParams(service)"> <table class="table table-sm" *ngIf="descriptor.getServiceParamKeys(service).length > 0"> <tr *ngFor="let paramKey of descriptor.getServiceParamKeys(service)"> <td width="5%"> - <span class="clickable glyphicon glyphicon-remove-sign" + <span class="clickable glyphicon glyphicon-remove btn btn-xs" title="Remove Param" (click)="onRemoveDescriptorServiceParam(service.name, paramKey)" data-toggle="tooltip"></span> </td> <td width="30%"><b>{{ paramKey }}</b></td> - <td width="65%" align="left">{{ descriptor.getServiceParamValue(service, paramKey) }}</td> + <td width="65%" align="left"> + <span class="clickable" + (click)="setServiceParamEditFlag(service, paramKey, true)" + *ngIf="!getServiceParamEditFlag(service, paramKey)">{{descriptor.getServiceParamValue(service, paramKey)}}</span> + <span *ngIf="getServiceParamEditFlag(service, paramKey)"> + <input type="text" [ngModel]="descriptor.getServiceParamValue(service, paramKey)" id="{{service.name}}{{paramKey}}Value"> + <button class="btn btn-xs" + (click)="setServiceParamEditFlag(service, paramKey, false);onUpdateServiceParam(service, paramKey, getInputElementValue(service.name+paramKey+'Value'))"> + <span class="glyphicon glyphicon-ok"></span> + </button> + <button class="btn btn-xs" (click)="setServiceParamEditFlag(service, paramKey, false)"> + <span class="glyphicon glyphicon-remove"></span> + </button> + </span> + </td> </tr> </table> </div> <div> - <span [class]="'clickable glyhpicon glyphicon-' + (service.showUrls ? 'minus' : 'plus')" - (click)="service.showUrls = !service.showUrls"></span> - <span>URLs</span><span> </span><span class="glyphicon glyphicon-plus-sign" data-toggle="tooltip" title="Add URL"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowServiceURLs(service) ? 'minus' : 'plus')" + (click)="toggleShowServiceURLs(service)"></span> + <span>URLs</span><span> </span><span class="glyphicon glyphicon-plus-sign btn btn-xs" data-toggle="tooltip" title="Add URL"></span> </div> - <div class="table-responsive" *ngIf="service.showUrls"> + <div class="table-responsive" *ngIf="isShowServiceURLs(service)"> <table class="table table-sm" *ngIf="service.urls && service.urls.length > 0"> - <tr *ngFor="let url of service.urls"> + <tr *ngFor="let url of service.urls; let i = index"> <td width="5%"> - <span class="clickable glyphicon glyphicon-remove-sign" + <span class="clickable glyphicon glyphicon-remove btn btn-xs" title="Remove URL" (click)="onRemoveDescriptorServiceURL(service.name, url)" data-toggle="tooltip"></span> </td> - <td width="95%">{{ url }}</td> + <td width="95%"> + <span class="clickable" + (click)="setServiceURLEditFlag(service, i, true)" + *ngIf="!getServiceURLEditFlag(service, i)">{{url}}</span> + <span *ngIf="getServiceURLEditFlag(service, i)"> + <input type="text" [ngModel]="service.urls[i]" id="{{service.name + i}}URL"> + <button class="btn btn-xs" + (click)="setServiceURLEditFlag(service, i, false);onUpdateServiceURL(service, i, getInputElementValue(service.name+i+'URL'))"> + <span class="glyphicon glyphicon-ok"></span> + </button> + <button class="btn btn-xs" (click)="setServiceURLEditFlag(service, i, false)"> + <span class="glyphicon glyphicon-remove"></span> + </button> + </span> + </td> </tr> </table> </div> @@ -174,10 +216,10 @@ </div> <br><br> <div class="panel panel-default col-md-12"> - <span [class]="'clickable glyhpicon glyphicon-' + (showDiscDetails ? 'minus' : 'plus')" - (click)="showDiscDetails = !showDiscDetails"></span> + <span [class]="'clickable glyhpicon glyphicon-' + (isShowServiceDiscovery() ? 'minus' : 'plus')" + (click)="toggleShowServiceDiscovery()"></span> <span><b>Discovery Details</b></span> - <div class="col-md-12" *ngIf="showDiscDetails"> + <div class="col-md-12" *ngIf="isShowServiceDiscovery()"> <table class="table table-sm"> <tr> <td>Discovery Address</td> @@ -186,7 +228,7 @@ <span *ngIf="editModeAddress"> <input type="text" [ngModel]="descriptor.discoveryAddress" #discoveryAddress> <button class="btn btn-xs" - (click)="editModeAddress=false;onUpdateDescriptorProperty(descriptor,'discoveryAddress', discoveryAddress.value)"> + (click)="editModeAddress=false;onUpdateDescriptorProperty('discoveryAddress', discoveryAddress.value)"> <span class="glyphicon glyphicon-ok"></span> </button> <button class="btn btn-xs" (click)="editModeAddress=false"> @@ -196,48 +238,52 @@ </td> </tr> <tr> - <td>Discovery User</td> + <td>Discovery Cluster</td> <td> - <span class="clickable" (click)="editModeUser=true" *ngIf="!editModeUser">{{ descriptor.discoveryUser}}</span> - <span *ngIf="editModeUser"> - <input type="text" [ngModel]="descriptor.discoveryUser" #discoveryUser> + <span class="clickable" (click)="editModeCluster=true" *ngIf="!editModeCluster">{{ descriptor.discoveryCluster}}</span> + <span *ngIf="editModeCluster"> + <input type="text" [ngModel]="descriptor.discoveryCluster" #discoveryCluster> <button class="btn btn-xs" - (click)="editModeUser=false;onUpdateDescriptorProperty(descriptor,'discoveryUser', discoveryUser.value)"> + (click)="editModeCluster=false;onUpdateDescriptorProperty('discoveryCluster', discoveryCluster.value)"> <span class="glyphicon glyphicon-ok"></span> </button> - <button class="btn btn-xs" (click)="editModeUser=false"> + <button class="btn btn-xs" (click)="editModeCluster=false"> <span class="glyphicon glyphicon-remove"></span> </button> </span> </td> </tr> <tr> - <td>Discovery Password Alias</td> + <td>Discovery User</td> <td> - <span class="clickable" (click)="editModeAlias=true" *ngIf="!editModeAlias">{{ descriptor.discoveryPassAlias}}</span> - <span *ngIf="editModeAlias"> - <input type="text" [ngModel]="descriptor.discoveryPassAlias" #discoveryAlias> + <span *ngIf="!editModeUser" + class="clickable" + (click)="editModeUser=true">{{(descriptor.discoveryUser) ? descriptor.discoveryUser : 'ambari.discovery.user' }}</span> + <span *ngIf="editModeUser"> + <input type="text" [ngModel]="descriptor.discoveryUser" #discoveryUser> <button class="btn btn-xs" - (click)="editModeAlias=false;onUpdateDescriptorProperty(descriptor,'discoveryPassAlias', discoveryAlias.value)"> + (click)="editModeUser=false;onUpdateDescriptorProperty('discoveryUser', discoveryUser.value)"> <span class="glyphicon glyphicon-ok"></span> </button> - <button class="btn btn-xs" (click)="editModeAlias=false"> + <button class="btn btn-xs" (click)="editModeUser=false"> <span class="glyphicon glyphicon-remove"></span> </button> </span> </td> </tr> <tr> - <td>Discovery Cluster</td> + <td>Discovery Password Alias</td> <td> - <span class="clickable" (click)="editModeCluster=true" *ngIf="!editModeCluster">{{ descriptor.discoveryCluster}}</span> - <span *ngIf="editModeCluster"> - <input type="text" [ngModel]="descriptor.discoveryCluster" #discoveryCluster> + <span class="clickable" + (click)="editModeAlias=true" + *ngIf="!editModeAlias">{{ (descriptor.discoveryPassAlias) ? descriptor.discoveryPassAlias : 'ambari.discovery.password' }}</span> + <span *ngIf="editModeAlias"> + <input type="text" [ngModel]="descriptor.discoveryPassAlias" #discoveryAlias> <button class="btn btn-xs" - (click)="editModeCluster=false;onUpdateDescriptorProperty(descriptor,'discoveryCluster', discoveryCluster.value)"> + (click)="editModeAlias=false;onUpdateDescriptorProperty('discoveryPassAlias', discoveryAlias.value)"> <span class="glyphicon glyphicon-ok"></span> </button> - <button class="btn btn-xs" (click)="editModeCluster=false"> + <button class="btn btn-xs" (click)="editModeAlias=false"> <span class="glyphicon glyphicon-remove"></span> </button> </span> http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-admin-ui/src/app/resource-detail/resource-detail.component.ts ---------------------------------------------------------------------- diff --git a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.ts b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.ts index 9f49ee7..e34256d 100644 --- a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.ts +++ b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.ts @@ -291,16 +291,6 @@ export class ResourceDetailComponent implements OnInit { tmp['provider-config-ref'] = desc.providerConfig; tmp['services'] = desc.services; - // Scrub any UI-specific service properties - for(let service of tmp['services']) { - if(service.hasOwnProperty('showParams')) { - delete service.showParams; - } - if(service.hasOwnProperty('showUrls')) { - delete service.showUrls; - } - } - switch(format) { case 'json': { serialized = JSON.stringify(tmp, null, 2); @@ -323,16 +313,6 @@ export class ResourceDetailComponent implements OnInit { let tmp = {}; tmp['providers'] = providers; - // Scrub any UI-specific provider properties - for(let pc of tmp['providers']) { - if(pc.hasOwnProperty('show')) { - delete pc.show; - } - if(pc.hasOwnProperty('showParamDetails')) { - delete pc.showParamDetails; - } - } - switch(format) { case 'json': { serialized = JSON.stringify(tmp, null, 2); @@ -362,7 +342,13 @@ export class ResourceDetailComponent implements OnInit { // This refreshes the list of resources this.resourceTypesService.selectResourceType(this.resourceType); }) - .catch(err => console.error('Error deleting ' + resourceName + ' : ' + err)); + .catch((err: HttpErrorResponse) => { + if (err.status === 304) { // Not Modified + console.log(resourceName + ' cannot be deleted while there are descriptors actively referencing it.'); + } else { + console.error('Error deleting ' + resourceName + ' : ' + err.message) + } + }); } @@ -444,9 +430,104 @@ export class ResourceDetailComponent implements OnInit { } } - onUpdateDescriptorProperty(desc: Descriptor, propertyName: string, value: string) { - desc[propertyName] = value; - desc.setDirty(); + toggleShowProvider(provider: ProviderConfig) { + this[this.resource.name + provider.name + 'Show'] = !this.isShowProvider(provider); + } + + isShowProvider(provider: ProviderConfig): boolean { + return this[this.resource.name + provider.name + 'Show']; + } + + toggleShowProviderParams(provider: ProviderConfig) { + this[this.resource.name + provider.name + 'ShowParams'] = !this.isShowProviderParams(provider); + } + + isShowProviderParams(provider: ProviderConfig): boolean { + return this[this.resource.name + provider.name + 'ShowParams']; + } + + toggleShowServices() { + this[this.resource.name + 'ShowServices'] = !this.isShowServices(); + } + + isShowServices(): boolean { + return this[this.resource.name + 'ShowServices']; + } + + toggleShowServiceDiscovery() { + this[this.resource.name + 'ShowDiscovery'] = !this.isShowServiceDiscovery(); + } + + isShowServiceDiscovery(): boolean { + return this[this.resource.name + 'ShowDiscovery']; + } + + toggleShowServiceParams(service: Service) { + this[this.resource.name + service.name + 'ShowParams'] = !this.isShowServiceParams(service); + } + + isShowServiceParams(service: Service): boolean { + return this[this.resource.name + service.name + 'ShowParams']; + } + + toggleShowServiceURLs(service: Service) { + this[this.resource.name + service.name + 'ShowURLs'] = !this.isShowServiceURLs(service); + } + + isShowServiceURLs(service: Service): boolean { + return this[this.resource.name + service.name + 'ShowURLs']; + } + + setProviderParamEditFlag(provider: ProviderConfig, paramName: string, value: boolean) { + this[provider.name+paramName+'EditMode'] = value; + this.changedProviders = this.providers; + } + + getProviderParamEditFlag(provider: ProviderConfig, paramName: string): boolean { + return this[provider.name+paramName+'EditMode']; + } + + getInputElementValue(id: string): string { + return (<HTMLInputElement>document.getElementById(id)).value; + } + + setServiceParamEditFlag(service: Service, paramName: string, value: boolean) { + this[service.name + paramName + 'EditMode'] = value; + this.descriptor.setDirty(); + } + + getServiceParamEditFlag(service: Service, paramName: string): boolean { + return this[service.name + paramName + 'EditMode']; + } + + setServiceURLEditFlag(service: Service, index: number, value: boolean) { + this[service.name + index + 'EditMode'] = value; + this.descriptor.setDirty(); + } + + getServiceURLEditFlag(service: Service, index: number): boolean { + return this[service.name + index + 'EditMode']; + } + + onUpdateServiceParam(service: Service, paramName: string, value: string) { + service.params[paramName] = value; + this.descriptor.setDirty(); + } + + onUpdateServiceURL(service: Service, urlIndex: number, value: string) { + service.urls[urlIndex] = value; + this.descriptor.setDirty(); + } + + onUpdateDescriptorProperty(propertyName: string, value: string) { + //console.log('Setting descriptor ' + this.resource.name + ' property ' + propertyName + ' to value ' + value); + this.descriptor[propertyName] = value; + this.descriptor.setDirty(); + } + + onUpdateProviderConfigParam(provider: ProviderConfig, propertyName: string, value: string) { + provider.params[propertyName] = value; + this.changedProviders = this.providers; } getParamKeys(provider: ProviderConfig): string[] { http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-admin-ui/src/index.html ---------------------------------------------------------------------- diff --git a/gateway-admin-ui/src/index.html b/gateway-admin-ui/src/index.html index e2b3be4..94d6e1b 100644 --- a/gateway-admin-ui/src/index.html +++ b/gateway-admin-ui/src/index.html @@ -28,14 +28,10 @@ <!-- Custom styles for this template --> <link href="assets/sticky-footer.css" rel="stylesheet"> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js";></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script> <!-- Latest compiled and minified JavaScript --> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script src="assets/vkbeautify.js"></script> - <!-- - <script src="assets/esprima.js"></script> - <script src="assets/js-yaml.min.js"></script> - --> </head> <body> <div class="navbar-wrapper"> http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-applications/src/main/resources/applications/admin-ui/app/index.html ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html index 3f3d746..41726f5 100644 --- a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html +++ b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html @@ -11,7 +11,4 @@ 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. ---><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!-- Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"; integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!-- Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js";></script><!-- Latest compiled and minified JavaScript --><sc ript src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><!-- - <script src="assets/esprima.js"></script> - <script src="assets/js-yaml.min.js"></script> - --><link href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache Knox Manager"></a></div></div></nav></div><!-- Content --><resource-management></resource-management><footer class="footer"><div>Knox Manager Version 0.1.0</div><gateway-version></gateway-version></footer><script type="text/javascript" src="inline.e0d8c7408caf97685893.bundle.js"></script><script type="text/javascript " src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script type="text/javascript" src="main.823edabc06e8cc0c56a3.bundle.js"></script></div></body></html> \ No newline at end of file +--><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!-- Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"; integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!-- Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script><!-- Latest compiled and minified JavaScript --><scr ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><link href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache Knox Manager"></a></div></div></nav></div><!-- Content --><resource-management></res ource-management><footer class="footer"><div>Knox Manager Version 0.1.0</div><gateway-version></gateway-version></footer><script type="text/javascript" src="inline.2f727e6f73f32920fc6d.bundle.js"></script><script type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script type="text/javascript" src="main.3323b90a117ac8faffa1.bundle.js"></script></div></body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-applications/src/main/resources/applications/admin-ui/app/inline.2f727e6f73f32920fc6d.bundle.js ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.2f727e6f73f32920fc6d.bundle.js b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.2f727e6f73f32920fc6d.bundle.js new file mode 100644 index 0000000..3c19a4a --- /dev/null +++ b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.2f727e6f73f32920fc6d.bundle.js @@ -0,0 +1 @@ +!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var u,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(u in a)Object.prototype.hasOwnProperty.call(a,u)&&(e[u]=a[u]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(l=0;l<c.length;l++)f=o(o.s=c[l]);return f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+""+e+"."+{0:"3323b90a117ac8faffa1",1:"aed76669724804835353"}[e]+".chunk.js";var u=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(u);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chu nk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/d47e382e/gateway-applications/src/main/resources/applications/admin-ui/app/inline.e0d8c7408caf97685893.bundle.js ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.e0d8c7408caf97685893.bundle.js b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.e0d8c7408caf97685893.bundle.js deleted file mode 100644 index 56e9a9b..0000000 --- a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.e0d8c7408caf97685893.bundle.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var u,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(u in c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(l=0;l<a.length;l++)f=o(o.s=a[l]);return f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+""+e+"."+{0:"823edabc06e8cc0c56a3",1:"aed76669724804835353"}[e]+".chunk.js";var u=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(u);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chu nk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]); \ No newline at end of file
