Merge pull request #1352 from mregni/features/ES-1341

Using Name to display in movie table #1341
mregni · Aug 31, 2020 · 20e88b7 · 20e88b7
2 parents 6b19a58 + f1d68b5
commit 20e88b7
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/EmbyStat.Controllers/EmbyStat.Controllers.csproj b/EmbyStat.Controllers/EmbyStat.Controllers.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.0.0" />
-    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.6.2" />
+    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.7.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
   </ItemGroup>
 

diff --git a/EmbyStat.Controllers/Movie/MovieColumnViewModel.cs b/EmbyStat.Controllers/Movie/MovieColumnViewModel.cs
@@ -5,7 +5,7 @@ namespace EmbyStat.Controllers.Movie
     public class MovieColumnViewModel
     {
         public string Id { get; set; }
-        public string OriginalTitle { get; set; }
+        public string Name { get; set; }
         public string Container { get; set; }
         public string[] Subtitles { get; set; }
         public string[] AudioLanguages { get; set; }

diff --git a/EmbyStat.Repositories/EmbyStat.Repositories.csproj b/EmbyStat.Repositories/EmbyStat.Repositories.csproj
@@ -10,7 +10,7 @@
     <ProjectGuid>{BA9CD238-9261-44C7-A90F-F3DA61ED0A41}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.6.2" />
+    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.7.0" />
     <PackageReference Include="LiteDB" Version="5.0.8" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="MWKL.AspNetCore.Identity.LiteDB" Version="1.0.2" />

diff --git a/EmbyStat.Services/EmbyStat.Services.csproj b/EmbyStat.Services/EmbyStat.Services.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.6.2" />
+    <PackageReference Include="DevExtreme.AspNet.Data" Version="2.7.0" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.7.12" />
     <PackageReference Include="MWKL.AspNetCore.Identity.LiteDB" Version="1.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/EmbyStat.Services/Models/DataGrid/MovieColumn.cs b/EmbyStat.Services/Models/DataGrid/MovieColumn.cs
@@ -5,7 +5,7 @@ namespace EmbyStat.Services.Models.DataGrid
     public class MovieColumn
     {
         public string Id { get; set; }
-        public string OriginalTitle { get; set; }
+        public string Name { get; set; }
         public string Container { get; set; }
         public string[] Subtitles { get; set; }
         public string[] AudioLanguages { get; set; }

diff --git a/EmbyStat.Services/MovieService.cs b/EmbyStat.Services/MovieService.cs
@@ -101,7 +101,7 @@ public Page<MovieColumn> GetMoviePage(int skip, int take, string sort, Filter[]
                 .Select(x => new MovieColumn
                 {
                     Id = x.Id,
-                    OriginalTitle = x.OriginalTitle,
+                    Name = x.Name,
                     AudioLanguages = x.AudioStreams.Select(y => y.Language).ToArray(),
                     Banner = x.Banner,
                     CommunityRating = x.CommunityRating,

diff --git a/EmbyStat.Web/ClientApp/src/pages/movies/MoviesList/index.tsx b/EmbyStat.Web/ClientApp/src/pages/movies/MoviesList/index.tsx
@@ -92,7 +92,7 @@ const MovieList = (props: Props) => {
   };
 
   const getTitleValue = (data) => {
-    return data.originalTitle;
+    return data.name;
   };
 
   const getGenresValues = (data) => {

diff --git a/EmbyStat.Web/ClientApp/src/shared/models/movie/MovieColumn.tsx b/EmbyStat.Web/ClientApp/src/shared/models/movie/MovieColumn.tsx
@@ -1,6 +1,6 @@
 export interface MovieColumn {
   id: string;
-  originalTitle: string;
+  name: string;
   container: string;
   subtitles: string[];
   audioLanguages: string[];

diff --git a/EmbyStat.Web/EmbyStat.Web.csproj b/EmbyStat.Web/EmbyStat.Web.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="AutoMapper" Version="10.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="FluentMigrator.Runner" Version="3.2.8" />
+    <PackageReference Include="FluentMigrator.Runner" Version="3.2.9" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.7.12" />
     <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
     <PackageReference Include="Hangfire.RecurringJobExtensions" Version="1.1.6" />
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.2.2" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
     <PackageReference Include="Microsoft.Packaging.Tools.Trimming" Version="1.1.0-preview1-26619-01" />
     <PackageReference Include="MWKL.AspNetCore.Identity.LiteDB" Version="1.0.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />

diff --git a/Tests.Unit/Tests.Unit.csproj b/Tests.Unit/Tests.Unit.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="AutoMapper" Version="10.0.0" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />