Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const dev = process.env.NODE_ENV !== 'production';
const nextApp = next({ dev });
const debug = require('debug')('AthenzUI:server:app');

process.env.NEXT_PUBLIC_ONCALL_URL = appConfig.onCallUrl || appConfig.serverURL;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apologies for the broken review, didn't notice it before
we do not have onCallUrl or serverURL in default-config.js.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Henry mentioned that we shouldn't expose internal on-call links so that was moved to the internal config. With regards to serverUrl, I could just change that to a generic fallback url i.e https://example.com


Promise.all([nextApp.prepare(), secrets.load(appConfig)])
.then(() => handlers.api.load(appConfig, secrets))
.then(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ exports[`ManageDomains should render 1`] = `
<th
class="emotion-12 emotion-7"
>
Business Service
ONCALL TEAM
</th>
<th
class="emotion-12 emotion-7"
Expand Down Expand Up @@ -333,7 +333,6 @@ exports[`ManageDomains should render 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user2"
>
add
</a>
Expand Down Expand Up @@ -406,7 +405,6 @@ exports[`ManageDomains should render 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user4"
>
add
</a>
Expand Down Expand Up @@ -687,7 +685,7 @@ exports[`ManageDomains should render no domain 1`] = `
<th
class="emotion-12 emotion-7"
>
Business Service
ONCALL TEAM
</th>
<th
class="emotion-12 emotion-7"
Expand Down Expand Up @@ -760,7 +758,6 @@ exports[`ManageDomains should render no domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user3"
>
add
</a>
Expand Down Expand Up @@ -833,7 +830,6 @@ exports[`ManageDomains should render no domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user3.test"
>
add
</a>
Expand Down Expand Up @@ -1128,7 +1124,7 @@ exports[`ManageDomains should render personal domain 1`] = `
<th
class="emotion-12 emotion-7"
>
Business Service
ONCALL TEAM
</th>
<th
class="emotion-12 emotion-7"
Expand Down Expand Up @@ -1201,7 +1197,6 @@ exports[`ManageDomains should render personal domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user3"
>
add
</a>
Expand Down Expand Up @@ -1274,7 +1269,6 @@ exports[`ManageDomains should render personal domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user4"
>
add
</a>
Expand Down Expand Up @@ -1549,7 +1543,7 @@ exports[`ManageDomains should render top level domain 1`] = `
<th
class="emotion-12 emotion-7"
>
Business Service
ONCALL TEAM
</th>
<th
class="emotion-12 emotion-7"
Expand Down Expand Up @@ -1622,7 +1616,6 @@ exports[`ManageDomains should render top level domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user3"
>
add
</a>
Expand Down Expand Up @@ -1695,7 +1688,6 @@ exports[`ManageDomains should render top level domain 1`] = `
>
<a
class="emotion-43 emotion-44"
data-testid="business-service-home.user4"
>
add
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ exports[`DomainDetails should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-8 {
Expand Down Expand Up @@ -155,6 +156,7 @@ exports[`DomainDetails should render 1`] = `
}

.emotion-47 {
cursor: pointer;
margin-left: 5px;
}

Expand Down Expand Up @@ -340,6 +342,7 @@ exports[`DomainDetails should render with mock data 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-8 {
Expand Down Expand Up @@ -467,6 +470,7 @@ exports[`DomainDetails should render with mock data 1`] = `
}

.emotion-47 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`DomainSettingsPage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`DomainSettingsPage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`GroupPage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`GroupPage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`MicrosegmentationPage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`MicrosegmentationPage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`PolicyPage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`PolicyPage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`RolePage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`RolePage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`ServicePage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`ServicePage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`Tag Page should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`Tag Page should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`Template Page should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`Template Page should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ exports[`VisibilityPage should render 1`] = `
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
display: flex;
}

.emotion-52 {
Expand Down Expand Up @@ -658,6 +659,7 @@ exports[`VisibilityPage should render 1`] = `
}

.emotion-91 {
cursor: pointer;
margin-left: 5px;
}

Expand Down
26 changes: 4 additions & 22 deletions ui/src/__tests__/pages/domain/__snapshots__/manage.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -543,19 +543,6 @@ exports[`PageManageDomains should render 1`] = `
max-width: 1px;
}

.emotion-117 {
background-color: #3570f40D;
text-align: center;
title: yca.US;
padding: 5px 0 5px 15px;
vertical-align: middle;
word-break: break-all;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 1px;
}

.emotion-123 {
fill: #188fff;
cursor: pointer;
Expand Down Expand Up @@ -819,7 +806,7 @@ exports[`PageManageDomains should render 1`] = `
<th
class="emotion-42 emotion-37"
>
Business Service
ONCALL TEAM
</th>
<th
class="emotion-42 emotion-37"
Expand Down Expand Up @@ -892,7 +879,6 @@ exports[`PageManageDomains should render 1`] = `
>
<a
class="emotion-73 emotion-74"
data-testid="business-service-home.domain1"
>
add
</a>
Expand Down Expand Up @@ -965,7 +951,6 @@ exports[`PageManageDomains should render 1`] = `
>
<a
class="emotion-73 emotion-74"
data-testid="business-service-home.domain2"
>
add
</a>
Expand Down Expand Up @@ -1032,15 +1017,14 @@ exports[`PageManageDomains should render 1`] = `
random-test-home
</td>
<td
class="emotion-117 emotion-72"
class="emotion-71 emotion-72"
color="#3570f40D"
title="yca.US"
title="add"
>
<a
class="emotion-73 emotion-74"
data-testid="business-service-home.domain3.testingui"
>
yca.US
add
</a>
</td>
<td
Expand Down Expand Up @@ -1131,7 +1115,6 @@ exports[`PageManageDomains should render 1`] = `
>
<a
class="emotion-73 emotion-74"
data-testid="business-service-home.domain4"
>
add
</a>
Expand Down Expand Up @@ -1202,7 +1185,6 @@ exports[`PageManageDomains should render 1`] = `
>
<a
class="emotion-73 emotion-74"
data-testid="business-service-home.domain4.test1"
>
add
</a>
Expand Down
Loading
Loading