Not my user

.gitignore

@@ -50,5 +50,4 @@ testem.log
 Thumbs.db
 
 /src/assets
-package-lock.json
-yarn.lock
+package-lock.json

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.15
+FROM node:16.20.2
 
 WORKDIR /app
 COPY . .

Jenkinsfile-sun

@@ -15,43 +15,43 @@ node('build-slave') {
                     } else
                         println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
                 }
-                
+
                 cleanWs()
                 checkout scm
                 commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
                 build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
                 echo "build_tag: " + build_tag
-		
+
 		stage('assets-pull') {
 
                 dir("${env.WORKSPACE}/assets") {
                 checkout scm: [$class: 'GitSCM', branches: [[name: assets_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: asset_repo_credentials, url: assets_repo_url]]]
                 sh('cd MDO/client-assets && docker build -t assetsmdo . && docker run --name assetsmdo assetsmdo && docker cp assetsmdo:/usr/src/app/dist.zip . && docker rm -f assetsmdo && docker rmi -f assetsmdo && unzip dist.zip')
                 }
                 }
-		
+
 		stage('Build') {
                 env.NODE_ENV = "build"
                 print "Environment will be : ${env.NODE_ENV}"
                 sh('chmod 777 build.sh')
                 sh("bash -x build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
             }
-		  
-	      
+
+
                stage('ArchiveArtifacts') {
 	       	   sh ("echo ${build_tag} > build_tag.txt")
-                   archiveArtifacts "metadata.json"		     
-                    archiveArtifacts "build_tag.txt" 
+                   archiveArtifacts "metadata.json"
+                    archiveArtifacts "build_tag.txt"
                     currentBuild.description = "${build_tag}"
                 }
-            
+
         }
     }
     catch (err) {
         currentBuild.result = "FAILURE"
         throw err
     }
     finally {
-        email_notify()
+        // email_notify()
     }
-}
+}

angular.json

@@ -17,10 +17,11 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "preserveSymlinks": true,
             "assets": [
-              "src/favicon.ico",
               "src/favicon.png",
-              "src/mdo-assets"
+              "src/mdo-assets/icons/",
+              "src/mdo-assets/images/"
             ],
             "stylePreprocessorOptions": {
               "includePaths": [
@@ -88,7 +89,8 @@
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
               "node_modules/@project-sunbird/telemetry-sdk/index.js",
-              "node_modules/shepherd.js/dist/js/shepherd.min.js"
+              "node_modules/shepherd.js/dist/js/shepherd.min.js",
+              "node_modules/leader-line/leader-line.min.js"
             ]
           },
           "configurations": {
@@ -253,8 +255,7 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.ico",
-              "src/mdo-assets"
+              "src/favicon.png"
             ],
             "styles": [
               "src/styles.scss"

package.json

@@ -6,11 +6,11 @@
     "start": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy/localhost.proxy.json -o",
     "dev": "npm run start:mdo-dev",
     "prebuild": "npm run lint:fix",
-    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-benchmark": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=benchmark --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-preprod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=preprod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-np": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=np --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
+    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-benchmark": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=benchmark --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-preprod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=preprod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-np": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=np --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
     "postbuild": "npm run compress:gzip && npm run compress:brotli",
     "compress:brotli": "gzipper --brotli --gzip-level=9 --verbose ./dist/www",
     "compress:gzip": "gzipper --verbose --gzip-level=9 ./dist/www",
@@ -42,11 +42,13 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "1.0.13",
+    "@sunbird-cb/collection": "^1.0.46",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.3",
+    "@sunbird-cb/micro-surveys": "2.0.13",
+    "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.12",
+    "@sunbird-cb/taxonomy-editor": "0.0.36",
+    "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
     "chart.js": "^2.8.0",
@@ -59,7 +61,8 @@
     "jspdf": "^2.3.1",
     "jsplumb": "2.11.2",
     "keycloak-angular": "^6.1.0",
-    "lodash": "^4.17.21",
+    "leader-line": "1.0.7",
+    "lodash": "4.17.21",
     "material-icons": "^0.7.1",
     "moment": "^2.29.1",
     "mustache": "^3.0.2",
@@ -106,17 +109,18 @@
     "@types/d3": "^5.7.2",
     "@types/jasmine": "~3.4.0",
     "@types/jasminewd2": "~2.0.6",
-    "@types/lodash": "^4.14.172",
+    "@types/lodash": "4.14.172",
     "@types/mustache": "^0.8.32",
     "@types/node": "^10.17.60",
-    "@types/pdfjs-dist": "^2.1.3",
+    "@types/pdfjs-dist": "2.1.3",
     "@types/quill": "^2.0.2",
     "@types/uuid": "^8.3.3",
     "@types/video.js": "7.2.12",
     "@types/vis": "^4.21.19",
     "@types/zip.js": "2.0.28",
     "angular-cli-alias": "^1.0.9",
     "codelyzer": "^5.1.0",
+    "d3-funnel": "^2.1.1",
     "gzipper": "^2.8.1",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
@@ -136,4 +140,4 @@
     "typescript-tslint-plugin": "^0.5.4",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
+}

project/ws/app/src/lib/head/_services/telemetry.event.model.ts

@@ -15,6 +15,8 @@ export namespace TelemetryEvents {
     EVENTS_TAB = 'events-tab',
     APPROVAL_TAB = 'approval-tab',
     SCROLLY_MENU = 'scrolly-menu',
+    NOMINATE_BTN = 'nominate-learners-btn',
+    BTN_DOWNLOAD_REPORTS = 'btn-download-reports',
 
   }
   export enum EnumIdtype {

project/ws/app/src/lib/head/_services/widget-content.model.ts

@@ -423,4 +423,11 @@ export namespace NsContent {
   export enum ETagType {
     NEWLY_ADDED = 'NEWLY ADDED',
   }
+
+  export enum WFBlendedProgramApprovalTypes {
+    ONE_STEP_PC = 'oneStepPCApproval',
+    ONE_STEP_MDO = 'oneStepMDOApproval',
+    TWO_STEP_MDO_PC = 'twoStepMDOAndPCApproval',
+    TWO_STEP_PC_MDO = 'twoStepPCAndMDOApproval',
+  }
 }

project/ws/app/src/lib/head/left-menu/left-menu.component.html

@@ -0,0 +1,52 @@
+<div class="flex flex-1 flex-column min-wid sidenav-wrap text-center">
+  <div class="margin-top-xs flex flex-column max-width width-1-1">
+    <a href="javascript:void(0)" role="link" class="flex flex-column padding-right-m  padding-left-m">
+      <div class="dept-logo-block flex flex-middle flex-center">
+        <img src="../assets/icons/govtlogo.jpg" class="img-logo" />
+      </div>
+      <!-- <div class="dept-logo-block flex flex-middle flex-center" *ngIf="!widgetData.logo">
+        <img [src]="img.json" [alt]="widgetData.name" class="img-logo" />
+      </div> -->
+      <span i18n="title" class="mat-subheading-2 margin-top-m  dept-name">
+        <!-- this will be dynamic -->
+        {{mdoname}}
+      </span>
+    </a>
+  </div>
+</div>
+<ng-container *ngFor="let menu of menulist; let mi = index">
+  <ng-container *ngIf="menu.subMenu">
+    <mat-accordion [multi]="true" class="custom-leftmenu">
+      <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="false" #example>
+        <mat-expansion-panel-header>
+          <mat-panel-title>
+            <mat-panel-description>
+              <p class="margin-remove">{{menu?.menuCategory}}</p>
+              <mat-icon *ngIf="!example.expanded">arrow_drop_down</mat-icon>
+              <mat-icon *ngIf="example.expanded">arrow_drop_up</mat-icon>
+            </mat-panel-description>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <mat-nav-list class="nav-list-menu flex-1">
+          <ng-container *ngFor="let tab of menu?.subMenu; let i = index">
+            <ng-container>
+              <a mat-list-item disableRipple class="flex outline-1 menu-item-a" [attr.data-index]="i"
+                [routerLink]="[tab.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
+                <span class="padding-left-xs">{{tab?.name}}</span>
+              </a>
+            </ng-container>
+          </ng-container>
+        </mat-nav-list>
+      </mat-expansion-panel>
+    </mat-accordion>
+  </ng-container>
+
+  <ng-container *ngIf="!menu.subMenu">
+    <mat-nav-list class="nav-list-menu flex-1">
+      <a mat-list-item disableRipple class="flex outline-1 main-menuitem" [attr.data-index]="mi"
+        [routerLink]="[menu.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
+        <span class="padding-left-xs sub-menu-text">{{menu?.menuCategory}}</span>
+      </a>
+    </mat-nav-list>
+  </ng-container>
+</ng-container>

project/ws/app/src/lib/head/left-menu/left-menu.component.scss

@@ -0,0 +1,142 @@
+@import 'ws-vars';
+
+::ng-deep .nav-container .mat-drawer-inner-container {
+  background: #F0F3F4;
+  border: 1px #F0F3F4 solid;
+  width: 99%;
+  height: 99%;
+  overflow: auto;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+
+::ng-deep .mat-drawer-container {
+  // z-index: 999;
+}
+
+.sidenav-wrap {
+  padding-top: 24px;
+  padding-bottom: 24px;
+}
+
+.min-wid {
+  min-width: 247px;
+
+}
+
+.outline-1 {
+  outline: unset !important;
+}
+
+.pad-l-4r {
+  padding-left: 2.75rem;
+}
+
+.dept-logo-block {
+  width: 88px;
+  height: 86px;
+  background: white;
+  border-radius: 4px;
+  border: 1px rgba(0, 0, 0, 0.16) solid;
+  margin: 0 auto;
+
+  .img-logo {
+    width: 72px;
+    height: 72px;
+    // height: 74px;
+  }
+
+  .dept-name {
+    color: rgba(0, 0, 0, 0.87);
+    font-size: 14px;
+    font-family: Lato;
+    font-weight: 700;
+    word-wrap: break-word;
+  }
+}
+
+::ng-deep .nav-list-menu {
+  padding-top: 0 !important;
+
+  .menu-item-a {
+    background-color: rgb(255, 255, 255);
+    position: relative;
+
+    .mat-list-item-content {
+      padding: 12px 16px 12px 32px !important;
+    }
+  }
+}
+
+.main-menuitem {
+  background: transparent !important;
+}
+
+.mat-nav-list a:not(:first-child) {
+  border-top: 1px solid #F0F3F4;
+}
+
+.ws-active-route-men::after {
+  content: "";
+  position: absolute;
+  border-left: 4px solid #1a4ca1;
+  height: inherit;
+}
+
+.max-width {
+  width: 190px;
+}
+
+// ::ng-deep .menuPannel.mat-expansion-panel-spacing:first-child,
+// .mat-accordion>:first-child:not(.mat-expansion-panel) .mat-expansion-panel-spacing {
+//   margin: unset !important;
+// }
+
+::ng-deep .custom-leftmenu .mat-expansion-panel:not([class*=mat-elevation-z]) {
+    background: transparent !important;
+    margin-bottom: 8px !important;
+}
+
+
+::ng-deep .menuPannel.mat-expansion-panel {
+  border-radius: unset !important;
+  box-shadow: none !important;
+
+  .mat-expansion-panel-body {
+    padding: 0 !important;
+  }
+}
+
+::ng-deep .mat-expansion-panel-header.mat-expanded:hover {
+  background: rgba(0, 0, 0, 0.04) !important;
+
+}
+
+::ng-deep .mat-expansion-panel-spacing {
+  margin: 0 !important;
+}
+
+::ng-deep .menuPannel .mat-expansion-panel-header {
+  padding: 8px 24px !important;
+  height: unset !important;
+  background: transparent !important;
+  font: 400 16px/24px Lato !important;
+}
+
+::ng-deep .menuPannel .mat-expansion-panel-header .mat-expansion-panel-header-title {
+  justify-content: space-between;
+  margin-right: 0;
+
+  .mat-expansion-panel-header-description {
+    justify-content: space-between;
+    margin-right: 0;
+    width: 100%;
+  }
+}
+
+.sub-menu-text {
+  font: 400 16px/24px Lato !important;
+}
+
+// <div style="width: 100%; height: 100%; padding: 16px; background: rgba(0, 0, 0, 0.04); justify-content: center; align-items: center; gap: 8px; display: inline-flex"><div style="flex: 1 1 0; color: black; font-size: 14px; font-family: Lato; font-weight: 700; word-wrap: break-word">Curate</div><div style="width: 24px; height: 24px; justify-content: center; align-items: center; display: flex"><div style="width: 24px; height: 24px; position: relative"><div style="width: 24px; height: 24px; left: 0px; top: 0px; position: absolute; opacity: 0; background: #D8D8D8"></div><div style="width: 10px; height: 5px; left: 7px; top: 15px; position: absolute; background: rgba(0, 0, 0, 0.60)"></div></div></div>
+// </div>