UCI integration

src/app/client/angular.json

@@ -54,6 +54,11 @@
                 "glob": "**/*",
                 "input": "./node_modules/@project-sunbird/sunbird-quml-player-v9/lib/assets/",
                 "output": "/assets/"
+              },
+              {
+                "glob": "**/*.*",
+                "input": "./node_modules/@samagra-x/uci-console/assets/",
+                "output": "/assets/uci-console"
               }
             ],
             "styles": [
@@ -329,4 +334,4 @@
   "cli": {
     "analytics": "c933c758-ef3b-463a-8d9c-7044a53ab381"
   }
-}
+}

src/app/client/package.json

@@ -61,6 +61,7 @@
     "@project-sunbird/sunbird-video-player-v9": "4.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.29",
     "@project-sunbird/web-extensions": "^0.0.2",
+    "@samagra-x/uci-console": "^1.1.5",
     "@shikshalokam/sl-questionnaire": "0.0.8",
     "@shikshalokam/sl-reports-library": "^1.0.5",
     "@swimlane/ngx-datatable": "16.1.1",

src/app/client/src/app/app.routing.ts

@@ -44,6 +44,9 @@ const appRoutes: Routes = [
   {
     path: 'manage', loadChildren: () => import('app/modules/manage/manage.module').then(m => m.ManageModule)
   },
+  {
+    path: 'uci-admin', loadChildren: () => import('app/modules/uci-admin/uci-admin.module').then(m => m.UciAdminModule)
+  },
   {
     path: '', loadChildren: () => import('app/modules/public/public.module').then(m => m.PublicModule)
   },

src/app/client/src/app/modules/core/components/main-header/main-header.component.html

@@ -421,6 +421,14 @@ <h4 class="mb-4 text-capitalize">{{showingResult}}</h4>
             {{resourceService.frmelmnts?.lbl?.manage}}
           </li>
 
+          <li class="list-item" tabindex="0" (click)="toggleSideMenu(false)" *ngIf='!isDesktopApp && permissionService.permissionAvailable'
+            appPermission [permission]='orgAdminRole' routerLink="uci-admin">
+            <i class="icon-svg icon-svg--sm icon-manage mr-8"><svg class="icon icon-svg--primary">
+                <use xlink:href="./assets/images/sprite.svg#Admin-icon"></use>
+              </svg></i>
+            {{resourceService.frmelmnts?.lbl?.connunicationConsole}}
+          </li>
+
           <li class="list-item" appOnlineOnly (click)="toggleSideMenu(false)"
             [class.active]="router.isActive(routerLinks?.groups)" tabindex="0"
             *ngIf="!router.isActive('', true) && !isDesktopApp" [routerLink]="[navigateToGroups()]" appTelemetryInteract

src/app/client/src/app/modules/shared/services/config/roles.config.json

@@ -57,7 +57,8 @@
        "collaboratingRole": ["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"],
        "dashboardRole": ["ORG_ADMIN", "REPORT_VIEWER", "REPORT_ADMIN"],
        "reportViewerRole": ["REPORT_VIEWER", "REPORT_ADMIN"],
-       "alltextbookRole": ["ORG_ADMIN"]
+       "alltextbookRole": ["ORG_ADMIN"],
+       "uciAdmin": ["ORG_ADMIN"]
     }
     ,"WORKSPACEAUTHGARDROLES":[
     {

src/app/client/src/app/modules/shared/services/config/url.config.json

@@ -368,7 +368,8 @@
     "DHITI":{
       "GENERIC_REPORTS": "v1/reports/fetch",
       "ALL_EVIDENCE":"v1/observations/listAllEvidences"
-    }
+    },
+    "UCI": "/uci"
 
   }
-}
+}

src/app/client/src/app/modules/uci-admin/components/index.ts

@@ -0,0 +1 @@
+export import * from "./uci/uci.component"

src/app/client/src/app/modules/uci-admin/components/uci/uci.component.html

@@ -0,0 +1 @@
+<lib-lib-entry [user]="userProfile" [baseUrl]="url" ></lib-lib-entry>

src/app/client/src/app/modules/uci-admin/components/uci/uci.component.spec.ts

@@ -0,0 +1,76 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UciComponent } from './uci.component';
+import { ConfigService } from '@sunbird/shared';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { APP_BASE_HREF } from '@angular/common';
+import { UserService } from '../../../core/services/user/user.service';
+import { configureTestSuite } from '@sunbird/test-util';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CacheService } from 'ng2-cache-service';
+
+describe('UciComponent', () => {
+  let baseHref;
+  let component: UciComponent;
+  let fixture: ComponentFixture<UciComponent>;
+  let userMockData = {
+    'userProfile': {
+      'missingFields': [],
+      'updatedDate': '2018-07-09 16:07:35:977+0000',
+      'completeness': 100,
+      'id': '159e93d1-da0c-4231-be94-e75b0c226d7c',
+      'identifier': '159e93d1-da0c-4231-be94-e75b0c226d7c',
+      'rootOrgId': 'ORG_001',
+      'firstName': 'Sunil',
+      'phone': '******7878',
+      'dob': '1982-01-01',
+      'status': 1,
+      'lastName': 'Pandith',
+      'gender': 'Male',
+      'email': 'su************@gmail.com',
+      'phoneverified': null,
+      'profileSummary': '.aa .   ',
+      'userName': 'sunil1as990',
+      'userId': '159e93d1-da0c-4231-be94-e75b0c226d7c',
+      'emailVerified': null,
+      'lastLoginTime': 1534920693649,
+      'createdDate': '2017-11-03 05:28:41:536+0000',
+      'createdBy': '',
+      'location': 'Bangaloree',
+      'rootOrgAdmin': false
+    }
+  }
+  configureTestSuite();
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UciComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+      providers: [
+        HttpClient, UserService, ConfigService, { provide: APP_BASE_HREF, useValue: baseHref }, CacheService
+      ],
+      imports: [HttpClientTestingModule]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UciComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should get user profile details', () => {
+    const userService = TestBed.get(UserService);
+    const configService = TestBed.get(ConfigService);
+    component.ngOnInit()
+    userService._userData$.next({ err: null, userProfile: userMockData.userProfile });
+    expect(component.userProfile).toEqual(userMockData.userProfile)
+    expect(component.url).toEqual(configService.urlConFig.URLS.UCI)
+  });
+
+});

src/app/client/src/app/modules/uci-admin/components/uci/uci.component.ts

@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { first } from 'rxjs/operators';
+import { UserService } from '../../../core/services/user/user.service';
+import {ConfigService} from '@sunbird/shared';
+
+@Component({
+  selector: 'app-uci',
+  templateUrl: './uci.component.html',
+  styleUrls: ['./uci.component.scss']
+})
+export class UciComponent implements OnInit {
+  public userProfile: any;
+  public url;
+
+  constructor(public userService: UserService,
+              private config: ConfigService) { }
+
+  ngOnInit(): void {
+    this.url = this.config.urlConFig.URLS.UCI;
+    this.userService.userData$.pipe(first()).subscribe((user) => {
+      if (user && user.userProfile) {
+        this.userProfile = user.userProfile;
+      }
+    });
+  }
+
+}

src/app/client/src/app/modules/uci-admin/uci-admin-routing.module.ts

@@ -0,0 +1,24 @@
+import { UciComponent } from './components/uci/uci.component';
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AuthGuard } from '../core/guard';
+
+const routes: Routes = [
+  { 
+    path: '', 
+    component: UciComponent, 
+    canActivate: [AuthGuard], 
+    data: {
+      roles: 'uciAdmin',
+      telemetry: {
+        env: 'uci-admin', pageid: 'uci-admin-page', type: 'view'
+      }
+    }
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class UciAdminRoutingModule { }

src/app/client/src/app/modules/uci-admin/uci-admin.module.ts

@@ -0,0 +1,16 @@
+import {ModuleWithProviders, NgModule} from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { UciComponent } from './components/uci/uci.component';
+import { UciAdminRoutingModule } from './uci-admin-routing.module';
+import {UciModule} from '@samagra-x/uci-console';
+
+
+@NgModule({
+  declarations: [UciComponent],
+  imports: [
+    UciAdminRoutingModule,
+    UciModule
+  ]
+})
+export class UciAdminModule {
+}

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

@@ -1244,6 +1244,7 @@ frmelmnts.lnk.myactivity = My Activity
 frmelmnts.lnk.profile = Profile
 frmelmnts.lnk.viewall = View all
 frmelmnts.lnk.report= My Reports
+frmelmnts.lbl.connunicationConsole = Communication console
 frmelmnts.msg.activategrpfailed = Could not activate group, try again later
 frmelmnts.msg.activategrpmsg = Activating the group enables you to add members and activities. You can also track member progress
 frmelmnts.msg.activategrppopup = This group is temporarily deactivated. The group admin can re-activate the group

src/app/routes/clientRoutes.js

@@ -101,7 +101,7 @@ module.exports = (app, keycloak) => {
   '/orgType', '/orgType/*', '/dashBoard', '/dashBoard/*',
   '/workspace', '/workspace/*', '/profile', '/profile/*', '/learn', '/learn/*', '/resources', '/discussion-forum/*',
   '/resources/*', '/myActivity', '/myActivity/*', '/org/*', '/manage', '/contribute','/contribute/*','/groups','/groups/*', '/my-groups','/my-groups/*','/certs/configure/*',
-   '/observation', '/observation/*','/solution','/solution/*','/questionnaire','/questionnaire/*'], 
+   '/observation', '/observation/*','/solution','/solution/*','/questionnaire','/questionnaire/*', '/uci-admin', '/uci-admin/*'], 
   session({
     secret: envHelper.PORTAL_SESSION_SECRET_KEY,
     resave: false,