Skip to content
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

Fix QR code warning showing when not required #875

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Fix QR code warning showing when not required #875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions webapp/src/components/QRCode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
{{ refcode }}
</div>
</div>
<div class="alert alert-info">
QR_CODE_RESOLVER_URL is not set for this deployment.<br />
<div v-if="!federatedQR" class="alert alert-info">
QR_CODE_RESOLVER_URL is not set to the federation resolver URL for this deployment.<br />
Links embedded within QR codes generated here will only work if this <i>datalab</i> instance
remains at the same URL.<br /><br />

Expand Down Expand Up @@ -58,6 +58,9 @@ export default {
};
},
computed: {
federatedQR() {
return FEDERATION_QR_CODE_RESOLVER_URL == QR_CODE_RESOLVER_URL;
},
QRCodeUrl() {
// If the QR_CODE_RESOLVER_URL is not set, use the API_URL
// with the redirect-to-ui option
Expand Down