Issue #dp-1515 feat: question set editor integration in contribution …

src/app/client/src/app/modules/contribute/services/program-components/program-components.service.ts

@@ -3,6 +3,7 @@ import { CollectionComponent } from '../../../sourcing/components/collection/col
 import {DashboardComponent } from '../../../sourcing/components/dashboard/dashboard.component';
 import { ContentUploaderComponent } from '../../../sourcing/components/content-uploader/content-uploader.component';
 import { QuestionListComponent } from '../../../sourcing/components/question-list/question-list.component';
+import { QuestionSetEditorComponent } from '../../../sourcing/components/question-set-editor/question-set-editor.component';
 import { ToasterService } from '@sunbird/shared';
 
 @Injectable({
@@ -13,6 +14,7 @@ export class ProgramComponentsService {
     dashboardComponent: DashboardComponent,
     collectionComponent: CollectionComponent,
     uploadComponent: ContentUploaderComponent,
+    questionSetEditorComponent: QuestionSetEditorComponent,
     questionSetComponent: QuestionListComponent,
     curiositySetComponent: QuestionListComponent
   };

src/app/client/src/app/modules/core/services/programs/programs.service.ts

@@ -962,7 +962,7 @@ export class ProgramsService extends DataService implements CanActivate {
         data: {
           request: {
             "objectCategoryDefinition": {
-                "objectType": "Content",
+                "objectType": "QuestionSet",
                 "name": categoryName,
                 "channel": rootOrgId
             },

src/app/client/src/app/modules/program/services/program-components/program-components.service.ts

@@ -4,6 +4,7 @@ import {DashboardComponent } from '../../../sourcing/components/dashboard/dashbo
 import { ContentUploaderComponent } from '../../../sourcing/components/content-uploader/content-uploader.component';
 import { QuestionListComponent } from '../../../sourcing/components/question-list/question-list.component';
 import { ContentEditorComponent } from '../../../sourcing/components/content-editor/content-editor.component';
+import { QuestionSetEditorComponent } from '../../../sourcing/components/question-set-editor/question-set-editor.component';
 import { ToasterService } from '@sunbird/shared';
 
 @Injectable({
@@ -15,6 +16,7 @@ export class ProgramComponentsService {
     collectionComponent: CollectionComponent,
     uploadComponent: ContentUploaderComponent,
     questionSetComponent: QuestionListComponent,
+    questionSetEditorComponent: QuestionSetEditorComponent,
     curiositySetComponent: QuestionListComponent,
     editorComponent: ContentEditorComponent
   };

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

@@ -10,8 +10,8 @@
                 "type": "question"
             },
             {
-                "mimetype": "application/vnd.ekstep.quml-archive",
-                "type": "question"
+                "mimetype": "application/vnd.sunbird.questionset",
+                "type": "questionset"
             },
             {
                 "mimetype": "application/vnd.ekstep.html-archive",

src/app/client/src/app/modules/sourcing/components/chapter-list/chapter-list.component.ts

@@ -7,7 +7,7 @@ import { UUID } from 'angular2-uuid';
 import { SourcingService } from '../../services';
 import { map, catchError, first, filter } from 'rxjs/operators';
 import { throwError, Observable } from 'rxjs';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router, ActivatedRoute, NavigationExtras} from '@angular/router';
 import {
   IChapterListComponentInput, ISessionContext,
   IContentUploadComponentInput, IResourceTemplateComponentInput, IContentEditorComponentInput
@@ -764,8 +764,8 @@ export class ChapterListComponent implements OnInit, OnChanges, OnDestroy, After
       if (!_.isEmpty(this.userService.userProfile.lastName)) {
         creator = this.userService.userProfile.firstName + ' ' + this.userService.userProfile.lastName;
       }
-      const sharedMetaData = this.helperService.fetchRootMetaData(this.sharedContext, this.selectedSharedContext);
-      const option = {
+      const sharedMetaData = this.helperService.fetchRootMetaData(this.sharedContext, this.selectedSharedContext); 
+      let option = {
         url: `content/v3/create`,
         header: {
           'X-Channel-Id': this.programContext.rootorg_id
@@ -790,6 +790,7 @@ export class ChapterListComponent implements OnInit, OnChanges, OnDestroy, After
           }
         }
       };
+
       if (this.sampleContent) {
         option.data.request.content.sampleContent = this.sampleContent;
       }
@@ -799,7 +800,19 @@ export class ChapterListComponent implements OnInit, OnChanges, OnDestroy, After
       if (_.get(this.templateDetails, 'appIcon')) {
         option.data.request.content.appIcon = _.get(this.templateDetails, 'appIcon');
       }
-      this.actionService.post(option).pipe(map((res: any) => res.result), catchError(err => {
+
+      let createRes;
+      if (_.get(this.templateDetails, 'modeOfCreation') === 'questionset') {
+        option.url = 'questionset/v1/create';
+        option.data.request['questionset'] = {};
+        option.data.request['questionset'] = option.data.request.content;
+        delete option.data.request.content;
+        createRes = this.publicDataService.post(option);
+      } else {
+        createRes = this.actionService.post(option);
+      } 
+
+      createRes.pipe(map((res: any) => res.result), catchError(err => {
         const errInfo = {
           errorMsg: 'Unable to create contentId, Please Try Again',
           telemetryPageId: this.telemetryPageId,
@@ -813,8 +826,14 @@ export class ChapterListComponent implements OnInit, OnChanges, OnDestroy, After
           this.contentId = result.node_id;
           this.collectionHierarchyService.addResourceToHierarchy(this.sessionContext.collection, this.unitIdentifier, result.identifier)
             .subscribe(() => {
-               // tslint:disable-next-line:max-line-length
-               this.componentLoadHandler('creation', this.programComponentsService.getComponentInstance(event.templateDetails.onClick), event.templateDetails.onClick);
+              if (_.get(this.templateDetails, 'modeOfCreation') === 'questionset') {
+
+                const queryParams = "collectionId=" + this.sessionContext.collection + "&unitId=" + this.unitIdentifier;
+
+                this.router.navigateByUrl('/contribute/questionSet/' + result.identifier + "?" + queryParams);
+              }
+              // tslint:disable-next-line:max-line-length
+              this.componentLoadHandler('creation', this.programComponentsService.getComponentInstance(event.templateDetails.onClick), event.templateDetails.onClick);
             });
         });
     } else if (event.templateDetails) {
@@ -825,6 +844,10 @@ export class ChapterListComponent implements OnInit, OnChanges, OnDestroy, After
   }
 
   handlePreview(event) {
+    if (event.content.mimeType === 'application/vnd.sunbird.questionset') {
+      const queryParams = "collectionId=" + this.sessionContext.collection + "&unitId=" + this.unitIdentifier;
+      this.router.navigateByUrl('/contribute/questionSet/' + event.content.identifier + "?" + queryParams);    
+    }
     //const templateList = this.programsService.contentCategories;
     this.programsService.getCategoryDefinition(event.content.primaryCategory, this.programContext.rootorg_id).subscribe((res)=>{
       this.templateDetails = res.result.objectCategoryDefinition;

src/app/client/src/app/modules/sourcing/components/question-set-editor/question-set-editor.component.html

@@ -2,5 +2,5 @@
   <app-loader></app-loader>
 </div>
 <div *ngIf="!showLoader">
-  <lib-editor [editorConfig]="editorConfig" ></lib-editor>
+  <lib-editor [editorConfig]="editorConfig" (editorEmitter)="editorEventListener($event)"></lib-editor>
 </div>

src/app/client/src/app/modules/sourcing/components/question-set-editor/question-set-editor.component.ts

@@ -88,4 +88,8 @@ export class QuestionSetEditorComponent implements OnInit {
     }
     this.showLoader = false;
   }
+
+  private editorEventListener($event) {
+    console.log($event);
+  } 
 }

src/app/client/src/app/modules/sourcing/components/resource-template/resource-template.component.ts

@@ -131,6 +131,10 @@ export class ResourceTemplateComponent implements OnInit, OnDestroy {
     this.showModeofCreationModal = false;
     this.showQuestionTypeModal = false;
     switch (this.selectedtemplateDetails['modeOfCreation']) {
+      case 'questionset':
+        this.selectedtemplateDetails.onClick = 'questionSetEditorComponent';
+        this.selectedtemplateDetails.mimeType = ['application/vnd.sunbird.questionset'];
+        break;
       case 'question':
         this.selectedtemplateDetails.onClick = 'questionSetComponent';
         const temp = _.find(this.selectedtemplateDetails.editors, {'type': 'question'});

src/app/client/src/app/modules/sourcing/sourcing.module.ts

@@ -34,7 +34,7 @@ import { MvcPlayerComponent } from './components/mvc-player/mvc-player.component
 import { SkeletonLoaderComponent } from './components/skeleton-loader/skeleton-loader.component';
 import { NgInviewModule } from 'angular-inport';
 import { QuestionSetEditorComponent } from './components/question-set-editor/question-set-editor.component';
-import { QuestionEditorLibraryModule } from 'question-editor-library';
+import { QuestionEditorLibraryModule } from 'question-editor-library-v8';
 import {CarouselModule} from 'ngx-bootstrap/carousel';
 @NgModule({
   declarations: [QuestionListComponent, QuestionCreationComponent,