merge

.github/workflows/chromatic.yml

@@ -37,7 +37,7 @@ jobs:
           exitOnceUploaded: true
 
       - name: Publish to Chromatic and auto accept changes
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
         uses: chromaui/action@v1
         with:
           projectToken: 7c47e1a1a4bd

.github/workflows/cypress.yml

@@ -34,16 +34,28 @@ jobs:
     - name: Install Frontend Deps
       run: yarn --cwd ./src/Ombi/ClientApp install
 
-    - name: Start Frontend
+    - name: Build Frontend
-      run: |
+      run: yarn --cwd ./src/Ombi/ClientApp build
-          nohup yarn --cwd ./src/Ombi/ClientApp start &
 
-    - name: Install Automation Deps
+    - name: Build Docker Image
-      run: yarn --cwd ./tests install
+      run: docker build -t ombi src/
 
-    - name: Start Backend
+    - name: Run Docker Image
-      run: |
+      run: nohup docker run --rm -p 5000:5000 ombi &
-          nohup dotnet run --project ./src/Ombi -- --host http://*:3577 &
+
+    - name: Sleep for server to start
+      run: sleep 20
+
+    # - name: Start Frontend
+    #   run: |
+    #       nohup yarn --cwd ./src/Ombi/ClientApp start &
+
+    # - name: Install Automation Deps
+    #   run: yarn --cwd ./tests install
+
+    # - name: Start Backend
+    #   run: |
+    #       nohup dotnet run --project ./src/Ombi -- --host http://*:3577 &
 
     - name: Cypress Tests
       uses: cypress-io/github-action@v2.8.2
@@ -52,7 +64,7 @@ jobs:
         browser: chrome
         headless: true
         working-directory: tests
-        wait-on: http://localhost:3577/
+        wait-on: http://localhost:5000/
         # 10 minutes
         wait-on-timeout: 600
       env:

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [4.22.4](https://github.com/Ombi-app/Ombi/compare/v4.22.3...v4.22.4) (2022-08-04)
+
+
+### Bug Fixes
+
+* :bug: Fixed missing externals ([#4712](https://github.com/Ombi-app/Ombi/issues/4712)) ([fcc1eaa](https://github.com/Ombi-app/Ombi/commit/fcc1eaaa377683dcdc81d62a2a688fb0c4490c7b))
+* fixed trakt image not loading when base url present ([#4711](https://github.com/Ombi-app/Ombi/issues/4711)) ([f102dcf](https://github.com/Ombi-app/Ombi/commit/f102dcf751c2eb62ebfe30f9f8e4b2ad863c3b0d))
+* **translations:** 🌐 New translations from Crowdin [skip ci] ([#4713](https://github.com/Ombi-app/Ombi/issues/4713)) ([ff142b0](https://github.com/Ombi-app/Ombi/commit/ff142b09abbb2f9540387284222552e6e12639fe))
+
+
+
 ## [4.22.3](https://github.com/Ombi-app/Ombi/compare/v4.22.2...v4.22.3) (2022-07-28)
 
 
@@ -350,12 +361,3 @@
 
 
 
-## [4.15.1](https://github.com/Ombi-app/Ombi/compare/v4.15.0...v4.15.1) (2022-03-18)
-
-
-### Bug Fixes
-
-* **mediaserver:** fixed an issue where we were not detecting available content correctly [#4542](https://github.com/Ombi-app/Ombi/issues/4542) ([9cdd6f4](https://github.com/Ombi-app/Ombi/commit/9cdd6f41cdab8825a984905c089611409c53c753))
-
-
-

README.md

@@ -809,6 +809,13 @@ Here are some of the features Ombi has:
             <sub><b>Patrick Weber</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/mkgeeky">
+            <img src="https://avatars.githubusercontent.com/u/68811367?v=4" width="50;" alt="mkgeeky"/>
+            <br />
+            <sub><b>Mkgeeky</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/sir-marv">
             <img src="https://avatars.githubusercontent.com/u/3598205?v=4" width="50;" alt="sir-marv"/>

src/.dockerignore

@@ -0,0 +1,285 @@
+**/bin/
+**/obj/
+**/.angular/
+**/node_modules/
+.gitignore
+.git/
+
+
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/
+tools/Cake.CoreCLR
+.vscode
+tools
+.dotnet
+Dockerfile
+
+# .env file contains default environment variables for docker
+.env
+.git/

src/Ombi/ClientApp/.storybook/main.js

@@ -13,9 +13,8 @@ module.exports = {
   "core": {
     "builder": "@storybook/builder-webpack5"
   },
-  "staticDirs": [
+    "staticDirs": [{ from: '../../wwwroot/images', to: 'images' }, { from: '../../wwwroot/translations', to: 'translations'}],
-    '../../wwwroot/images',
+  "features": {
-    '../../wwwroot/translations',
+    interactionsDebugger: true,
-    "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
+  }
-  ]
 }

src/Ombi/ClientApp/.storybook/preview-body.html

@@ -2,4 +2,8 @@
     .test-class {
         background-color: purple;
     }
+
+    body {
+        background: #0f171f;
+    }
 </style>

src/Ombi/ClientApp/package.json

@@ -82,6 +82,7 @@
     "@storybook/angular": "^6.5.9",
     "@storybook/builder-webpack5": "^6.5.9",
     "@storybook/cli": "^6.5.9",
+    "@storybook/jest": "^0.0.10",
     "@storybook/manager-webpack5": "^6.5.9",
     "@storybook/testing-library": "^0.0.13",
     "@storybook/preset-scss": "^1.0.3",

src/Ombi/ClientApp/src/app/components/image/image.component.html

@@ -1 +1 @@
-<img src="{{src}}" (onError)="onError($event)" [class]="class" [id]="id" [style]="style"/>
+<img src="{{src}}" (error)="onError($event)" [class]="class" [id]="id" [style]="style"/>

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html

@@ -10,9 +10,8 @@
 
         <social-icons [homepage]="movie.homepage" [theMoviedbId]="movie.id"
             [hasTrailer]="movie.videos?.results?.length > 0" [imdbId]="movie.imdbId"
-            [twitter]="movie.externalIds.twitterId" [facebook]="movie.externalIds.facebookId"
+            [twitter]="movie.externalIds?.twitterId" [facebook]="movie.externalIds?.facebookId"
-            [instagram]="movie.externalIds.instagramId" [available]="movie.available" [plexUrl]="movie.plexUrl"
+            [instagram]="movie.externalIds?.instagramId" [available]="movie.available" [isAdmin]="isAdmin"
-            [embyUrl]="movie.embyUrl" [jellyfinUrl]="movie.jellyfinUrl" [isAdmin]="isAdmin"
             [canShowAdvanced]="showAdvanced && movieRequest" [type]="requestType" [has4KRequest]="movie.has4KRequest"
             (openTrailer)="openDialog()" (onAdvancedOptions)="openAdvancedOptions()"
             (onReProcessRequest)="reProcessRequest(false)" (onReProcess4KRequest)="reProcessRequest(true)">

src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html

@@ -11,7 +11,7 @@
         <i matTooltip="The TV DB" class="fas fa-tv fa-2x grow-social"></i>
     </a>
 
-    <a *ngIf="hasTrailer" class="media-icons youtube" (click)="openDialog()">
+    <a *ngIf="hasTrailer" data-testid="social-trailer" class="media-icons youtube" (click)="openDialog()">
         <i matTooltip="Trailer" class="fab fa-youtube fa-2x grow-social"></i>
     </a>
     <a *ngIf="imdbId" class="media-icons imdb" [href]="doNotAppend ? imdbid : 'https://imdb.com/title/' + imdbId" target="_blank">

src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss

@@ -14,6 +14,8 @@ a.media-icons img{
     padding: 0;
 }
 
+
+
 button.admin-cog{
     margin-left:40px;
     color:$ombi-active;

src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.stories.ts

@@ -0,0 +1,67 @@
+// also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
+import { APP_BASE_HREF } from '@angular/common';
+import { Story, Meta, moduleMetadata } from '@storybook/angular';
+import { SocialIconsComponent } from './social-icons.component';
+import { MatMenuModule } from "@angular/material/menu";
+import { RequestType } from '../../../../interfaces';
+import { userEvent, waitFor, within } from '@storybook/testing-library';
+import { expect } from '@storybook/jest';
+
+// More on default export: https://storybook.js.org/docs/angular/writing-stories/introduction#default-export
+export default {
+  title: 'Social Icons',
+  component: SocialIconsComponent,
+  decorators: [
+    moduleMetadata({
+      providers: [
+        {
+          provide: APP_BASE_HREF,
+          useValue: ""
+      },
+      ],
+      imports: [MatMenuModule]
+    })
+  ]
+} as Meta;
+
+// More on component templates: https://storybook.js.org/docs/angular/writing-stories/introduction#using-args
+const Template: Story<SocialIconsComponent> = (args: SocialIconsComponent) => ({
+  props: args,
+});
+
+export const All = Template.bind({});
+// More on args: https://storybook.js.org/docs/angular/writing-stories/args
+All.args = {
+  twitter: "test",
+  homepage: "test",
+  theMoviedbId: 1,
+  hasTrailer: true,
+  imdbId: "test",
+  tvdbId: "test",
+  facebook: "test",
+  instagram: "test",
+  available: true,
+  doNotAppend: false,
+  type: RequestType.movie,
+  isAdmin: false,
+  canShowAdvanced: false,
+  has4KRequest: false
+};
+
+export const Admin = Template.bind({});
+Admin.args = {
+  twitter: "test",
+  homepage: "test",
+  theMoviedbId: 1,
+  hasTrailer: true,
+  imdbId: "test",
+  tvdbId: "test",
+  facebook: "test",
+  instagram: "test",
+  available: true,
+  doNotAppend: false,
+  type: RequestType.movie,
+  isAdmin: true,
+  canShowAdvanced: true,
+  has4KRequest: true
+};

src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts

@@ -1,4 +1,5 @@
-import { Component, Input, Output, EventEmitter } from "@angular/core";
+import { APP_BASE_HREF } from "@angular/common";
+import { Component, Input, Output, EventEmitter, Inject } from "@angular/core";
 import { RequestType } from "../../../../interfaces";
 @Component({
     selector: "social-icons",
@@ -11,13 +12,9 @@ export class SocialIconsComponent {
     @Input() hasTrailer: boolean;
     @Input() imdbId: string;
     @Input() tvdbId: string;
-    @Input() twitter: string;
+    @Input() twitter: string|undefined;
-    @Input() facebook: string;
+    @Input() facebook: string|undefined;
-    @Input() instagram: string;
+    @Input() instagram: string|undefined;
-    @Input() available: boolean;
-    @Input() plexUrl: string;
-    @Input() embyUrl: string;
-    @Input() jellyfinUrl: string;
     @Input() doNotAppend: boolean;
     @Input() type: RequestType;
 
@@ -31,6 +28,13 @@ export class SocialIconsComponent {
     @Output() onReProcess4KRequest: EventEmitter<any> = new EventEmitter();
 
     public RequestType = RequestType;
+    public baseUrl: string = "";
+
+    constructor (@Inject(APP_BASE_HREF) public href: string) {
+        if (this.href.length > 1) {
+            this.baseUrl = this.href;
+        }
+    }
 
 
     public openDialog() {

src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html

@@ -21,15 +21,11 @@
                     [homepage]="tv.homepage"
                     [theMoviedbId]="tv.id"
                     [hasTrailer]="tv.trailer"
-                    [twitter]="tv.externalIds.twitterId"
+                    [twitter]="tv.externalIds?.twitterId"
-                    [facebook]="tv.externalIds.facebookId"
+                    [facebook]="tv.externalIds?.facebookId"
-                    [instagram]="tv.externalIds.instagramId"
+                    [instagram]="tv.externalIds?.instagramId"
                     (openTrailer)="openDialog()"
                     [imdbId]="tv.imdbId"
-                    [available]="tv.available || tv.partlyAvailable"
-                    [plexUrl]="tv.plexUrl"
-                    [embyUrl]="tv.embyUrl"
-                    [jellyfinUrl]="tv.jellyfinUrl"
                     [isAdmin]="isAdmin"
                     [canShowAdvanced]="showAdvanced && showRequest"
                     [type]="requestType"

src/Ombi/ClientApp/src/app/wizard/plex/plex.component.html

@@ -21,7 +21,7 @@
             <div class="plex-buttons">
                 <div class="form-group">
                     <div style="text-align: center; margin-top: 20px">
-                        <button (click)="requestAuthToken()" mat-raised-button color="primary" class="viewon-btn standard" [disabled]="completed">Request Token <i class="fas fa-key"></i></button>
+                        <button (click)="requestAuthToken()" mat-raised-button color="primary" class="viewon-btn standard" [disabled]="completed">Request Token <i class="fa-solid fa-key"></i></button>
                     </div>
                 </div>
                 <p class="text-center space-or">OR</p>

src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html

@@ -16,9 +16,9 @@
                   <br />
                   <div class="social-media">
                     <ul class="fa-ul">
-                      <li><a href="https://discord.gg/Sa7wNWb" target="_blank"><span class="fa-li"><i class="fab fa-discord"></i></span>Ombi Discord</a>
+                      <li><a href="https://discord.gg/Sa7wNWb" target="_blank"><span class="fa-li"><i class="fa-brands fa-discord"></i></span>Ombi Discord</a>
-                      <li><a href="https://github.com/Ombi-app/Ombi" target="_blank"><span class="fa-li"><i class="fab fa-github"></i></span>Ombi Github</a>
+                      <li><a href="https://github.com/Ombi-app/Ombi" target="_blank"><span class="fa-li"><i class="fa-brands fa-github"></i></span>Ombi Github</a>
-                      <li><a href="https://docs.ombi.app/" target="_blank"><span class="fa-li"><i class="fas fa-book"></i></span>Ombi Documentation</a>
+                      <li><a href="https://docs.ombi.app/" target="_blank"><span class="fa-li"><i class="fa-solid fa-book"></i></span>Ombi Documentation</a>
                     </ul>
                   </div>
                 </div>

src/Ombi/appsettings.json

@@ -4,7 +4,7 @@
     "LogLevel": {
       "Default": "Warning",
       "System": "Warning",
-      "Microsoft": "None",
+      "Microsoft": "Warning",
       "Hangfire": "None",
       "System.Net.Http.HttpClient.health-checks": "Warning",
       "HealthChecks": "Warning"

src/Ombi/wwwroot/translations/da.json

@@ -65,7 +65,7 @@
     },
     "ErrorPages": {
         "NotFound": "Siden blev ikke fundet",
-        "SomethingWentWrong": "Noget gik galt!"
+        "SomethingWentWrong": "Something went wrong!"
     },
     "NavigationBar": {
         "Discover": "Opdag",
@@ -212,13 +212,13 @@
         "RequestPanel": {
             "Delete": "Slet Anmodning",
             "Approve": "Godkend Andmodning",
-            "Deny": "Afvis Request",
+            "Deny": "Deny Request",
             "Approve4K": "Godkend 4K Anmodning",
-            "Deny4K": "Afvis 4K Request",
+            "Deny4K": "Deny 4K Request",
             "ChangeAvailability": "Markér som tilgængelig",
             "Deleted": "De valgte elementer blev slettet",
             "Approved": "De valgte elementer blev godkendt",
-            "Denied": "De valgte elementer blev afvist"
+            "Denied": "Successfully denied selected items"
         },
         "SuccessfullyApproved": "Godkendt",
         "SuccessfullyDeleted": "Anmodningen blev slettet",

src/dockerfile

@@ -0,0 +1,76 @@
+# build stage
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS build
+LABEL exclaimer-signature-analytics-build=true
+ARG VERSION=1.0.0
+WORKDIR /source
+
+COPY ["Ombi.sln", "."]
+COPY ["Ombi/Ombi.csproj", "Ombi/"]
+COPY ["Ombi.Api/Ombi.Api.csproj", "Ombi.Api/"]
+COPY ["Ombi.Api.CloudService/Ombi.Api.CloudService.csproj", "Ombi.Api.CloudService/"]
+COPY ["Ombi.Api.CouchPotato/Ombi.Api.CouchPotato.csproj", "Ombi.Api.CouchPotato/"]
+COPY ["Ombi.Api.Discord/Ombi.Api.Discord.csproj", "Ombi.Api.Discord/"]
+COPY ["Ombi.Api.DogNzb/Ombi.Api.DogNzb.csproj", "Ombi.Api.DogNzb/"]
+COPY ["Ombi.Api.Emby/Ombi.Api.Emby.csproj", "Ombi.Api.Emby/"]
+COPY ["Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj", "Ombi.Api.FanartTv/"]
+COPY ["Ombi.Api.Github/Ombi.Api.Github.csproj", "Ombi.Api.Github/"]
+COPY ["Ombi.Api.Gotify/Ombi.Api.Gotify.csproj", "Ombi.Api.Gotify/"]
+COPY ["Ombi.Api.GroupMe/Ombi.Api.GroupMe.csproj", "Ombi.Api.GroupMe/"]
+COPY ["Ombi.Api.Jellyfin/Ombi.Api.Jellyfin.csproj", "Ombi.Api.Jellyfin/"]
+COPY ["Ombi.Api.Lidarr/Ombi.Api.Lidarr.csproj", "Ombi.Api.Lidarr/"]
+COPY ["Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj", "Ombi.Api.Mattermost/"]
+COPY ["Ombi.Api.MediaServer/Ombi.Api.MediaServer.csproj", "Ombi.Api.MediaServer/"]
+COPY ["Ombi.Api.MusicBrainz/Ombi.Api.MusicBrainz.csproj", "Ombi.Api.MusicBrainz/"]
+COPY ["Ombi.Api.Notifications/Ombi.Api.Notifications.csproj", "Ombi.Api.Notifications/"]
+COPY ["Ombi.Api.Plex/Ombi.Api.Plex.csproj", "Ombi.Api.Plex/"]
+COPY ["Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj", "Ombi.Api.Pushbullet/"]
+COPY ["Ombi.Api.Pushover/Ombi.Api.Pushover.csproj", "Ombi.Api.Pushover/"]
+COPY ["Ombi.Api.Radarr/Ombi.Api.Radarr.csproj", "Ombi.Api.Radarr/"]
+COPY ["Ombi.Api.RottenTomatoes/Ombi.Api.RottenTomatoes.csproj", "Ombi.Api.RottenTomatoes/"]
+COPY ["Ombi.Api.Service/Ombi.Api.Service.csproj", "Ombi.Api.Service/"]
+COPY ["Ombi.Api.SickRage/Ombi.Api.SickRage.csproj", "Ombi.Api.SickRage/"]
+COPY ["Ombi.Api.Slack/Ombi.Api.Slack.csproj", "Ombi.Api.Slack/"]
+COPY ["Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj", "Ombi.Api.Sonarr/"]
+COPY ["Ombi.Api.Telegram/Ombi.Api.Telegram.csproj", "Ombi.Api.Telegram/"]
+COPY ["Ombi.Api.Trakt/Ombi.Api.Trakt.csproj", "Ombi.Api.Trakt/"]
+COPY ["Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj", "Ombi.Api.TvMaze/"]
+COPY ["Ombi.Api.Webhook/Ombi.Api.Webhook.csproj", "Ombi.Api.Webhook/"]
+COPY ["Ombi.Core/Ombi.Core.csproj", "Ombi.Core/"]
+COPY ["Ombi.DependencyInjection/Ombi.DependencyInjection.csproj", "Ombi.DependencyInjection/"]
+COPY ["Ombi.HealthChecks/Ombi.HealthChecks.csproj", "Ombi.HealthChecks/"]
+COPY ["Ombi.Hubs/Ombi.Hubs.csproj", "Ombi.Hubs/"]
+COPY ["Ombi.I18n/Ombi.I18n.csproj", "Ombi.I18n/"]
+COPY ["Ombi.Helpers/Ombi.Helpers.csproj", "Ombi.Helpers/"]
+COPY ["Ombi.Mapping/Ombi.Mapping.csproj", "Ombi.Mapping/"]
+COPY ["Ombi.Notifications/Ombi.Notifications.csproj", "Ombi.Notifications/"]
+COPY ["Ombi.Notifications.Templates/Ombi.Notifications.Templates.csproj", "Ombi.Notifications.Templates/"]
+COPY ["Ombi.Schedule/Ombi.Schedule.csproj", "Ombi.Schedule/"]
+COPY ["Ombi.Settings/Ombi.Settings.csproj", "Ombi.Settings/"]
+COPY ["Ombi.Store/Ombi.Store.csproj", "Ombi.Store/"]
+COPY ["Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj", "Ombi.TheMovieDbApi/"]
+COPY ["Ombi.Api.Twilio/Ombi.Api.Twilio.csproj", "Ombi.Api.Twilio/"]
+COPY ["Ombi.Updater/Ombi.Updater.csproj", "Ombi.Updater/"]
+RUN dotnet restore Ombi/Ombi.csproj
+COPY . .
+
+# copy and build app
+WORKDIR /source/Ombi
+COPY ["Ombi/", "."]
+RUN dotnet build "Ombi.csproj" -c release
+
+
+FROM build AS publish
+
+RUN dotnet publish "Ombi.csproj" -c release --no-restore --no-build -o /app/publish
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim as base
+WORKDIR /src/Ombi
+EXPOSE 5000
+
+FROM base AS final
+WORKDIR /src/Ombi
+COPY --from=publish /app/publish .
+COPY ["Ombi/ClientApp/dist", "/src/Ombi/ClientApp/dist/"]
+ENTRYPOINT ["dotnet", "Ombi.dll"]
+
+

tests/cypress.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://on.cypress.io/cypress.schema.json",
   "supportFile": "cypress/support/index.ts",
-  "baseUrl": "http://localhost:3577",
+  "baseUrl": "http://localhost:5000",
   "integrationFolder": "cypress/tests",
   "testFiles": "**/*.spec.ts*",
   "watchForFileChanges": true,

tests/cypress/config/regression.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://on.cypress.io/cypress.schema.json",
     "supportFile": "cypress/support/index.ts",
-    "baseUrl": "http://localhost:3577",
+    "baseUrl": "http://localhost:5000",
     "integrationFolder": "cypress/tests",
     "testFiles": "**/*.spec.ts*",
     "retries": {

tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts

@@ -68,15 +68,16 @@ describe("TV Details Buttons", () => {
 
 
   it("Issues Enabled", () => {
-    cy.intercept("GET", "Settings/issuesenabled", 'true');
+    cy.intercept("GET", "**/Settings/issuesenabled", 'true').as('issuesEnabled');
 
     cy.visit("/details/tv/1399");
 
+    cy.wait('@issuesEnabled');
     Page.reportIssueButton.should('be.visible');
   });
 
   it("Issues Disabled", () => {
-    cy.intercept("GET", "Settings/issuesenabled", 'false');
+    cy.intercept("GET", "**/Settings/issuesenabled", 'false');
 
     Page.visit("1399");
 

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.22.3"
+  "version": "4.22.4"
 }