FIX #1216

Author: ilmartyrk

.vscode/settings.json

@@ -1,3 +1,8 @@
 {
-    "qodana.projectId": "AOK69"
+    "qodana.projectId": "AOK69",
+    "cody.autocomplete.advanced.provider": "experimental-ollama",
+    "cody.autocomplete.experimental.ollamaOptions": {
+      "url": "http://localhost:11434",
+      "model": "codellama"
+    },
 }

src/app/account/components/add-email/add-email.component.html

@@ -20,7 +20,7 @@
               fill="white" />
           </svg>
         </div>
-        <h4 class="title" translate="MODALS.ADD_EMAIL_HEADING"></h4>
+        <h4 class="title">{{ 'MODALS.ADD_EMAIL_HEADING' | translate }}</h4>
       </div>
       <div class="dialog_close">
         <a class="btn_dialog_close icon" dialog-close>
@@ -34,29 +34,31 @@ <h4 class="title" translate="MODALS.ADD_EMAIL_HEADING"></h4>
     </div>
     <div class="dialog_content no_footer">
       <form [formGroup]="form">
-        <cos-input placeholder="{{'MODALS.ADD_EMAIL_PLACEHOLDER_EMAIL' | translate}}">
+        <cos-input [placeholder]="'MODALS.ADD_EMAIL_PLACEHOLDER_EMAIL' | translate">
           <input id="email" formControlName="email" type="email"
-            placeholder="{{'MODALS.ADD_EMAIL_PLACEHOLDER_EMAIL' | translate}}" (focus)="wWidth > 1024"
+            [placeholder]="'MODALS.ADD_EMAIL_PLACEHOLDER_EMAIL' | translate" (focus)="wWidth > 1024"
             [ngClass]="{'error_input': form.controls['email'].touched && form.controls['email'].invalid}" [maxlength]="254">
           <label for="email" class="error_label" *ngIf="form.controls['email'].touched && form.controls['email'].invalid">
             <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" clip-rule="evenodd"
                 d="M8.89438 1.78863C8.52586 1.05158 7.47405 1.05158 7.10553 1.78863L0.723562 14.5526C0.391112 15.2175 0.874608 15.9998 1.61799 15.9998H14.3819C15.1253 15.9998 15.6088 15.2175 15.2763 14.5526L8.89438 1.78863ZM6.99996 6.99977C6.99996 6.44749 7.44767 5.99977 7.99996 5.99977C8.55224 5.99977 8.99996 6.44749 8.99996 6.99977V9.99977C8.99996 10.5521 8.55224 10.9998 7.99996 10.9998C7.44767 10.9998 6.99996 10.5521 6.99996 9.99977V6.99977ZM6.99996 12.9998C6.99996 12.4475 7.44767 11.9998 7.99996 11.9998C8.55224 11.9998 8.99996 12.4475 8.99996 12.9998C8.99996 13.5521 8.55224 13.9998 7.99996 13.9998C7.44767 13.9998 6.99996 13.5521 6.99996 12.9998Z"
                 fill="#EF4025" />
             </svg>
-            <span translate="MODALS.ADD_EMAIL_ERROR_MSG_INVALID"></span>
+            <span>{{ 'MODALS.ADD_EMAIL_ERROR_MSG_INVALID' | translate }}</span>
           </label>
         </cos-input>
 
-        <div class="delete_info_text bold" translate="MODALS.ADD_EMAIL_TXT_VERIFY"></div>
+        <div class="delete_info_text bold">{{ 'MODALS.ADD_EMAIL_TXT_VERIFY' | translate }}</div>
       </form>
       <div class="button_wrap">
-        <button class="btn_big_submit" (click)="doUpdateProfile()" [disabled]="form.invalid"
-          translate="MODALS.ADD_EMAIL_LOG_IN"></button>
-        <a translate="MODALS.ADD_EMAIL_LNK_CANCEL" (click)="logout()"></a>
+        <button class="btn_big_submit" (click)="doUpdateProfile()" [disabled]="form.invalid">
+          {{ 'MODALS.ADD_EMAIL_LOG_IN' | translate }}
+        </button>
+        <a (click)="logout()">{{ 'MODALS.ADD_EMAIL_LNK_CANCEL' | translate }}</a>
       </div>
       <div class="dialog_footer">
       </div>
     </div>
   </div>
 </div>
+

src/app/ideation/components/idea/idea.component.spec.ts

@@ -1,21 +1,58 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { IdeaComponent } from './idea.component';
+import { TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
 
-describe('IdeaComponent', () => {
+describe('IdeaComponent TranslateService', () => {
   let component: IdeaComponent;
   let fixture: ComponentFixture<IdeaComponent>;
+  let translateService: TranslateService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [IdeaComponent]
+      declarations: [IdeaComponent],
+      providers: [TranslateService, provideHttpClient(), provideHttpClientTesting()],
+      imports: []
     });
     fixture = TestBed.createComponent(IdeaComponent);
     component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  it('should inject TranslateService', () => {
+    expect(translateService).toBeTruthy();
+  });
+
+  it('should handle language change', () => {
+    const newLang = 'es';
+    translateService.use(newLang);
+    expect(translateService.currentLang).toBe(newLang);
+  });
+
+  it('should translate keys correctly', (done) => {
+    const testKey = 'TEST.KEY';
+    const expectedValue = 'Translated Value';
+
+    spyOn(translateService, 'get').and.returnValue(of(expectedValue));
+
+    translateService.get(testKey).subscribe(value => {
+      expect(value).toBe(expectedValue);
+      done();
+    });
+  });
+
+  it('should handle missing translations', (done) => {
+    const missingKey = 'MISSING.KEY';
+
+    spyOn(translateService, 'get').and.returnValue(of(missingKey));
+
+    translateService.get(missingKey).subscribe(value => {
+      expect(value).toBe(missingKey);
+      done();
+    });
   });
 });

src/app/ideation/components/idea/idea.component.ts

@@ -1,19 +1,18 @@
-import { IdeaAttachmentService } from 'src/app/services/idea-attachment.service';
-import { TopicIdeaRepliesService } from './../../../services/topic-idea-replies.service';
-import { TopicIdeaService } from 'src/app/services/topic-idea.service';
-import { Component, ContentChildren, QueryList, ViewChildren, inject } from '@angular/core';
+import { IdeaAttachmentService } from '@services/idea-attachment.service';
+import { TopicIdeaRepliesService } from '@services/topic-idea-replies.service';
+import { TopicIdeaService } from '@services/topic-idea.service';
+import { Component, ContentChildren, QueryList, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DIALOG_DATA, DialogRef, DialogService } from 'src/app/shared/dialog';
-import { take, combineLatest, Observable, switchMap, map, of, tap } from 'rxjs';
-import { Idea } from 'src/app/interfaces/idea';
-import { AuthService } from 'src/app/services/auth.service';
+import { take, combineLatest, Observable, switchMap, map, tap } from 'rxjs';
+import { AuthService } from '@services/auth.service';
 import { IdeaboxComponent } from '../ideabox/ideabox.component';
-import { ConfigService } from 'src/app/services/config.service';
-import { LocationService } from 'src/app/services/location.service';
-import { NotificationService } from 'src/app/services/notification.service';
+import { ConfigService } from '@services/config.service';
+import { LocationService } from '@services/location.service';
+import { NotificationService } from '@services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Argument } from 'src/app/interfaces/argument';
-import { TopicService } from 'src/app/services/topic.service';
+import { TopicService } from '@services/topic.service';
 import { Folder } from 'src/app/interfaces/folder';
 import { DomSanitizer } from '@angular/platform-browser';
 import { IdeaReplyComponent } from '../idea-reply/idea-reply.component';

src/app/interfaces/topic.ts

@@ -36,7 +36,7 @@ export interface Topic {
     moderatedReasonType: string | null,
     moderatedReasonText: string | null
   },
-  events: any,
+  events?: any,
   vote?: Vote,
   revision?: number
 }

src/app/services/public-group-member-topics.service.spec.ts

@@ -1,16 +1,50 @@
 import { TestBed } from '@angular/core/testing';
-
+import { provideHttpClient } from '@angular/common/http';
 import { PublicGroupMemberTopicsService } from './public-group-member-topics.service';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { firstValueFrom } from 'rxjs';
 
-describe('PublicGroupMemberTopicsService', () => {
+describe('PublicGroupMemberTopicsService.reload', () => {
   let service: PublicGroupMemberTopicsService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      imports: [],
+      providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        PublicGroupMemberTopicsService
+      ]
+    });
     service = TestBed.inject(PublicGroupMemberTopicsService);
   });
 
-  it('should be created', () => {
-    expect(service).toBeTruthy();
+  it('should reset offset to 0', () => {
+    service.params$.value.offset = 10;
+    service.reload();
+    expect(service.params$.value.offset).toBe(0);
+  });
+
+  it('should reset page to 1', () => {
+    service.params$.value.page = 5;
+    service.reload();
+    expect(service.params$.value.page).toBe(1);
+  });
+
+  it('should maintain other params values', () => {
+    service.params$.value.order = 'asc';
+    service.reload();
+    expect(service.params$.value.order).toBe('asc');
   });
 });
+
+// Add interface for params
+interface Params {
+  offset: number;
+  page: number;
+  order: string;
+}
+
+const DEFAULT_OFFSET = 10;
+const DEFAULT_PAGE = 5;
+const DEFAULT_ORDER = 'asc';

src/app/topic/components/close-voting/close-voting.component.html

@@ -0,0 +1,45 @@
+<div class="overlay" dialog-close></div>
+<div class="dialog_wrap">
+  <div class="dialog">
+    <div class="dialog_header warning">
+      <div class="header_with_icon">
+        <div class="icon_notification">
+          <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <rect width="40" height="40" rx="20" fill="#F39129" />
+            <path
+              d="M19.0645 8C18.4876 8 18.0304 8.48668 18.0664 9.06238L18.9414 23.0624C18.9743 23.5894 19.4114 24 19.9395 24H20.0605C20.5886 24 21.0257 23.5894 21.0586 23.0624L21.9336 9.06238C21.9696 8.48668 21.5124 8 20.9355 8H19.0645Z"
+              fill="white" />
+            <path
+              d="M20 31C21.1046 31 22 30.1046 22 29C22 27.8954 21.1046 27 20 27C18.8954 27 18 27.8954 18 29C18 30.1046 18.8954 31 20 31Z"
+              fill="white" />
+          </svg>
+        </div>
+        <h4 class="title" translate="COMPONENTS.CLOSE_VOTING_CONFIRM.HEADING"></h4>
+      </div>
+      <div class="dialog_close">
+        <a class="btn_dialog_close icon" dialog-close>
+          <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path
+              d="M7.72152 6.29537C7.3277 5.90154 6.68919 5.90154 6.29537 6.29537C5.90154 6.68919 5.90154 7.3277 6.29537 7.72153L10.5738 12L6.29541 16.2785C5.90159 16.6723 5.90159 17.3108 6.29541 17.7046C6.68923 18.0985 7.32774 18.0985 7.72156 17.7046L12 13.4262L16.2784 17.7046C16.6723 18.0985 17.3108 18.0985 17.7046 17.7046C18.0984 17.3108 18.0984 16.6723 17.7046 16.2785L13.4262 12L17.7046 7.72153C18.0985 7.3277 18.0985 6.68919 17.7046 6.29537C17.3108 5.90154 16.6723 5.90154 16.2785 6.29537L12 10.5739L7.72152 6.29537Z"
+              fill="#2C3B47" />
+          </svg>
+        </a>
+      </div>
+    </div>
+    <div class="dialog_content">
+      <div class="info_row center" translate="COMPONENTS.CLOSE_VOTING_CONFIRM.ARE_YOU_SURE"></div>
+    </div>
+    <div class="dialog_content" *ngIf="data.topic.ideationId || data.topic.discussionId">
+      <div class="info_row center" translate="COMPONENTS.CLOSE_VOTING_CONFIRM.CLOSE_VOTING_DESCRIPTION"></div>
+    </div>
+    <div class="dialog_content no_footer">
+      <div class="button_wrap">
+        <button class="btn_big_submit" [dialog-close]="true"
+          translate="COMPONENTS.CLOSE_VOTING_CONFIRM.CONFIRM_YES"></button>
+        <a dialog-close translate="COMPONENTS.CLOSE_VOTING_CONFIRM.CONFIRM_NO"></a>
+      </div>
+    </div>
+    <div class="dialog_footer">
+    </div>
+  </div>
+</div>

src/app/topic/components/close-voting/close-voting.component.scss

@@ -0,0 +1,22 @@
+.dialog {
+  max-width: 560px;
+}
+.warn {
+  .icon_notification {
+    rect {
+      fill: var(--color-warn);
+    }
+  }
+}
+
+.error {
+  .icon_notification {
+    rect {
+      fill: var(--color-error);
+    }
+  }
+}
+
+.center {
+  text-align: center;
+}

src/app/topic/components/close-voting/close-voting.component.spec.ts

@@ -0,0 +1,106 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CloseVotingComponent } from './close-voting.component';
+import { DIALOG_DATA } from 'src/app/shared/dialog';
+import { CloseVotingData } from './close-voting.component';
+
+describe('CloseVotingComponent', () => {
+  let component: CloseVotingComponent;
+  let fixture: ComponentFixture<CloseVotingComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [CloseVotingComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CloseVotingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('CloseVotingComponent', () => {
+    let component: CloseVotingComponent;
+    let fixture: ComponentFixture<CloseVotingComponent>;
+    const mockDialogData: CloseVotingData = {
+      topic: {
+        authors: [
+          {
+            id: '123',
+            name: 'Test Author',
+            company: 'Test Company'
+          }
+        ],
+        id: 'topic123',
+        title: 'Test Topic Title',
+        intro: 'Test topic introduction text',
+        description: '<p>Test topic description</p>',
+        status: 'open',
+        visibility: 'public',
+        hashtag: 'testtopic',
+        join: {
+          token: 'abc123',
+          level: 'read'
+        },
+        categories: ['category1', 'category2'],
+        endsAt: '2024-12-31T23:59:59Z',
+        createdAt: '2024-01-01T00:00:00Z',
+        updatedAt: '2024-01-01T00:00:00Z',
+        sourcePartnerId: null,
+        sourcePartnerObjectId: null,
+        permission: {
+          level: 'admin',
+          levelGroup: 'group1'
+        },
+        creator: {
+          id: 'user123',
+          name: 'Test Creator'
+        },
+        lastActivity: '2024-03-19T10:00:00Z',
+        country: 'US',
+        language: 'en',
+        members: {
+          users: [],
+          groups: []
+        },
+        voteId: 'vote123',
+        ideationId: 'ideation123',
+        discussionId: 'discussion123',
+        comments: {
+          count: 0,
+          latest: []
+        },
+        padUrl: 'https://example.com/pad/123',
+        favourite: false,
+        imageUrl: 'https://example.com/image.jpg'
+      }
+    };
+
+    beforeEach(async () => {
+      await TestBed.configureTestingModule({
+        declarations: [CloseVotingComponent],
+        providers: [
+          { provide: DIALOG_DATA, useValue: mockDialogData }
+        ]
+      })
+      .compileComponents();
+
+      fixture = TestBed.createComponent(CloseVotingComponent);
+      component = fixture.componentInstance;
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should have data injected', () => {
+      expect(component.data).toEqual(mockDialogData);
+    });
+  });
+
+});