From 28af02ccddbaf6657cd41285eb7e94a6529f9a8f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 15 Oct 2021 09:53:27 +0100 Subject: [PATCH] wip --- .github/workflows/create-artifacts.yml | 28 ------------------- src/Ombi/ClientApp/src/app/app.component.ts | 3 +- src/Ombi/ClientApp/src/app/app.module.ts | 1 - .../src/app/my-nav/my-nav.component.ts | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/workflows/create-artifacts.yml b/.github/workflows/create-artifacts.yml index c9e166a79..a6ce874b4 100644 --- a/.github/workflows/create-artifacts.yml +++ b/.github/workflows/create-artifacts.yml @@ -63,21 +63,6 @@ jobs: - os: win10-x64 format: zip compression: zip - - os: win10-x86 - format: zip - compression: zip - - os: linux-x64 - format: tar.gz - compression: tar - - os: linux-arm - format: tar.gz - compression: tar - - os: linux-arm64 - compression: tar - format: tar.gz - - os: osx-x64 - compression: tar - format: tar.gz steps: - uses: actions/checkout@v2 @@ -125,16 +110,3 @@ jobs: name: ${{ matrix.os }} path: | ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} - - release: - needs: [ publish, unit-test ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Download Artifacts - id: download - uses: actions/download-artifact@v2 - with: - path: artifacts - diff --git a/src/Ombi/ClientApp/src/app/app.component.ts b/src/Ombi/ClientApp/src/app/app.component.ts index 51d225a06..4b14b464c 100644 --- a/src/Ombi/ClientApp/src/app/app.component.ts +++ b/src/Ombi/ClientApp/src/app/app.component.ts @@ -85,7 +85,8 @@ export class AppComponent implements OnInit { } public ngOnInit() { - this.settingsService.getCustomization().subscribe(x => { + this.customizationFacade.loadCustomziationSettings().subscribe(); + this.customizationFacade.settings$().subscribe(x => { this.customizationSettings = x; if (this.customizationSettings && this.customizationSettings.applicationName) { this.applicationName = this.customizationSettings.applicationName; diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts index b4e78087c..643571b79 100644 --- a/src/Ombi/ClientApp/src/app/app.module.ts +++ b/src/Ombi/ClientApp/src/app/app.module.ts @@ -202,7 +202,6 @@ export function JwtTokenGetter() { StorageService, RequestService, SignalRNotificationService, - CUSTOMIZATION_INITIALIZER, { provide: APP_BASE_HREF, useValue: window["baseHref"] diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts index 15e9df08c..e03e073eb 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts @@ -78,7 +78,7 @@ export class MyNavComponent implements OnInit { this.issuesEnabled = await this.settingsService.issueEnabled().toPromise(); this.settingState.setIssue(this.issuesEnabled); - this.settingsService.getCustomization().subscribe(settings => { + this.customizationFacade.settings$().subscribe(settings => { this.customizationSettings = settings; });