-
Notifications
You must be signed in to change notification settings - Fork 26
Enable Embedded Mode (on top of auth) #2786
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.
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
base: genxp-3600-add-authentication
Are you sure you want to change the base?
Conversation
ee92ac6 to
bf7b828
Compare
c166214 to
980585c
Compare
| <span v-if="!isEmbedded && !newVersions.newSPVersion.newspversion && environment.sp_version"> ServicePulse v{{ environment.sp_version }} </span> | ||
| <span v-if="!isEmbedded && newVersions.newSPVersion.newspversion && environment.sp_version"> | ||
| ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" /> | ||
| <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>) | ||
| </span> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| <span v-if="!isEmbedded && !newVersions.newSPVersion.newspversion && environment.sp_version"> ServicePulse v{{ environment.sp_version }} </span> | |
| <span v-if="!isEmbedded && newVersions.newSPVersion.newspversion && environment.sp_version"> | |
| ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" /> | |
| <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>) | |
| </span> | |
| <template v-else-if="environment.sp_version"> | |
| <span v-if="!newVersions.newSPVersion.newspversion"> ServicePulse v{{ environment.sp_version }} </span> | |
| <span v-else> | |
| ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" /> | |
| <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>) | |
| </span> | |
| </template> |
| } | ||
|
|
||
| private getUrl() { | ||
| if (window.defaultConfig && window.defaultConfig.isEmbedded && window.defaultConfig.service_control_url && window.defaultConfig.service_control_url.length) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| if (window.defaultConfig && window.defaultConfig.isEmbedded && window.defaultConfig.service_control_url && window.defaultConfig.service_control_url.length) { | |
| if (window.defaultConfig?.isEmbedded && window.defaultConfig.service_control_url?.length) { |
| service_control_url: '{{settings.ServiceControlUrl}}', | ||
| monitoring_urls: ['{{settings.MonitoringUrl ?? "!"}}'], | ||
| showPendingRetry: {{(settings.ShowPendingRetry ? "true" : "false")}}, | ||
| isEmbedded: {{(settings.IsEmbedded ? "true" : "false")}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
neater?
| isEmbedded: {{(settings.IsEmbedded ? "true" : "false")}} | |
| isEmbedded: {{(settings.IsEmbedded.ToString().ToLower())}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and above, if so
| /// </summary> | ||
| public static ServicePulseSettings GetFromEnvironmentVariables() | ||
| { | ||
| var serviceControlUrl = Environment.GetEnvironmentVariable("SERVICECONTROL_URL") ?? "http://localhost:33333/api/"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest use of StringBuilder
Alternative to #2782
Reviewer Checklist