Merge branch 'release-8.0.0' of github.com:Sunbird-Ed/SunbirdEd-porta…

…l into 8.0.0_github_action
Sunbird-Ed · Jun 7, 2024 · f24800d · f24800d
2 parents 1eceb59 + 22c2416
commit f24800d
Show file tree

Hide file tree

Showing 21 changed files with 277 additions and 416 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,3 +54,4 @@ workflows:
   build_and_test:
     jobs:
       - test-cases
+
diff --git a/src/app/client/package.json b/src/app/client/package.json
@@ -86,7 +86,7 @@
     "@project-sunbird/sunbird-video-player-web-component": "1.1.1",
     "@project-sunbird/telemetry-sdk": "1.3.0",
     "@project-sunbird/web-extensions": "8.0.1",
-    "uci-console-v16":"8.0.0",
+    "uci-console-v16": "8.0.0",
     "@shikshalokam/sl-questionnaire": "7.0.0",
     "@shikshalokam/sl-reports-library": "6.0.0",
     "@swimlane/ngx-datatable": "20.1.0",
@@ -245,4 +245,4 @@
       "jest-preset-angular/build/serializers/html-comment"
     ]
   }
-}
+}
diff --git a/...lient/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts b/...lient/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts
@@ -252,7 +252,7 @@ export class ListAllReportsComponent implements OnInit {
 
     $(el).on('click', 'tbody tr td:not(.details-control)', (event) => {
       const rowData = masterTable && masterTable.row(event?.currentTarget).data();
-      if (_.get(rowData, 'reportid') && _.get(rowData, 'hashed_val') && rowData.hasOwnProperty('materialize')) {
+      if (_.get(rowData, 'reportid') && _.get(rowData, 'hashed_val')  || (this.reportService.isUserSuperAdmin() && rowData?.hasOwnProperty('materialize'))) {
         const reportid = _.get(rowData,'reportid');
         const hashed_val = _.get(rowData,'hashed_val');
         const materialize = _.get(rowData,'materialize');

diff --git a/...modules/merge-account/components/merge-account-status/merge-account-status.component.scss b/...modules/merge-account/components/merge-account-status/merge-account-status.component.scss
@@ -3,4 +3,8 @@
 
 .sb-merged-account-body-para.sb-color-success{
     color:var(--success-color);
+}
+
+.sb-certificatePage-logo {
+    width: calculateRem(150px);
 }
diff --git a/.../modules/observation/components/observation-listing/observation-listing.component.spec.ts b/.../modules/observation/components/observation-listing/observation-listing.component.spec.ts
@@ -150,6 +150,7 @@ describe('ObservationListingComponent', () => {
     });
 
     it('should call playcontent component', () => {
+        component.categoryKeys = [{code:'solution'}, {code:'solution_type'}, {code:'program'}, {code:'entityType'},{code:'programName'}]
         const mockEvent = {
             data: {
                 programId: 'mock-program-id',
@@ -167,7 +168,7 @@ describe('ObservationListingComponent', () => {
             solutionId: data.solutionId,
             observationId: data._id,
             solutionName: data.name,
-            programName: data.subject[0],
+            programName: data[component.categoryKeys[4].code],
             entityType: data.entityType
         })
         expect(component.router.navigate).toHaveBeenCalledWith(['observation/details'], {

diff --git a/...c/app/modules/observation/components/observation-listing/observation-listing.component.ts b/...c/app/modules/observation/components/observation-listing/observation-listing.component.ts
@@ -338,7 +338,7 @@ export class ObservationListingComponent
       solutionId: data.solutionId,
       observationId: data._id,
       solutionName: data.name,
-      programName: data.subject[0],
+      programName: data[this.categoryKeys[4].code],
       entityType:data.entityType
     };
     this.router.navigate(['observation/details'], {

diff --git a/...c/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts b/...c/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts
@@ -118,7 +118,7 @@ export class ContentPlayerPageComponent implements OnInit, OnDestroy, OnChanges
       this.playerService.getContent(this.contentId, params)
         .pipe(takeUntil(this.unsubscribe$))
         .subscribe(response => {
-          this.contentDetails = _.get(response, 'result.content') || _.get(response, 'result.questionset');
+          this.contentDetails = _.get(response, 'result.content') || _.get(response, 'result.questionset') || _.get(response, 'result.questionSet');
           const status = !_.has(this.contentDetails, 'desktopAppMetadata.isAvailable') ? false :
           !_.get(this.contentDetails, 'desktopAppMetadata.isAvailable');
           this.isContentDeleted.next({value: status});

diff --git a/src/app/client/src/app/modules/player-helper/components/player/player.component.scss b/src/app/client/src/app/modules/player-helper/components/player/player.component.scss
@@ -132,3 +132,6 @@
   overflow: hidden;
   position: relative;
 }
+.contentViewerIframeShadow.player-fullscreen .custom-web-player{
+  height: calc(100vh - 4rem);
+}
diff --git a/...app/modules/program-dashboard/components/program-datasets/program-datasets.component.html b/...app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
diff --git a/...app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss b/...app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss
@@ -1,40 +1,13 @@
 @use "@project-sunbird/sb-styles/assets/mixins/mixins" as *;
 
-.sb-modal-actions {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.sb-modal .ui.modal {
-  margin-top: 15% !important;
-}
-
 .ngx-datatable.fixed-header .datatable-header {
   padding: 0.625rem;
 }
 
-.sidebar-block {
-  min-height: 25rem;
-}
-
 .ngx-datatable.datatable-header {
   background: var(--mat-accordion-tab-body-active-bg) !important;
 }
 
-
-/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-.custom_mat_dd .mat-mdc-select-arrow-wrapper {
-  vertical-align: bottom !important;
-}
-
-.reset-filter{
-  color: var(--primary);
-  background-color: var(--brand-header-tail-text);
-  width: fit-content;
-}
-
 .newData{
   color:var(--ck-color-base-error);
   margin-left: 1.875rem;
@@ -53,39 +26,20 @@
   color: var(--ck-color-button-cancel);
 }
 
-.ppFilter{
-  margin-top: 1.25rem;
-}
-
 .col-gap{
-  gap:2rem;
-}
-
-.btn-col{
-  flex-grow: 1;
-  margin-left: 5rem !important;
-}
-
-.modalNote{
-  line-height: initial;
+  gap:1rem;
 }
 
 .infoIcon{
   width: 1.125rem;
 }
 .sb-graph-section{
-
   box-shadow: 0 calculateRem(2px) calculateRem(7px) 0 rgba(var(--rc-rgba-black), 0.16);
   background: var(--sb-graph-section-bg);
   border: 0.0625rem solid var(--rc-dddddd);
 
 }
 
-.sb-last-update-status {
-  font-size: calculateRem(12px);
-  font-weight: bold;
-}
-
 .sb-label-name {
   font-size: 1rem;
 }
@@ -107,13 +61,6 @@
   /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
   /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
   /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-  .exportBtn .mat-form-field-wrapper {
-      float: right;
-  }
-
-  .cdk-overlay-container{
-    z-index: 9 !important;
-  }
 
   .customTable{
     sb-dashlets-filters{
@@ -126,10 +73,26 @@
       justify-content: flex-end !important;
     }
     .chart-title{
-      font-weight: 700;
+      font-weight: 700 !important;
+      color: var(--primary-color);
     }
-    table{
-      width: 100% !important;
+    .export-btn {
+      position: absolute;
+      top: -3rem !important;
+      right: 0 !important;
+    }
+    div.dt-container .dt-length, div.dt-container .dt-search, div.dt-container .dt-info, div.dt-container .dt-processing, div.dt-container .dt-paging{
+      display: flex;
+      align-items: center;
+      flex-direction: row-reverse;
+      gap: 1rem;
+      label{
+        margin: 0;
+        text-transform: capitalize;
+      }
+    }
+    div.dt-container div.dt-layout-row.dt-layout-table, div.dt-container div.dt-layout-row.dt-layout-table div.dt-layout-cell{
+      overflow: auto;
     }
   }
   .customGraph{
@@ -142,13 +105,6 @@
     }
   }
 
-  .customDate{
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    .mat-form-field-infix{
-      width: 8.75rem !important;
-    }
   }
   .chart-title {
     font-size: 1rem;
@@ -157,52 +113,3 @@
     padding-top: 0.5rem;
   }
 
-
-  .custom_mat_dd{
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    .mat-form-field-flex{
-      display: flex;
-      align-items: center !important;
-      box-sizing: border-box;
-      width: 100%;
-
-      input::placeholder{
-        color: rgba(0,0,0,.42) !important;
-        font-weight: bold !important;
-      }
-    }
-    /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-    /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-    .mat-select-arrow-wrapper {
-      vertical-align: unset !important;
-    }
-
-  }
-  .mat-mdc-select-panel .mat-mdc-option {
-    white-space: normal !important;
-    display: inline-table !important;
-    width: 100% !important;
-    line-height: 1.5em !important;
-    padding: 0.625rem 1.5em;
-  }
-  /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */
-  /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */
-  /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */
-  .mat-option-text{
-    display: flex !important;
-  }
-
-  .mat-dropdown__options span {
-    position: unset !important;
-  }
-  .mat-dropdown__options span:before {
-    display: flex !important;
-    align-self: flex-end !important;
-  }
-  .custom_mat_multi.mat-mdc-option{
-    display: flex !important;
-  }
-}
diff --git a/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html b/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html
@@ -1,29 +1,25 @@
-<app-modal-wrapper [config]="{disableClose: false,size: 'normal',panelClass: ['overflow-visible', 'material-modal']}" (dismiss)="closeModal()" #modal>
+<app-modal-wrapper [config]="{disableClose: false,size: 'normal',panelClass: ['material-modal', 'material-modal--small']}" (dismiss)="closeModal()" #modal>
   <ng-template sbModalContent>
-    <div class="sb-mat__modal sb-onboard">
+    <div class="sb-mat__modal">
       <div mat-dialog-title class="flex-jc-center">
-        <div class="sb-onboard__header">
-          <h4>{{ resourceService.frmelmnts?.lbl?.selectEntity }}</h4>
-        </div>
+        <h4>{{ resourceService.frmelmnts?.lbl?.selectEntity }}</h4>
         <button aria-label="close dialog" mat-dialog-close class="close-btn" (click)="closeModal()">
         </button>
       </div>
       <mat-dialog-content>
         <div class="sb-mat__modal__content">
-            <div class="content search-results">
-            <div *ngIf="solution.entities?.length">
-              <div *ngFor="let entity of solution.entities; let i = index">
-                <div class="sb-radio-btn-checkbox sb-radio-btn-primary checked-box">
-                  <input value="{{ entity._id }}" id="{{ entity._id }}" type="radio" [checked]="entity.selected"
-                    (change)="onEntityChange(entity)" />
-                  <label for="{{ entity._id }}"> {{ entity.name }}</label>
-                </div>
-              </div>
-            </div>
-            <div class="twelve wide column" *ngIf="!solution.entities?.length">
-              <app-no-result [data]="noResultMessage"></app-no-result>
+          <div *ngIf="solution.entities?.length">
+            <div *ngFor="let entity of solution.entities; let i = index">
+              <mat-radio-group>
+                <mat-radio-button color="primary" value="{{ entity._id }}" id="{{ entity._id }}" type="radio" [checked]="entity.selected" (change)="onEntityChange(entity)">
+                  {{ entity.name }}
+                </mat-radio-button>
+              </mat-radio-group>
             </div>
           </div>
+          <div class="twelve wide column" *ngIf="!solution.entities?.length">
+            <app-no-result [data]="noResultMessage"></app-no-result>
+          </div>
         </div>
       </mat-dialog-content>
       <mat-dialog-actions class="mb-0 sb-mat__modal__actions flex-jc-center">