myLife: achievements without resources (fixes #7434) (#7435)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Apr 18, 2024 · ca123e2 · ca123e2
1 parent cbed474
commit ca123e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.14.23",
+  "version": "0.14.24",
   "myplanet": {
-    "latest": "v0.14.81",
-    "min": "v0.14.0"
+    "latest": "v0.14.86",
+    "min": "v0.13.69"
   },
   "scripts": {
     "ng": "ng",

diff --git a/src/app/users/users-achievements/users-achievements-update.component.html b/src/app/users/users-achievements/users-achievements-update.component.html
@@ -59,17 +59,7 @@
           </a>
           <planet-step-list [steps]="achievements" [ignoreClick]="true">
             <planet-step-list-item *ngFor="let achievement of achievements.controls; index as i">
-              <span>{{achievement.value.title || achievement.value}}
-                <div *ngIf="achievement.value.resources?.length > 0" class="mat-caption" i18n>
-                  Attached resources:
-                </div>
-                <mat-chip-list mat-line>
-                  <mat-chip *ngFor="let resource of (achievement.value.resources || [])">
-                    <a target="_blank" [routerLink]="['/resources/view', resource._id]">{{resource.title}}</a>
-                    <mat-icon matChipRemove (click)="removeResource(achievement, resource)">clear</mat-icon>
-                  </mat-chip>
-                </mat-chip-list>
-              </span>
+              <span>{{achievement.value.title || achievement.value}}</span>
               <button mat-stroked-button type="button" class="margin-lr-4" (click)="addAchievement(i, achievement.value)" i18n>Edit</button>
             </planet-step-list-item>
           </planet-step-list>

diff --git a/src/app/users/users-achievements/users-achievements-update.component.ts b/src/app/users/users-achievements/users-achievements-update.component.ts
@@ -113,21 +113,19 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
     });
   }
 
-  addAchievement(index = -1, achievement = { title: '', description: '', resources: [], date: '' }) {
+  addAchievement(index = -1, achievement = { title: '', description: '', date: '' }) {
     if (typeof achievement === 'string') {
-      achievement = { title: '', description: achievement, resources: [], date: '' };
+      achievement = { title: '', description: achievement, date: '' };
     }
     this.dialogsFormService.openDialogsForm(
       achievement.title !== '' ? $localize`Edit Achievement` : $localize`Add Achievement`,
       [
         { 'type': 'textbox', 'name': 'title', 'placeholder': $localize`Title`, required: true },
         { 'type': 'date', 'name': 'date', 'placeholder': $localize`Date`, 'required': false },
         { 'type': 'textarea', 'name': 'description', 'placeholder': $localize`Description`, 'required': false },
-        { 'type': 'dialog', 'name': 'resources', 'db': 'resources', 'text': $localize`Add Resources` }
       ],
       this.fb.group({
         ...achievement,
-        resources: [ achievement.resources ],
         title: [ achievement.title, CustomValidators.required ],
         description: [ achievement.description ],
         date: [ achievement.date, null, ac => this.validatorService.notDateInFuture$(ac) ]

diff --git a/src/app/users/users-achievements/users-achievements.component.html b/src/app/users/users-achievements/users-achievements.component.html
@@ -54,11 +54,7 @@ <h3 i18n>My Achievements</h3>
               <span class="achievement-date">{{achievement.date | date: medium}}</span>
             </p>
             <p mat-line *ngIf="openAchievementIndex === i">{{achievement.description}}</p>
-            <span mat-line class="achievement-buttons" *ngIf="openAchievementIndex === i">
-              <ng-container *ngFor="let resource of achievement.resources">
-                <planet-resources-menu [resources]="[ resource ]" color="primary" (click)="$event.stopPropagation()">{{resource.title}}</planet-resources-menu>
-              </ng-container>
-            </span>
+            <span mat-line class="achievement-buttons" *ngIf="openAchievementIndex === i"></span>
           </mat-list-item>
         </mat-list>
       </div>

diff --git a/src/app/users/users-achievements/users-achievements.component.ts b/src/app/users/users-achievements/users-achievements.component.ts
@@ -95,8 +95,7 @@ export class UsersAchievementsComponent implements OnInit {
   }
 
   isClickable(achievement) {
-    return (achievement.resources.length > 0
-            || achievement.description.length > 0);
+    return achievement.description.length > 0;
   }
 
   setCertifications(courses = [], progress = [], certifications = []) {