batch-of-fixes-aug-3 (#2034)

scripts/robots-metada.postbuild.ts

@@ -1,5 +1,11 @@
 export function robotsMetadata(indexHtml: string, options) {
-  if (options.environmentVariables && options.environmentVariables.ROBOTS) {
+  if (options.languageCode === 'xx') {
+    console.warn('XX build will allow all robots')
+    return indexHtml.replace(`[ROBOTS_PARAMETERS]`, 'all')
+  } else if (
+    options.environmentVariables &&
+    options.environmentVariables.ROBOTS
+  ) {
     return indexHtml.replace(
       `[ROBOTS_PARAMETERS]`,
       options.environmentVariables.ROBOTS

src/app/cdk/panel/panels/panels.component.html

@@ -110,7 +110,7 @@ <h3 class="activity-header orc-font-body-large">
         </mat-icon>
         <ng-container *ngIf="!isMobile" i18n="@@shared.add"> Add </ng-container>
       </button>
-      <mat-menu #menuAdd="matMenu" xPosition="before">
+      <mat-menu #menuAdd="matMenu">
         <ng-container *ngIf="type === 'education' || type === 'qualification'">
           <button mat-menu-item (click)="add('education')">
             <ng-container i18n="@@shared.addEducation"
@@ -227,7 +227,7 @@ <h3 class="activity-header orc-font-body-large">
           Sort
         </ng-container>
       </button>
-      <mat-menu #menu="matMenu" xPosition="before">
+      <mat-menu #menu="matMenu">
         <button
           mat-menu-item
           (click)="sortChange(option)"

src/app/cdk/platform-info/browserlist.regexp.ts

@@ -1,3 +1,2 @@
 // tslint:disable-next-line: max-line-length
-export const BROWSERLIST_REGEXP =
-  /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
+export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/

src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.ts

@@ -6,6 +6,7 @@ import { SimpleActivityModel } from '../../component/summary-simple-panel/summar
 import { PlatformInfoService } from 'src/app/cdk/platform-info'
 import { takeUntil } from 'rxjs/operators'
 import { Subject } from 'rxjs'
+import { RobotsMetaTagsService } from 'src/app/core/robots-meta-tags/robots-meta-tags.service'
 
 @Component({
   selector: 'app-trusted-summary',
@@ -45,14 +46,18 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
   constructor(
     private _trustedSummary: TrustedSummaryService,
     private _router: Router,
-    private _platform: PlatformInfoService
+    private _platform: PlatformInfoService,
+    private _robotsMetaTags: RobotsMetaTagsService
   ) {}
   ngOnDestroy(): void {
     this.unsubscribe.next()
     this.unsubscribe.complete()
+    this._robotsMetaTags.restoreEnvironmentRobotsConfig()
+
   }
 
   ngOnInit(): void {
+    this._robotsMetaTags.disallowRobots()
     this._platform
       .get()
       .pipe(takeUntil(this.unsubscribe))
@@ -113,14 +118,14 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
       ) {
         this.peerReviews.push({
           verified: true,
-          countA: this.trustedSummary.reviews,
+          countA: this.trustedSummary.peerReviewPublicationGrants,
           stringA:
-            this.trustedSummary.reviews > 1
+            this.trustedSummary.peerReviewPublicationGrants > 1
               ? this.labelReviesFor
               : this.labelReviewFor,
-          countB: this.trustedSummary.peerReviewPublicationGrants,
+          countB: this.trustedSummary.reviews,
           stringB:
-            this.trustedSummary.peerReviewPublicationGrants > 1
+            this.trustedSummary.reviews > 1
               ? this.labelpublicationgrants
               : this.labelpublicationgrant,
         })