Skip to content

Commit 5468801

Browse files
ilmartyrkbelka09DiverVM
authored
1.3.9 (#2321)
* #1537 (#2314) * update no image design * fix: Default overlay when topic had image --------- Co-authored-by: Dzmitry Zimnitski <[email protected]> * #2187 (#2315) * text change * Revert "text change" This reverts commit 9b8958f. * text update --------- Co-authored-by: Dzmitry Zimnitski <[email protected]> * #1712 (#2316) * update check * Revert "update check" This reverts commit acabab7. * fix check --------- Co-authored-by: Viktar Maslouski <[email protected]> * add no result hint (#2317) Co-authored-by: Dzmitry Zimnitski <[email protected]> * update overflow design (#2318) Co-authored-by: Dzmitry Zimnitski <[email protected]> * add empty question for draft (#2319) Co-authored-by: Viktar Maslouski <[email protected]> * #2180 (#2320) * replace mobile button * update no image design * Revert "update no image design" This reverts commit a2109cc. --------- Co-authored-by: Dzmitry Zimnitski <[email protected]> * remove possibility to edit and remove anonymous ideas * chore: Update CHANGELOG.md * 1.3.9 --------- Co-authored-by: Dzmitry Zimnitski <[email protected]> Co-authored-by: Viktar Maslouski <[email protected]>
1 parent 4230cf9 commit 5468801

20 files changed

+275
-56
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 2025-06-18 - v1.3.9
2+
* Fix: Issue #1487 - SEARCH: Add 'No results found" message to search, and signpost to Help
3+
* Fix: Issue #1490 - TOPICS: 'Read more' button not as it should look - text pokes out underneath and margins too big
4+
* Fix: Issue #1537 - TOPICS: A more pleasing look when there is no image?
5+
* Fix: Issue #1685 - TOPIC: Idea gathering topic becomes a discussion topic if saved without a question
6+
* Fix: Issue #1712 - TOPIC: With 1 Discussion topic, the Edit button is not visible
7+
* Fix: Issue #2021 - IDEAS: Remove 'Edit idea' and 'Remove idea' from menu anonymous ideas
8+
* Fix: Issue #2139 - AF: Remove deleted draft ideas from activity feed
9+
* Fix: Issue #2180 - GROUPS: 'More info' not so visible on mobile
10+
* Fix: Issue #2187 - IDEAS/VOTING: Text about idea folder in the idea vote settings
11+
112
## 2025-05-01 - v1.3.8
213
* Feature: #2038 - IDEAS: Autosaving drafts
314

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "citizenos-fe",
3-
"version": "1.3.8",
3+
"version": "1.3.9",
44
"scripts": {
55
"dev": "node ./prebuild.js && ng serve --host",
66
"ng": "ng",

‎src/app/core/components/search/search.component.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
</div>
3434
<div id="results_area" *ngIf="app.showSearchResults">
3535
<div class="results_header" translate="COMPONENTS.SEARCH.HEADING_SEARCH_RESULTS"></div>
36+
<div class="results_no_results_wrap" *ngIf="noResults">
37+
<span class="results_no_results_text" translate="COMPONENTS.SEARCH.TXT_NO_RESULTS_FOUND"></span>
38+
<span class="results_no_results_link" (click)="toggleHelp()" translate="COMPONENTS.SEARCH.LNK_HELP_PANEL"></span>
39+
</div>
3640
<ng-container *ngFor="let context of contexts">
3741
<ng-container *ngFor="let model of models">
3842
<ng-container

‎src/app/core/components/search/search.component.scss‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,24 @@
114114
padding: 16px;
115115
}
116116

117+
.results_no_results_wrap {
118+
display: flex;
119+
flex-direction: column;
120+
gap: 4px;
121+
}
122+
123+
.results_no_results_text {
124+
font-size: 13px;
125+
font-style: normal;
126+
font-weight: 400;
127+
}
128+
129+
.results_no_results_link {
130+
@extend .results_no_results_text;
131+
cursor: pointer;
132+
text-decoration: underline;
133+
}
134+
117135
.line_separator {
118136
background-color: var(--color-blue-200);
119137
}

‎src/app/core/components/search/search.component.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,9 @@ export class SearchComponent implements OnInit {
186186
});
187187
}
188188
};
189+
190+
toggleHelp() {
191+
const curStatus = this.app.showHelp.getValue();
192+
this.app.showHelp.next(!curStatus);
193+
}
189194
}

‎src/app/group/group.component.html‎

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</ng-container>
2525
</div>
2626
<div id="buttons_area">
27-
<button id="join_button" *ngIf="!group.userLevel" class="btn_medium_close"
28-
translate="VIEWS.GROUP.BTN_JOIN" (click)="joinGroup(group)"></button>
27+
<button id="join_button" *ngIf="!group.userLevel" class="btn_medium_close" translate="VIEWS.GROUP.BTN_JOIN"
28+
(click)="joinGroup(group)"></button>
2929
<div *ngIf="(group.userLevel)" class="permissions_lable tablet_hidden"
3030
[translate]="(group.userLevel !== 'read')? ('TXT_GROUP_LEVELS_' + group.userLevel | uppercase) : 'VIEWS.GROUP.LBL_JOINED'">
3131
</div>
@@ -385,18 +385,34 @@
385385
<div class="info_number">{{group.members.topics.count.followUp || 0}}</div>
386386
</div>
387387
</div>
388-
<a id="view_more" class="tablet_show" (click)="moreInfo = !moreInfo" *ngIf="!moreInfo">
389-
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
390-
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
391-
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
392-
xmlns="http://www.w3.org/2000/svg">
393-
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
394-
</svg>
395-
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" transform="rotate(180)" fill="none"
396-
xmlns="http://www.w3.org/2000/svg">
397-
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
398-
</svg>
399-
</a>
388+
<div class="mobile_hidden">
389+
<a id="view_more" class="tablet_show" (click)="moreInfo = !moreInfo" *ngIf="!moreInfo">
390+
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
391+
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
392+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
393+
xmlns="http://www.w3.org/2000/svg">
394+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
395+
</svg>
396+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" transform="rotate(180)" fill="none"
397+
xmlns="http://www.w3.org/2000/svg">
398+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
399+
</svg>
400+
</a>
401+
</div>
402+
<div class="button_wrap mobile_show" *ngIf="!moreInfo">
403+
<button class="btn_medium_secondary" id="view_more_btn" (click)="moreInfo = !moreInfo">
404+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
405+
xmlns="http://www.w3.org/2000/svg">
406+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
407+
</svg>
408+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
409+
xmlns="http://www.w3.org/2000/svg">
410+
<path d="M17 15L12 10L7 15" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
411+
</svg>
412+
<span *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></span>
413+
<span *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></span>
414+
</button>
415+
</div>
400416
</div>
401417
</div>
402418
<div id="group_extra_info" [ngClass]=" {'open': moreInfo}">
@@ -509,7 +525,7 @@
509525
</div>
510526
</div>
511527
<div class="line_separator" *ngIf="moreInfo"></div>
512-
<a id="view_more" (click)="moreInfo = !moreInfo" *ngIf="moreInfo">
528+
<a id="view_more" class="mobile_hidden" (click)="moreInfo = !moreInfo" *ngIf="moreInfo">
513529
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
514530
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
515531
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
@@ -521,6 +537,20 @@
521537
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
522538
</svg>
523539
</a>
540+
<div class="button_wrap mobile_show" *ngIf="moreInfo">
541+
<button class="btn_medium_secondary" id="view_more_btn" (click)="moreInfo = !moreInfo">
542+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
543+
xmlns="http://www.w3.org/2000/svg">
544+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
545+
</svg>
546+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
547+
xmlns="http://www.w3.org/2000/svg">
548+
<path d="M17 15L12 10L7 15" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
549+
</svg>
550+
<span *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></span>
551+
<span *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></span>
552+
</button>
553+
</div>
524554
</div>
525555

526556
</div>
@@ -1344,7 +1374,7 @@
13441374
</div>
13451375
<!--MOBILE_TOPIC_FILTERS_END-->
13461376
</div>
1347-
<div id="topics_area" *ngIf="topics$ | async as topics;" (click)="(removeTopics)? toggleRemove(): ''">
1377+
<div id="topics_area" *ngIf="topics$ | async as topics;" (click)="(removeTopics)? toggleRemove(): ''">
13481378
<ng-container *ngIf="!topics.length && !filtersSet">
13491379
<div class="no_engagements">
13501380
<div class="illustration">
@@ -1528,7 +1558,8 @@
15281558
<div class="level_heading" translate="VIEWS.GROUP.ROLE">
15291559
<div class="tooltip" tooltip>
15301560
<div class="content_title" translate="VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_HEADING"></div>
1531-
<div class="content_description" [innerHTML]="'VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_DESCRIPTION' | translate"></div>
1561+
<div class="content_description"
1562+
[innerHTML]="'VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_DESCRIPTION' | translate"></div>
15321563
</div>
15331564
</div>
15341565

‎src/app/group/group.component.scss‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@
251251
}
252252
}
253253

254+
#view_more_btn {
255+
width: 100%;
256+
}
257+
254258
#group_content_wrap {
255259
display: flex;
256260
flex-direction: column;
@@ -670,7 +674,8 @@
670674
align-items: center;
671675
gap: 8px;
672676

673-
group-member-user, group-invite-user {
677+
group-member-user,
678+
group-invite-user {
674679
display: contents;
675680
}
676681

‎src/app/ideation/components/idea/idea-dialog.component.html‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,9 @@
193193
<span translate="COMPONENTS.IDEABOX.OPTION_ADD_TO_FOLDER"></span>
194194
</button>
195195
</ng-container>
196-
<ng-container *ngIf="canEditIdea() || showDisabledFunctionality()">
196+
<ng-container *ngIf="canEditIdea()">
197197
<div class="line_separator"></div>
198-
<button
199-
class="option" (click)="ideaEditMode()"
200-
[disabled]="showDisabledFunctionality()"
201-
[ngClass]="{
202-
disabled: showDisabledFunctionality()
203-
}"
204-
>
198+
<button class="option" (click)="ideaEditMode()">
205199
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
206200
<path
207201
d="M8.8143 4.18517L11.8147 7.18569L5.29947 13.7012L2.62438 13.9965C2.26626 14.0361 1.96369 13.7333 2.00354 13.3752L2.30118 10.6981L8.8143 4.18517ZM13.6704 3.73845L12.2616 2.3296C11.8222 1.89013 11.1095 1.89013 10.67 2.3296L9.34467 3.65501L12.3451 6.65553L13.6704 5.33011C14.1099 4.89042 14.1099 4.17791 13.6704 3.73845Z"
@@ -242,15 +236,10 @@
242236
<span translate="COMPONENTS.IDEABOX.OPTION_VIEW_PREVIOUS_VERSIONS"></span>
243237
</button>
244238
</ng-container>
245-
<ng-container *ngIf="canEditIdea() || showDisabledFunctionality()">
239+
<ng-container *ngIf="canEditIdea()">
246240
<div class="line_separator"></div>
247241
<button
248-
class="option error_text" (click)="doShowDeleteIdea()"
249-
[disabled]="showDisabledFunctionality()"
250-
[ngClass]="{
251-
disabled: showDisabledFunctionality()
252-
}"
253-
>
242+
class="option error_text" (click)="doShowDeleteIdea()">
254243
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
255244
<path fill-rule="evenodd" clip-rule="evenodd"
256245
d="M10 3H6V4H10V3ZM11 4V3C11 2.44772 10.5523 2 10 2H6C5.44772 2 5 2.44772 5 3V4H4H2.5C2.22386 4 2 4.22386 2 4.5C2 4.77614 2.22386 5 2.5 5H4V13C4 13.5523 4.44772 14 5 14H11C11.5523 14 12 13.5523 12 13V5H13.5C13.7761 5 14 4.77614 14 4.5C14 4.22386 13.7761 4 13.5 4H12H11ZM7 7H6V11H7V7ZM10 7H9V11H10V7Z"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ export class IdeaboxComponent implements AfterViewInit {
7474
canEditIdea() {
7575
return (this.idea.author?.id === this.Auth.user.value.id && !this.idea.deletedAt && [this.TopicService.STATUSES.draft, this.TopicService.STATUSES.ideation].indexOf(this.topic.status) > -1);
7676
};
77-
showDisabledFunctionality() {
78-
return this.ideation.allowAnonymous;
79-
}
8077

8178
goToView(showReplies?: boolean) {
8279
if (this.idea.status === IdeaStatus.draft) {

0 commit comments

Comments
 (0)