Merge branch 'master' into 9863-dialogs-list-service-allow-multiple-popups

Author: Mutugiii

.eslintrc.json

@@ -86,7 +86,7 @@
         "@angular-eslint/use-pipe-transform-interface": "error",
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "off",
-        // "@typescript-eslint/consistent-type-assertions": "error",
+        "@typescript-eslint/consistent-type-assertions": "error",
         // "@typescript-eslint/member-ordering": "error",
         // "@typescript-eslint/naming-convention": [
         //   "error",

eslint.config.mjs

@@ -87,6 +87,7 @@ export default defineConfig([globalIgnores(["projects/**/*", "chatapi/**/*"]), {
         "@angular-eslint/use-pipe-transform-interface": "error",
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "off",
+        "@typescript-eslint/consistent-type-assertions": "error",
         "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/no-empty-interface": "error",
         "@typescript-eslint/no-explicit-any": "off",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.22.44",
+  "version": "0.22.52",
   "myplanet": {
-    "latest": "v0.52.96",
-    "min": "v0.49.69"
+    "latest": "v0.53.33",
+    "min": "v0.51.90"
   },
   "scripts": {
     "ng": "ng",

src/app/community/community.component.ts

@@ -211,6 +211,7 @@ export class CommunityComponent implements OnInit, OnDestroy {
     this.userService.userChange$.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
       this.user = this.userService.get();
       this.isLoggedIn = this.user._id !== undefined;
+      this.isCommunityLeader = this.user.isUserAdmin || this.user?.roles?.indexOf('leader') > -1;
       this.getCommunityData();
     });
   }

src/app/courses/courses.component.html

@@ -105,7 +105,7 @@
     </ng-container>
   </ng-template>
 
-  <div [ngClass]="{ 'view-container view-full-height view-table': !isForm }">
+  <div class="card-table" [ngClass]="{ 'view-container view-full-height view-table': !isForm }">
     <mat-table #table [dataSource]="courses" matSort [matSortDisableClear]="true" [trackBy]="trackById">
       <ng-container matColumnDef="select">
         <mat-header-cell *matHeaderCellDef>
@@ -122,9 +122,9 @@
       </ng-container>
       <ng-container matColumnDef="courseTitle">
         <mat-header-cell *matHeaderCellDef mat-sort-header="courseTitle" i18n> Title </mat-header-cell>
-        <mat-cell *matCellDef="let element" class="list-content-menu" [ngClass]="{'list-content-menu-auto': element.doc.courseTitle.length > 50 }">
+        <mat-cell *matCellDef="let element" class="list-content-menu">
           <h3 class="header">
-            <ng-container *ngIf="deviceType === deviceTypes.MOBILE">
+            <ng-container *ngIf="isMobile">
               <mat-checkbox (change)="$event ? selection.toggle(element._id) : null"
                 [checked]="selection.isSelected(element._id)">
               </mat-checkbox>

src/app/courses/courses.component.ts

@@ -142,6 +142,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
   trackById = trackById;
   deviceType: DeviceType;
   deviceTypes: typeof DeviceType = DeviceType;
+  isMobile: boolean;
   showFilters = false;
   showFiltersRow = false;
   expandedElement: any = null;
@@ -176,10 +177,12 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
       });
     this.dialogsLoadingService.start();
     this.deviceType = this.deviceInfoService.getDeviceType();
+    this.isMobile = this.deviceType === DeviceType.MOBILE || this.deviceType === DeviceType.SMALL_MOBILE;
   }
 
   @HostListener('window:resize') OnResize() {
     this.deviceType = this.deviceInfoService.getDeviceType();
+    this.isMobile = this.deviceType === DeviceType.MOBILE || this.deviceType === DeviceType.SMALL_MOBILE;
   }
 
   ngOnInit() {

src/app/courses/courses.scss

@@ -1,130 +1,48 @@
 @use '../variables' as v;
 @use './courses-shared' as c;
-.mat-mdc-table {
-  .mat-mdc-row {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: rgba(0, 0, 0, 0.12);
-  }
-
-  .mat-mdc-cell {
-    border: none;
-  }
 
-  /* Column Widths */
+planet-courses {
   .mat-column-select {
     max-width: 44px;
     padding: 0 0 0 24px;
   }
 
-  .mat-column-info {
-    max-width: 200px;
-    align-self: start;
-    padding: 0;
-  }
-
   .mat-column-createdDate {
     max-width: 100px;
-    align-self: start;
-    padding: 0;
   }
 
-  .mat-column-rating {
-    max-width: 145px;
-    padding: 0;
-  }
-}
-
-.column {
-  display: flex;
-  flex-direction: column;
-}
-
-.column > * {
-  line-height: normal;
-}
-
-.course-progress {
-  margin-top: 0.5rem;
-}
-
-.ellipsis-menu {
-  text-align: center;
-}
-
-.created-label {
-  display: none;
-}
-
-.rating-header {
-  justify-content: center;
-}
-
-.margin-tp {
-  margin-top: 0.75rem;
-}
-
-.search-bar {
-  height: c.$toolbar-height;
-}
+  .column {
+    display: flex;
+    flex-direction: column;
 
-.break-word {
-  word-break: break-word;
-}
+    > * {
+      line-height: normal;
+    }
+  }
 
-planet-courses {
-  .preview-content {
-    height: 9rem;
-    overflow: hidden;
+  .course-progress {
+    margin-top: 0.5rem;
   }
 
-  .preview-toggle {
+  .ellipsis-menu {
     text-align: center;
   }
 
-  .expanded-row .content {
-    max-height: none;
+  .margin-tp {
+    margin-top: 0.75rem;
   }
 
-  @media(max-width: v.$screen-md) {
-    .mat-column-info {
-      max-width: 120px;
-    }
-
-    .mat-column-createdDate {
-      max-width: 70px;
-    }
+  .search-bar {
+    height: c.$toolbar-height;
   }
 
-  @media(max-width: v.$screen-sm) {
-    .created-label {
-      display: inline-block;
-    }
-
-    .mat-column-info {
-      max-width: fit-content;
-    }
+  .break-word {
+    word-break: break-word;
+  }
 
+  @media(max-width: v.$screen-md) {
     .mat-column-createdDate {
-      max-width: fit-content;
-    }
-
-    .mat-mdc-header-row {
-      display: none;
-    }
-
-    .mat-mdc-row {
-      flex-direction: column;
-      align-items: start;
-      padding: 8px 24px;
-    }
-
-    .table-selection-top {
-      display: none;
-    }
-
-    .rating-cell {
-      align-self: flex-end;
+      max-width: 70px;
     }
   }
 }

src/app/courses/step-view-courses/courses-step-view.component.html

@@ -66,7 +66,7 @@ <h3 class="margin-lr-3 ellipsis-title"><ng-container i18n>Step</ng-container> {{
       <span>{{stepNum}}/{{maxStep}}</span>
       <button mat-icon-button *ngIf="maxStep !== 1" [disabled]="stepNum === 1 || isLoading" (click)="changeStep(-1)"><mat-icon>navigate_before</mat-icon></button>
       <button mat-icon-button *ngIf="stepNum !== maxStep"  [disabled]="isLoading || !canProceedToNextStep()" (click)="changeStep(1)"><mat-icon>navigate_next</mat-icon></button>
-      <button mat-raised-button class="finish-button" *ngIf="stepNum === maxStep" [disabled]="isLoading || !canProceedToNextStep()" (click)="backToCourseDetail()" i18n>Finish</button>
+      <button mat-raised-button color="accent" class="margin-lr-10" *ngIf="stepNum === maxStep" [disabled]="isLoading || !canProceedToNextStep()" (click)="backToCourseDetail()" i18n>Finish</button>
     </div>
   </mat-toolbar>
   <div class="view-container view-full-height" [ngClass]="{'grid-view': showChat, 'flex-view': !isGridView && !showChat}" *ngIf="stepDetail?.description || resource?._attachments; else emptyRecord">

src/app/courses/step-view-courses/courses-step-view.scss

@@ -58,10 +58,6 @@
     text-overflow: ellipsis;
   }
 
-  .finish-button {
-    margin-left: 10px;
-  }
-
   @media (max-width: v.$screen-sm) {
     .grid-view {
       display: grid;

src/app/exams/exams-add.component.ts

@@ -89,9 +89,9 @@ export class ExamsAddComponent implements OnInit, CanComponentDeactivate {
   documentInfo: ExamDocumentInfo = {};
   pageType: 'Add' | 'Update' | 'Copy' = 'Add';
   courseName = '';
-  examType: 'exam' | 'survey' = <'exam' | 'survey'>this.route.snapshot.paramMap.get('type') || 'exam';
+  examType: 'exam' | 'survey';
   teamId = this.route.parent?.snapshot.paramMap.get('teamId') || null;
-  successMessage = this.examType === 'survey' ? $localize`New survey added` : $localize`New test added`;
+  successMessage: string;
   steps = [];
   showFormError = false;
   showPreviewError = false;
@@ -127,6 +127,9 @@ export class ExamsAddComponent implements OnInit, CanComponentDeactivate {
     private dialog: MatDialog,
     private submissionsService: SubmissionsService
   ) {
+    const typeParam = this.route.snapshot.paramMap.get('type');
+    this.examType = typeParam === 'exam' || typeParam === 'survey' ? typeParam : 'exam';
+    this.successMessage = this.examType === 'survey' ? $localize`New survey added` : $localize`New test added`;
     this.createForm();
   }