Skip to content

Ingress table changes #221

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
merged 3 commits into from
Mar 18, 2023
Merged

Ingress table changes #221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a78581
Save updated URLs to project
rakillen Mar 17, 2023
4f12d56
Combine the ingress route target service and port columns
rakillen Mar 17, 2023
6301417
Cleanup for eslint
rakillen Mar 17, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Combine the ingress route target service and port columns
  • Loading branch information
@rakillen
rakillen committed Mar 17, 2023
commit 4f12d56979d3f0568d4830d4b52a4be7bbf72fb3
1 change: 1 addition & 0 deletions electron/app/locales/en/webui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@
"ingress-design-ingress-route-targetservicenamespace-label": "Target Service Namespace",
"ingress-design-ingress-route-targetservicenamespace-help": "The target service namespace value points to the namespace where the domain is running.",
"ingress-design-ingress-route-accesspoint-label": "Access Point",
"ingress-design-ingress-route-target-label": "Target",
"ingress-design-ingress-route-targetservice-label": "Target Service",
"ingress-design-ingress-route-targetservice-placeholder": "Select Domain Service",
"ingress-design-ingress-route-targetservice-placeholder-empty": "No Domain Services Available",
Expand Down
19 changes: 13 additions & 6 deletions webui/src/js/viewModels/ingress-design-view-impl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,10 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
resizable: 'enabled'
},
{
headerText: this.labelMapper('ingress-route-targetservice-label'),
headerText: this.labelMapper('ingress-route-target-label'),
sortProperty: 'targetService',
resizable: 'enabled'
},
{
headerText: this.labelMapper('ingress-route-targetport-label'),
sortProperty: 'targetPort',
resizable: 'enabled'
},
{
headerText: this.labelMapper('ingress-route-accesspoint-label'),
sortProperty: 'targetServiceNameSpace'
Expand Down Expand Up @@ -170,6 +165,18 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
return 'r' + routeIndex;
}

// display in the target column, example "host:port"
this.getTargetText = (routeData) => {
let result = routeData.targetService;
if(result) {
const port = routeData.targetPort;
if(port != null) {
result += `:${port}`;
}
}
return result;
};

this.handleAddRoute = () => {
const uids = [];
this.routes.observable().forEach(route => {
Expand Down
7 changes: 2 additions & 5 deletions webui/src/js/views/ingress-design-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,8 @@ <h6 class="wkt-subheading">
<td data-bind="attr: { title: row.data.path }">
<oj-bind-text value="[[row.data.path]]"></oj-bind-text>
</td>
<td data-bind="attr: { title: row.data.targetService }">
<oj-bind-text value="[[row.data.targetService]]"></oj-bind-text>
</td>
<td>
<oj-bind-text value="[[row.data.targetPort]]"></oj-bind-text>
<td data-bind="attr: { title: getTargetText(row.data) }">
<oj-bind-text value="[[getTargetText(row.data)]]"></oj-bind-text>
</td>
<oj-bind-if test="[[!isAccessPointDefined(row.data.accessPoint)]]">
<td>
Expand Down