100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Resolved merge conflicts
Robin Dekkers825411d9a3b3
diff --cc ui/app/or-app/src/pages/page-mobile-onboarding.tsindex 85f664f5c,cce3bf71b..bd7c84cbe--- a/ui/app/or-app/src/pages/page-mobile-onboarding.ts+++ b/ui/app/or-app/src/pages/page-mobile-onboarding.ts@@@ -113,50 -106,50 +113,52 @@@ class PageMobileOnboarding<S extends Appublic config?: OnboardingConfig;protected render() {- return html`- ${this.config.pages.map((page, index) => {- return html`- <div class="page-container ${this.pageIndex === index ? "active" :""}">- <div class="page-content">- ${page.type === "default" ? html`- <div><img src="${page.image}" /></div>- <h1>${page.title}</h1>- <p>${page.description}</p>- ` : ``}-- ${page.type === "bottom-image" ? html`- <h1>${page.title}</h1>- <p>${page.description}</p>- <div><img src="${page.image}" /></div>- ` : ``}- </div>-- <div class="next-button" @click="${() => this.nextPage(index)}">- <or-icon icon="chevron-right"></or-icon>+ if(this.active) {+ return html`+ ${this.config.pages.map((page, index) => {+ return html`+ <div class="page-container ${this.pageIndex === index ? "active" :""}">+ <div class="page-content">+ ${page.type === "default" ? html`+ <div><img src="${page.image}" /></div>+ <h1>${page.title}</h1>+ <p>${page.description}</p>+ ` : ``}++ ${page.type === "bottom-image" ? html`+ <h1>${page.title}</h1>+ <p>${page.description}</p>+ <div><img src="${page.image}" /></div>+ ` : ``}+ </div>++ <div class="next-button" @click="${() => this.nextPage(index)}">+ <or-icon icon="chevron-right"></or-icon>+ </div></div>- </div>- `- })}- `;+ `+ })}+ `;+ }}- private async enableProviders() {- if(this.config.pages[this.pageIndex-1].enableProviders) {- this.config.pages[this.pageIndex-1].enableProviders.map(provider => {- manager.console.sendProviderMessage({provider: provider.name, action: provider.action}, true)- })+ private enableProviders(): Promise<any> {+ if(this.config.pages[this.pageIndex].enableProviders) {+ return Promise.all(this.config.pages[this.pageIndex].enableProviders.map(provider => {+ return manager.console.sendProviderMessage({provider: provider.name, action: provider.action, consoleId: manager.console.registration.id}, true);+ }));}+ return Promise.resolve();}-+private nextPage(index) {- if(this.config.pages.length-1 === index) {- window.location.href = this.config.redirect;- window.localStorage.setItem("completedOnboarding", "1");- } else {- this.pageIndex = this.pageIndex+1- }- this.enableProviders();+ this.enableProviders().then(() => {+ if (this.config.pages.length - 1 === index) {+ window.location.href = manager.consoleAppConfig ? manager.consoleAppConfig.url : this.config.redirect;+ window.localStorage.setItem("completedOnboarding", "1");+ } else {+ this.pageIndex = this.pageIndex + 1+ }+ });}}