#26399 include in 23.10.24 LTS

dotCMS · Nov 4, 2024 · b05398b · b05398b
1 parent 125c179
commit b05398b
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/...rc/app/portlets/dot-containers/container-list/dot-container-list-resolver.service.spec.ts b/...rc/app/portlets/dot-containers/container-list/dot-container-list-resolver.service.spec.ts
@@ -11,6 +11,7 @@ import {
     CoreWebService,
     DotcmsConfigService,
     LoggerService,
+    LoginService,
     StringUtils,
     UserModel
 } from '@dotcms/dotcms-js';
@@ -49,6 +50,10 @@ describe('DotContainerListResolverService', () => {
                                 offset: -21600000
                             })
                     }
+                },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
                 }
             ]
         });

diff --git a/.../app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.spec.ts b/.../app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.spec.ts
@@ -16,7 +16,12 @@ import { TooltipModule } from 'primeng/tooltip';
 import { of } from 'rxjs/internal/observable/of';
 
 import { DotMessageService } from '@dotcms/data-access';
-import { CoreWebService, CoreWebServiceMock, DotcmsConfigService } from '@dotcms/dotcms-js';
+import {
+    CoreWebService,
+    CoreWebServiceMock,
+    DotcmsConfigService,
+    LoginService
+} from '@dotcms/dotcms-js';
 import { DotAutofocusDirective, DotMessagePipe, DotRelativeDatePipe } from '@dotcms/ui';
 import {
     DotcmsConfigServiceMock,
@@ -155,7 +160,11 @@ describe('DotPagesListingPanelComponent', () => {
                     { provide: DotcmsConfigService, useClass: DotcmsConfigServiceMock },
                     { provide: CoreWebService, useClass: CoreWebServiceMock },
                     { provide: DotPageStore, useClass: storeMock },
-                    { provide: DotMessageService, useValue: messageServiceMock }
+                    { provide: DotMessageService, useValue: messageServiceMock },
+                    {
+                        provide: LoginService,
+                        useValue: { currentUserLanguageId: 'en-US' }
+                    }
                 ]
             }).compileComponents();
         });

diff --git a/...c/app/portlets/dot-templates/dot-template-list/dot-template-list-resolver.service.spec.ts b/...c/app/portlets/dot-templates/dot-template-list/dot-template-list-resolver.service.spec.ts
@@ -12,6 +12,7 @@ import {
     CoreWebService,
     DotcmsConfigService,
     LoggerService,
+    LoginService,
     StringUtils,
     UserModel
 } from '@dotcms/dotcms-js';
@@ -49,6 +50,10 @@ describe('DotTemplateListResolverService', () => {
                                 offset: -21600000
                             })
                     }
+                },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
                 }
             ]
         });

diff --git a/...s-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts b/...s-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts
@@ -442,14 +442,17 @@ describe('DotTemplateListComponent', () => {
                 DotHttpErrorManagerService,
                 DotAlertConfirmService,
                 ConfirmationService,
-                LoginService,
                 DotcmsEventsService,
                 DotEventsSocket,
                 DotcmsConfigService,
                 DotMessageDisplayService,
                 DialogService,
                 DotSiteBrowserService,
-                { provide: DotFormatDateService, useClass: DotFormatDateServiceMock }
+                { provide: DotFormatDateService, useClass: DotFormatDateServiceMock },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
+                }
             ],
             imports: [
                 DotListingDataTableModule,

diff --git a/...-compare/components/dot-content-compare-table/dot-content-compare-table.component.spec.ts b/...-compare/components/dot-content-compare-table/dot-content-compare-table.component.spec.ts
@@ -14,7 +14,7 @@ import { TableModule } from 'primeng/table';
 import { DotContentComparePreviewFieldComponent } from '@components/dot-content-compare/components/fields/dot-content-compare-preview-field/dot-content-compare-preview-field.component';
 import { DotContentCompareTableData } from '@components/dot-content-compare/store/dot-content-compare.store';
 import { DotMessageService } from '@dotcms/data-access';
-import { DotcmsConfigService } from '@dotcms/dotcms-js';
+import { DotcmsConfigService, LoginService } from '@dotcms/dotcms-js';
 import { DotFormatDateService, DotMessagePipe, DotRelativeDatePipe } from '@dotcms/ui';
 import { MockDotMessageService } from '@dotcms/utils-testing';
 import { DotDiffPipeModule } from '@pipes/dot-diff/dot-diff.pipe.module';
@@ -309,6 +309,10 @@ describe('DotContentCompareTableComponent', () => {
                                 offset: -21600000
                             })
                     }
+                },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
                 }
             ]
         });

diff --git a/...tcms-ui/src/app/view/components/dot-content-compare/dot-content-compare.component.spec.ts b/...tcms-ui/src/app/view/components/dot-content-compare/dot-content-compare.component.spec.ts
@@ -13,7 +13,7 @@ import { dotContentCompareTableDataMock } from '@components/dot-content-compare/
 import { DotContentCompareModule } from '@components/dot-content-compare/dot-content-compare.module';
 import { DotContentCompareStore } from '@components/dot-content-compare/store/dot-content-compare.store';
 import { DotAlertConfirmService, DotMessageService } from '@dotcms/data-access';
-import { DotcmsConfigService } from '@dotcms/dotcms-js';
+import { DotcmsConfigService, LoginService } from '@dotcms/dotcms-js';
 import { DotCMSContentlet } from '@dotcms/dotcms-models';
 import { DotFormatDateService } from '@dotcms/ui';
 import { MockDotMessageService } from '@dotcms/utils-testing';
@@ -87,6 +87,10 @@ describe('DotContentCompareComponent', () => {
                                 offset: -21600000
                             })
                     }
+                },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
                 }
             ]
         });

diff --git a/...ms-ui/src/app/view/components/dot-content-compare/store/dot-content-compare.store.spec.ts b/...ms-ui/src/app/view/components/dot-content-compare/store/dot-content-compare.store.spec.ts
@@ -5,7 +5,7 @@ import { TestBed } from '@angular/core/testing';
 import { DotContentCompareStore } from '@components/dot-content-compare/store/dot-content-compare.store';
 import { MockDotHttpErrorManagerService } from '@dotcms/app/test/dot-http-error-manager.service.mock';
 import { DotContentletService, DotContentTypeService } from '@dotcms/data-access';
-import { DotcmsConfigService } from '@dotcms/dotcms-js';
+import { DotcmsConfigService, LoginService } from '@dotcms/dotcms-js';
 import { DotHttpErrorManagerService } from '@services/dot-http-error-manager/dot-http-error-manager.service';
 
 const generateRandomString = function (length: number) {
@@ -711,6 +711,10 @@ describe('DotContentCompareStore', () => {
                             })
                     }
                 },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
+                },
                 {
                     provide: DotHttpErrorManagerService,
                     useClass: MockDotHttpErrorManagerService

diff --git a/...i/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts b/...i/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts
@@ -18,7 +18,13 @@ import { TableModule } from 'primeng/table';
 import { TooltipModule } from 'primeng/tooltip';
 
 import { DotAlertConfirmService, DotMessageService } from '@dotcms/data-access';
-import { CoreWebService, DotcmsConfigService, LoggerService, StringUtils } from '@dotcms/dotcms-js';
+import {
+    CoreWebService,
+    DotcmsConfigService,
+    LoggerService,
+    LoginService,
+    StringUtils
+} from '@dotcms/dotcms-js';
 import {
     DotIconModule,
     DotMessagePipe,
@@ -167,6 +173,10 @@ describe('DotListingDataTableComponent', () => {
                                 offset: -21600000
                             })
                     }
+                },
+                {
+                    provide: LoginService,
+                    useValue: { currentUserLanguageId: 'en-US' }
                 }
             ]
         });