Merge remote-tracking branch 'upstream/release-1.8' into page-section

src/app/client/src/app/modules/core/components/data-driven-filter/data-driven-filter.component.ts

@@ -156,9 +156,9 @@ export class DataDrivenFilterComponent implements OnInit, OnDestroy {
             (data: ServerResponse) => {
               this.formFieldProperties = data;
               _.forEach(this.formFieldProperties, (formFieldCategory) => {
-                if (formFieldCategory && formFieldCategory.allowedUsers) {
-                  const userRoles = formFieldCategory.allowedUsers.filter(element => this.userRoles.includes(element));
-                  if (!this.showField(formFieldCategory.allowedUsers)) {
+                if (formFieldCategory && formFieldCategory.allowedRoles) {
+                  const userRoles = formFieldCategory.allowedRoles.filter(element => this.userRoles.includes(element));
+                  if (!this.showField(formFieldCategory.allowedRoles)) {
                     this.formFieldProperties.splice(this.formFieldProperties.indexOf(formFieldCategory), 1);
                   }
                 }
@@ -247,9 +247,9 @@ export class DataDrivenFilterComponent implements OnInit, OnDestroy {
     }
   }
 
-  showField(allowedUsers) {
-    if (allowedUsers) {
-      return this.permissionService.checkRolesPermissions(allowedUsers);
+  showField(allowedRoles) {
+    if (allowedRoles) {
+      return this.permissionService.checkRolesPermissions(allowedRoles);
     } else {
       return true;
     }

src/app/client/src/app/modules/org-management/components/user-upload/user-upload.component.spec.ts

@@ -43,7 +43,7 @@ describe('UserUploadComponent', () => {
         't0037': 'Password: Unique or common password given by organization',
         't0038': `All other columns are optional. These columns include information about the user such as:`,
         't0039': 'Phone',
-        't0040': `Role: User's role on DIKSHA. Examples for this column:
+        't0040': `Role: User's role on sunbird. Examples for this column:
         CONTENT_CREATOR, CONTENT_REVIEWER, FLAG_REVIEWER, COURSE_MENTOR, ORG_ADMIN, SYSTEM_ADMINISTRATION, COURSE_ADMIN, COURSE_CREATOR`,
         't0041': `Grade: Classes taught by the user`,
         't0042': `Location: User's place of location of the user`,

src/app/client/src/app/modules/telemetry/directives/telemetry-end/telemetry-end.directive.spec.data.ts

@@ -3,7 +3,7 @@ export const eventData = {
     'context': {
       'channel': '01231711180382208027',
       'pdata': {
-        'id': 'staging.diksha.portal',
+        'id': 'staging.sunbird.portal',
         'ver': '1.5.1',
         'pid': 'sunbird-portal'
       },

src/app/client/src/app/modules/telemetry/directives/telemetry-impression/telemetry-impression.directive.spec.data.ts

@@ -3,7 +3,7 @@ export const eventData = {
         'context': {
           'channel': '01231711180382208027',
           'pdata': {
-            'id': 'staging.diksha.portal',
+            'id': 'staging.sunbird.portal',
             'ver': '1.5.1',
             'pid': 'sunbird-portal'
           },

src/app/client/src/app/modules/telemetry/directives/telemetry-share/telemetry-share.directive.spec.data.ts

@@ -3,7 +3,7 @@ export const eventData = {
         'context': {
           'channel': '01231711180382208027',
           'pdata': {
-            'id': 'staging.diksha.portal',
+            'id': 'staging.sunbird.portal',
             'ver': '1.5.1',
             'pid': 'sunbird-portal'
           },

src/app/client/src/app/modules/telemetry/directives/telemetry-start/telemetry-start.directive.spec.data.ts

@@ -3,7 +3,7 @@ export const eventData = {
     'context': {
       'channel': '01231711180382208027',
       'pdata': {
-        'id': 'staging.diksha.portal',
+        'id': 'staging.sunbird.portal',
         'ver': '1.5.1',
         'pid': 'sunbird-portal'
       },

src/app/client/src/app/modules/workspace/components/up-for-review/up-for-review.component.spec.ts

@@ -136,7 +136,7 @@ describe('UpForReviewComponent', () => {
     userService._userData$.next({ err: null, userProfile: mockUserRoles });
     spyOn(component, 'getContentType').and.callThrough();
     const returnContentType = component.getContentType().contentType;
-    const ContentType = ['Collection', 'TextBook', 'Course', 'LessonPlan', 'Resource'];
+    const ContentType = ['Collection', 'Course', 'LessonPlan', 'Resource'];
     expect(returnContentType).toEqual(ContentType);
   }));
 });

src/app/package.json

@@ -2,7 +2,7 @@
   "name": "player",
   "author": "sunbird",
   "version": "1.8.0",
-  "buildNumber": "6",
+  "buildNumber": "8",
   "private": true,
   "devDependencies": {
     "chai": "^4.1.2",

src/app/resourcebundles/data/formElements/en.properties

@@ -491,7 +491,7 @@ t0036=UserName: The unique name assigned to the user by the organization. Ensure
 t0037=Password: Unique or common password given by organization
 t0038=All other columns are optional. These columns include information about the user such as:
 t0039=Phone
-t0040=Role: User’s role on DIKSHA. Examples for this column: CONTENT_CREATOR, CONTENT_REVIEWER, FLAG_REVIEWER, COURSE_MENTOR, ORG_ADMIN, SYSTEM_ADMINISTRATION, COURSE_ADMIN, COURSE_CREATOR
+t0040=Role: User’s role. Examples for this column: CONTENT_CREATOR, CONTENT_REVIEWER, FLAG_REVIEWER, COURSE_MENTOR, ORG_ADMIN, SYSTEM_ADMINISTRATION, COURSE_ADMIN, COURSE_CREATOR
 t0041=Grade: Classes taught by the user
 t0042=Location: User\u2019s place of location of the user
 t0043=DOB: User\u2019s date of birth, the value should be entered in DD-MM-YYYY format

src/app/resourcebundles/data/formElements/hi.properties

@@ -490,7 +490,7 @@ t0036=UserName: The unique name assigned to the user by the organization.Ensure
 t0037=Password: Unique or common password given by organization
 t0038=All other columns are optional. These columns include information about the user such as:
 t0039=Phone
-t0040=Role: User’s role on DIKSHA. Examples for this column: CONTENT_CREATOR, CONTENT_REVIEWER, FLAG_REVIEWER, COURSE_MENTOR, ORG_ADMIN, SYSTEM_ADMINISTRATION, COURSE_ADMIN, COURSE_CREATOR
+t0040=Role: User’s role. Examples for this column: CONTENT_CREATOR, CONTENT_REVIEWER, FLAG_REVIEWER, COURSE_MENTOR, ORG_ADMIN, SYSTEM_ADMINISTRATION, COURSE_ADMIN, COURSE_CREATOR
 t0041=Grade: Classes taught by the user
 t0042=Location: User\u2019s place of location of the user
 t0043=DOB: User\u2019s date of birth, the value should be entered in DD-MM-YYYY format