Merge branch 'master' into #1755

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2025-01-29 - v1.2.2
+  * Fix: Issue #307 - Add participants to public topics automatically when they engage (add idea, like, vote, etc)
+  * Fix: Issue #1657 - GROUPS: Bugs in last edit and/or order of public topics displayed within public group
+  * Fix: Issue #1678 - TOUR: 'Topic discussion' part of tour not relevant during other phases and slides off to top left corner
+  * Fix: Issue #1680 - TOUR: Add 'the page you're on offers a walkthrough' to Help panel for DB and all screen sizes
+  * Fix: Issue #1684 - TOPIC: Adding actions doesn't lock the topic
+  * Fix: Issue #1737 - AF: Clicking on 'liked an idea' update in Topic AF takes you to DB
+  * Fix: Issue #1739 - TOPICS: In topics starting with idea gathering, 'File too large' message not showing for header image uploads
+  * Fix: Issue #1796 - MISC: 'About' button broken - leads to 404 page
+
+## 2025-01-15 - v1.2.1
+  * Fix: Issue #1653 - TOPICS: No way to close long filter dropdowns on mobile except back button, which take you too far back
+  * Fix: Issue #1654 - TOPICS: On mobile, filter buttons need to be 'active' all the way across
+
 ## 2025-01-08 - v1.2.0
   * Lot of bug fixes
   * Improved ideation/idea-gathering functionality
@@ -13,36 +27,36 @@
 
 ## 2024-04-10 - v1.0.3
   * Fix: Topic vote creation race condition resolved - status change synchronization
-  * Fix: Issue #1102 - [reference issue title]
-  * Fix: Issue #1099 - [reference issue title]
-  * Fix: Issue #1046 - [reference issue title]
-  * Fix: Issue #1006 - [reference issue title]
-  * Fix: Issue #1004 - [reference issue title]
-  * Fix: Issue #996 - [reference issue title]
+  * Fix: Issue #1102 - L10n: text width needs to be flexible
+  * Fix: Issue #1099 - VOTING: Mobile user can add Arguments in a Voting Topic
+  * Fix: Issue #1046 - Topic: Wrong notification message for 'Save as draft'.
+  * Fix: Issue #1006 - Discussion: Wording for removed replies - should be contribution
+  * Fix: Issue #1004 - Discussion: Character limit duplicated and 2 different numbers
+  * Fix: Issue #996 - Discussion: When post an empty reply, get told it is too long
 
 ## 2024-04-10 - v1.0.2
   * Feature: Group topic request system MVP implemented (#186)
-  * Fix: Issue #1096 - [reference issue title]
-  * Fix: Issue #1092 - [reference issue title]
-  * Fix: Issue #1084 - [reference issue title]
-  * Fix: Issue #1083 - [reference issue title]
-  * Fix: Issue #1081 - [reference issue title]
-  * Fix: Issue #1080 - [reference issue title]
-  * Fix: Issue #1073 - [reference issue title]
-  * Fix: Issue #963 - [reference issue title]
+  * Fix: Issue #1096 - Email: Formatting inconsistency
+  * Fix: Issue #1092 - GROUP: Requested topic is not greyed out
+  * Fix: Issue #1084 - GROUP: Clicking on Accept a Topic from email leads to a blank page
+  * Fix: Issue #1083 - Emails: Gap needed in Request to add topic emails
+  * Fix: Issue #1081 - Group: Code in the Group Activity Feed
+  * Fix: Issue #1080 - GROUP: Clicking Accept for Add Topic to Group leads to a confusing view
+  * Fix: Issue #1073 - Topic - Create/edit topic groups list includes groups that you cannot add topic to
+  * Fix: Issue #963 - Topic: Tooltip for attachments info
 
 ## 2024-03-27 - v1.0.1
   * Performance: Removed vote results from group member topics
   * Performance: Removed topic list ordering params causing performance issues
   * Fix: Mobile topic filter handling improved
   * Fix: Draft topics now redirect to edit view when opened in read view
   * Fix: Double interrupt dialog in topic deletion flow resolved
-  * Fix: Issue #1065 - [reference issue title]
-  * Fix: Issue #1060 - [reference issue title]
-  * Fix: Issue #1059 - [reference issue title]
-  * Fix: Issue #1055 - [reference issue title]
-  * Fix: Issue #1054 - [reference issue title]
-  * Fix: Issue #1044 - [reference issue title]
+  * Fix: Issue #1065 - Public Topics->Hidden by Admin->Why not working
+  * Fix: Issue #1060 - GROUP: User cannot remove group from topic
+  * Fix: Issue #1059 - GROUP: Add Topics not working
+  * Fix: Issue #1055 - Topics: Public topics default sorting is misleading (due to 'Last edit' bug?)
+  * Fix: Issue #1054 - HELP: Comments and non-compulsory email causing confusion
+  * Fix: Issue #1044 - Topics: Close without saving button (X) not working
 
 ## 2024-03-18 - v1.0.0
   * Feature: Complete UX/UI redesign

package.json

@@ -1,6 +1,6 @@
 {
   "name": "citizenos-fe",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "scripts": {
     "dev": "node ./prebuild.js && ng serve --host",
     "ng": "ng",

src/app/core/components/help/help.component.ts

@@ -39,14 +39,25 @@ export class HelpComponent implements OnInit {
   ) {
     this.app.showHelp.pipe(tap((show) => {
       const url = this.router.url;
+      const tourName = this.getTourName();
       this.showTourBox = false;
-      if (window.innerWidth <= 1024 && show && url.indexOf('/topics/') > -1 && url.indexOf('/create/') === -1 && url.indexOf('/edit/') === -1) {
+      if (show && (tourName) && url.indexOf('/create/') === -1 && url.indexOf('/edit/') === -1) {
         this.showTourBox = true;
       }
-
     })).subscribe();
   }
 
+  private getTourName() {
+    const url = this.router.url;
+    if (url.indexOf('/dashboard') > -1) {
+      return "dashboard"
+    } else if (url.indexOf('/topics/') > -1) {
+      return "topic"
+    } else {
+      return null
+    }
+  }
+
   ngOnInit(): void {
     this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.config.get('helplink') || this.helpUrl);
   }
@@ -80,10 +91,16 @@ export class HelpComponent implements OnInit {
   startTour() {
     this.toggleHelp();
     window.scrollTo(0, 0);
-    if (window.innerWidth > 560) {
-      return this.TourService.show('topic_tablet', 1);
+    const tourName = this.getTourName();
+    if (tourName) {
+      if (window.innerWidth > 1024) {
+        return this.TourService.show(tourName, 1);
+      }
+      if (window.innerWidth > 560) {
+        return this.TourService.show(`${tourName}_tablet`, 1);
+      }
+      this.TourService.show(`${tourName}_mobile`, 1);
     }
-    this.TourService.show('topic_mobile', 1);
   }
 
   sendHelpRequest() {

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

@@ -7,9 +7,8 @@ import { DIALOG_DATA, DialogRef, DialogService } from 'src/app/shared/dialog';
 import { take, combineLatest, Observable, switchMap, map, tap } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { IdeaboxComponent } from '../ideabox/ideabox.component';
+import { TopicMemberUserService } from '@services/topic-member-user.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 '@services/topic.service';
@@ -111,13 +110,12 @@ export class IdeaDialogComponent extends IdeaboxComponent {
     config: ConfigService,
     router: Router,
     Auth: AuthService,
-    Location: LocationService,
-    Notification: NotificationService,
+    TopicMemberUserService: TopicMemberUserService,
     Translate: TranslateService,
     TopicService: TopicService,
     TopicIdeaService: TopicIdeaService
   ) {
-    super(dialog, config, router, Auth, Location, Notification, Translate, TopicService, TopicIdeaService);
+    super(dialog, config, router, Auth, TopicMemberUserService, Translate, TopicService, TopicIdeaService);
     this.idea = this.data.idea;
     this.topic = this.data.topic;
     this.ideation = this.data.ideation;

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

@@ -2,12 +2,10 @@ import { TopicService } from '@services/topic.service';
 import { AfterViewInit, Component, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
-import { BehaviorSubject, take } from 'rxjs';
+import { take } from 'rxjs';
 import { Idea } from '@interfaces/idea';
 import { AuthService } from '@services/auth.service';
 import { ConfigService } from '@services/config.service';
-import { LocationService } from '@services/location.service';
-import { NotificationService } from '@services/notification.service';
 import { TopicIdeaService } from '@services/topic-idea.service';
 import { ConfirmDialogComponent } from '@shared/components/confirm-dialog/confirm-dialog.component';
 import { DialogService } from '@shared/dialog';
@@ -17,6 +15,7 @@ import { IdeaReportReasonComponent } from '../idea-report-reason/idea-report-rea
 import { Topic } from '@interfaces/topic';
 import { Ideation } from '@interfaces/ideation';
 import { IdeaReactionsComponent } from '../idea-reactions/idea-reactions.component';
+import { TopicMemberUserService } from '@services/topic-member-user.service';
 
 @Component({
   selector: 'ideabox',
@@ -38,14 +37,12 @@ export class IdeaboxComponent implements AfterViewInit {
   isReply = false;
   errors = [];
   wWidth = window.innerWidth;
-  private loadVotes$ = new BehaviorSubject<void>(undefined);
   constructor(
     public dialog: DialogService,
     public config: ConfigService,
     public router: Router,
     public Auth: AuthService,
-    private Location: LocationService,
-    private Notification: NotificationService,
+    private readonly TopicMemberUserService: TopicMemberUserService,
     public Translate: TranslateService,
     public TopicService: TopicService,
     public TopicIdeaService: TopicIdeaService
@@ -93,9 +90,6 @@ export class IdeaboxComponent implements AfterViewInit {
     this.showDeletedIdea = value;
   }
   ideaEditMode() {
-    /* this.editSubject = this.argument.subject;
-     this.editText = this.argument.text;
-     this.editType = this.argument.type;*/
     if (this.showEdit) { // Visible, so we gonna hide, need to clear form errors
       this.errors = [];
     }
@@ -106,7 +100,7 @@ export class IdeaboxComponent implements AfterViewInit {
     this.ideaEditMode();
   }
   doShowDeleteIdea() {
-    const deleteArgument = this.dialog.open(ConfirmDialogComponent, {
+    const deleteIdea = this.dialog.open(ConfirmDialogComponent, {
       data: {
         level: 'delete',
         heading: 'MODALS.TOPIC_DELETE_IDEA_TITLE',
@@ -117,9 +111,9 @@ export class IdeaboxComponent implements AfterViewInit {
       }
     });
 
-    deleteArgument.afterClosed().subscribe((confirm) => {
+    deleteIdea.afterClosed().subscribe((confirm) => {
       if (confirm === true) {
-        const idea = Object.assign({ topicId: this.topic.id, ideaId: this.idea.id, ideationId: this.ideation.id });
+        const idea = { topicId: this.topic.id, ideaId: this.idea.id, ideationId: this.ideation.id };
         this.TopicIdeaService
           .delete(idea)
           .pipe(take(1))
@@ -161,6 +155,7 @@ export class IdeaboxComponent implements AfterViewInit {
       .pipe(take(1))
       .subscribe((voteResult) => {
         this.idea.votes = voteResult;
+        this.TopicMemberUserService.reload();
       });
   };
 
@@ -180,7 +175,7 @@ export class IdeaboxComponent implements AfterViewInit {
   }
 
   addToFolder() {
-    const addToFolderDialog = this.dialog.open(AddIdeaFolderComponent, {
+    this.dialog.open(AddIdeaFolderComponent, {
       data: {
         topicId: this.topic.id,
         ideationId: this.ideation.id,

src/app/ideation/components/ideation-create/ideation-create.component.html

@@ -285,7 +285,7 @@
                       [disabled]="!TopicService.canEditDescription(topic)"
                       [ngClass]="{'disabled': !TopicService.canEditDescription(topic)}"></button>
                   </div>
-                  <div class="inline_notification error" *ngIf="errors?.image">
+                  <div class="inline_notification error" *ngIf="error?.image">
                     <div class="icon_notification">
                       <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <rect width="24" height="24" rx="12" fill="#EF4025" />
@@ -294,7 +294,7 @@
                           fill="white" stroke="white" stroke-linecap="round" />
                       </svg>
                     </div>
-                    <div [innerHtml]="errors.image">
+                    <div [innerHtml]="error.image">
                     </div>
                   </div>
                   <div id="topic_image" class="block_section" *ngIf="(topic.imageUrl || tmpImageUrl)">
@@ -925,8 +925,7 @@
                         <span class="checkmark"></span>
                         <div class="checkbox_text_wrap">
                           <span class="bold" translate="VIEWS.IDEATION_CREATE.LBL_OPTION_DEADLINE"></span>
-                          <span class="deadline bold" *ngIf="deadlineSelect">{{deadline | date: 'YYYY-MM-dd
-                            HH:mm'}}</span>
+                          <span class="deadline bold" *ngIf="deadlineSelect">{{deadline | date: 'YYYY-MM-dd HH:mm'}}</span>
                         </div>
                       </label>
                     </div>