Skip to content

Commit

Permalink
Merge pull request #478 from openziti/477-simple-svc-role-attributes
Browse files Browse the repository at this point in the history
Fix display of identity "role" attributes on simple service form
  • Loading branch information
rgallettonf authored Aug 28, 2024
2 parents 05bf013 + 0f382aa commit 4dc61be
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<div class="form-group-row">
<lib-form-field-container
[title]="'ACCESSING CONFIGURATION'"
[contentStyle]="'z-index: 99999999'"
[contentStyle]="'z-index: 10001'"
[helpText]="'How will client applications use this service? Specify a hostname/IP and port, or use the &quot;SDK Only&quot; toggle for an application embedded configuration.'"
>
<div class="form-field-input-group accessing-group">
Expand Down Expand Up @@ -117,7 +117,7 @@
</lib-form-field-container>
<lib-form-field-container
[title]="'HOSTING CONFIGURATION'"
[contentStyle]="'z-index: 99999999'"
[contentStyle]="'z-index: 10000'"
[helpText]="'Where should traffic for this service be sent? Specify a protocol, hostname/IP, and port, or use the &quot;SDK Only&quot; toggle for an application embedded configuration.'"

>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ export class SimpleServiceComponent extends ProjectableForm {
this.servicesPageService.getServiceRoleAttributes().then((result) => {
this.serviceRoleAttributes = result.data;
});
this.servicesPageService.getIdentityRoleAttributes().then((result) => {
this.identityRoleAttributes = result.data;
});
}

getIdentityNamedAttributes(filter?) {
Expand Down Expand Up @@ -382,6 +385,8 @@ export class SimpleServiceComponent extends ProjectableForm {
} else if (result === 'cancel') {
/// Do nothing, stay on page
} else {
this.initDataModels();
this._dataChange = false;
this.router?.navigateByUrl(`${this.basePath}`);
}
});
Expand Down Expand Up @@ -752,6 +757,14 @@ export class SimpleServiceComponent extends ProjectableForm {
--data-raw '${JSON.stringify(this.bindPolicyApiData)}' \\`;
}

initDataModels() {
this.serviceApiData = this.initServiceApiData;
this.interceptConfigApiData.data = this.initInterceptConfigApiData.data;
this.hostConfigApiData.data = this.initHostConfigApiData.data;
this.dialPolicyApiData = this.initDialPolicyApiData;
this.bindPolicyApiData = this.initBindPolicyApiData;
}

override checkDataChange() {
const serviceDataChange = !isEqual(this.initServiceApiData, this.serviceApiData);
const interceptDataChange = !isEqual(this.initInterceptConfigApiData.data, this.interceptConfigApiData.data);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,9 @@ input {
-webkit-animation: loading 0.5s infinite linear;
animation: loading 0.5s infinite linear;
}

.tagsSelector {
&.clickOutside {
position: relative;
}
}

0 comments on commit 4dc61be

Please sign in to comment.