Merge pull request #90 from EasyAbp/abp601

Upgrade to ABP 6.0.1
EasyAbp · Nov 21, 2022 · e5b9a47 · e5b9a47
2 parents 1cbb920 + 891f6c7
commit e5b9a47
Show file tree

Hide file tree

Showing 150 changed files with 14,046 additions and 13,996 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -34,6 +34,9 @@ jobs:
       - name: dotnet build
         run: dotnet build -c Release
 
+      - name: dotnet test
+        run: dotnet test -c Release --no-restore --no-build
+
       - name: dotnet pack
         run: dotnet pack -c Release --no-build -o dest
 
@@ -47,6 +50,7 @@ jobs:
           del *.Host.Shared.*
           del *.HttpApi.Host.*
           del *.IdentityServer.*
+          del *.AuthServer.*
           del *.Web.Host.*
           del *.Web.Unified.*
           del *.HttpApi.Client.ConsoleTestApp.*

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>5.3.1</AbpVersion>
+    <AbpVersion>6.0.1</AbpVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/angular/package.json b/angular/package.json
@@ -12,11 +12,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~5.3.1",
-    "@abp/ng.theme.basic": "~5.3.1",
-    "@abp/ng.identity": "~5.3.1",
-    "@abp/ng.tenant-management": "~5.3.1",
-    "@abp/ng.setting-management": "~5.3.1",
+    "@abp/ng.account": "~6.0.1",
+    "@abp/ng.theme.basic": "~6.0.1",
+    "@abp/ng.identity": "~6.0.1",
+    "@abp/ng.tenant-management": "~6.0.1",
+    "@abp/ng.setting-management": "~6.0.1",
     "@angular/animations": "~8.2.14",
     "@angular/common": "~8.2.14",
     "@angular/compiler": "~8.2.14",
@@ -57,4 +57,4 @@
     "tslint": "~5.15.0",
     "typescript": "~3.5.3"
   }
-}
+}
diff --git a/docs/README.md b/docs/README.md
@@ -5,7 +5,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=//PackageReference[@Include=%27Volo.Abp.Ddd.Domain%27]/@Version&url=https://raw.githubusercontent.com/EasyAbp/Abp.SettingUi/develop/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/Abp.SettingUi?style=social)](https://www.github.com/EasyAbp/Abp.SettingUi)
 
 An [ABP](http://abp.io) module used to manage ABP settings

diff --git a/docs/README_zh-Hans.md b/docs/README_zh-Hans.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=//PackageReference[@Include=%27Volo.Abp.Ddd.Domain%27]/@Version&url=https://raw.githubusercontent.com/EasyAbp/Abp.SettingUi/develop/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/Abp.SettingUi?style=social)](https://www.github.com/EasyAbp/Abp.SettingUi)
 
 一个用来管理[ABP](http://abp.io)设置的模块

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj b/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj
@@ -13,13 +13,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="$(AbpVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj b/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj
@@ -14,13 +14,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Emailing" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="$(AbpVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <ProjectReference Include="..\MyAbpApp.Application.Contracts\MyAbpApp.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore\MyAbpApp.EntityFrameworkCore.csproj" />
   </ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="$(AbpVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj
@@ -12,16 +12,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Emailing" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="$(AbpVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj b/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj
@@ -9,15 +9,15 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MyAbpApp.Domain\MyAbpApp.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj
@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="$(AbpVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj
@@ -13,12 +13,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="$(AbpVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
@@ -42,16 +42,16 @@
     <ProjectReference Include="..\MyAbpApp.Application\MyAbpApp.Application.csproj" />
     <ProjectReference Include="..\MyAbpApp.HttpApi\MyAbpApp.HttpApi.csproj" />
     <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore\MyAbpApp.EntityFrameworkCore.csproj" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.3" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Identity.Web" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="5.3.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="5.3.1" />
-	<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="5.3.1" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Web" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="$(AbpVersion)" />
+	<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="$(AbpVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/abp.resourcemapping.js b/sample/MyAbpApp/src/MyAbpApp.Web/abp.resourcemapping.js
@@ -1,8 +1,11 @@
 module.exports = {
     aliases: {
-        
+
     },
+    clean: [
+
+    ],
     mappings: {
-        
+
     }
 };
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/gulpfile.js b/sample/MyAbpApp/src/MyAbpApp.Web/gulpfile.js
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/package.json b/sample/MyAbpApp/src/MyAbpApp.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/core/abp.js b/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/core/abp.js
@@ -372,7 +372,9 @@ var abp = abp || {};
             setTimeout(function () {
                 if (element) {
                     element.classList.remove('abp-block-area-disappearing');
-                    element.parentElement.removeChild(element);
+                    if (element.parentElement) {
+                        element.parentElement.removeChild(element);
+                    }
                 }
             }, 250);
         }