Merge branch 'release-6.1.0' of https://github.com/Sunbird-inQuiry/ed…

…itor into exam-validation

projects/questionset-editor-library/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@project-sunbird/sunbird-questionset-editor",
-  "version": "6.1.0-beta.4",
+  "name": "compass-collection-editor",
+  "version": "0.0.1",
   "dependencies": {
     "tslib": "^2.0.0"
   },

projects/questionset-editor-library/src/lib/components/meta-form/meta-form.component.ts

@@ -338,6 +338,7 @@ export class MetaFormComponent implements OnChanges, OnDestroy {
       data.appIcon = this.appIcon;
     }
     this.toolbarEmitter.emit({ button: 'onFormValueChange', data });
+    delete data.selectedQuestionType;
     this.treeService.updateNode(data);
   }
 

projects/questionset-editor-library/src/lib/components/question/question.component.spec.ts

@@ -1155,13 +1155,13 @@ describe("QuestionComponent", () => {
   it('#getAnswerHtml() should return answer html', () => {
     spyOn(component, 'getAnswerHtml').and.callThrough();
     const answerHtml = component.getAnswerHtml('<p>Sample Answer</p>');
-    expect(answerHtml).toBe('<div class=\'anwser-body\'><p>Sample Answer</p></div>');
+    expect(answerHtml).toBe('<div class=\'answer-body\'><p>Sample Answer</p></div>');
   });
 
   it('#getAnswerWrapperHtml() should return answer html', () => {
     spyOn(component, 'getAnswerWrapperHtml').and.callThrough();
-    const answerWrappedHtml = component.getAnswerWrapperHtml('<div class=\'anwser-body\'><p>Sample Answer</p></div>');
-    expect(answerWrappedHtml).toBe('<div class=\'anwser-container\'><div class=\'anwser-body\'><p>Sample Answer</p></div></div>');
+    const answerWrappedHtml = component.getAnswerWrapperHtml('<div class=\'answer-body\'><p>Sample Answer</p></div>');
+    expect(answerWrappedHtml).toBe('<div class=\'answer-container\'><div class=\'answer-body\'><p>Sample Answer</p></div></div>');
   });
 
   it('#getInteractionValues() should return correct answer object', () => {

projects/questionset-editor-library/src/lib/components/question/question.component.ts

@@ -186,14 +186,14 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy {
 
   initialize() {
     this.editorService.fetchCollectionHierarchy(this.questionSetId).subscribe((response) => {
-      this.questionSetHierarchy = _.get(response, 'result.questionSet');
+      this.questionSetHierarchy = _.get(response, 'result.questionset');
       const parentId = this.editorService.parentIdentifier ? this.editorService.parentIdentifier : this.questionId;
       //only for observation,survey,observation with rubrics
       if (!_.isUndefined(parentId) && !_.isUndefined(this.editorService.editorConfig.config.renderTaxonomy)) {
         this.getParentQuestionOptions(parentId);
         const sectionData = this.treeService.getNodeById(parentId);
-        const children = _.get(response, 'result.questionSet.children');
-        this.sectionPrimaryCategory = _.get(response, 'result.questionSet.primaryCategory');
+        const children = _.get(response, 'result.questionset.children');
+        this.sectionPrimaryCategory = _.get(response, 'result.questionset.primaryCategory');
         this.selectedSectionId = _.get(sectionData, 'data.metadata.parent');
         this.getBranchingLogic(children);
       }
@@ -836,13 +836,13 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   getAnswerHtml(optionLabel) {
-    const answerHtml = '<div class=\'anwser-body\'>{answer}</div>';
+    const answerHtml = '<div class=\'answer-body\'>{answer}</div>';
     const optionHtml = answerHtml.replace('{answer}', optionLabel);
     return optionHtml;
   }
 
   getAnswerWrapperHtml(concatenatedAnswers) {
-    const answerTemplate = '<div class=\'anwser-container\'>{answers}</div>';
+    const answerTemplate = '<div class=\'answer-container\'>{answers}</div>';
     const answer = answerTemplate.replace('{answers}', concatenatedAnswers);
     return answer;
   }

projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.scss

@@ -70,4 +70,8 @@
 .handle-zoom {
     overflow: hidden;
     position: relative;
+}
+
+lib-questionset-editor .image-viewer__close {
+    line-height: 45px !important;
 }

projects/questionset-editor-library/src/lib/services/config/category.config.json

@@ -1,5 +1,5 @@
 {
-  "QuestionSet": "questionSet",
+  "QuestionSet": "questionset",
   "Collection": "content",
   "Question": "question",
   "additionalCategories": {

projects/questionset-editor-library/src/lib/services/config/url.config.json

@@ -14,8 +14,8 @@
       "DEFAULT_PARAMS_FIELDS": "instructions,outcomeDeclaration"
     },
     "Question": {
-      "LIST":"question/v1/list",
-      "READ":"question/v1/read/",
+      "LIST":"question/v2/list",
+      "READ":"question/v2/read/",
       "CREATE": "question/v2/create",
       "UPDATE": "question/v2/update/",
       "REVIEW" : "question/v2/review/",

projects/questionset-editor-library/src/lib/services/editor/editor.service.spec.ts

@@ -1,5 +1,5 @@
 import { DataService } from './../data/data.service';
-import { editorConfig, BranchingLogicData, treeNodeData, rootNodeData, hierarchyRootNodeData } from './../../components/editor/editor.component.spec.data';
+import { editorConfig, BranchingLogicData, treeNodeData, rootNodeData, hierarchyRootNodeData, nativeElement } from './../../components/editor/editor.component.spec.data';
 import { TestBed } from '@angular/core/testing';
 import { EditorService } from './editor.service';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
@@ -12,9 +12,12 @@ import { of } from 'rxjs';
 import { PublicDataService } from '../public-data/public-data.service';
 import { ToasterService } from '../../services/toaster/toaster.service';
 import { TreeService } from '../tree/tree.service';
+import * as treeData from '../../services/tree/tree.service.spec.data';
 import * as mockData from './editor.service.spec.data';
 import { map } from 'rxjs/operators';
 import * as _ from 'lodash-es';
+import 'jquery.fancytree';
+declare var $: any;
 
 describe('EditorService', () => {
   let editorService: EditorService;
@@ -527,7 +530,10 @@ describe('EditorService', () => {
   });
 
   it('#getCollectionHierarchy should call', () => {
+    treeService.treeCache.nodesModified = treeData.treeNode;
+    treeService.treeNativeElement = nativeElement;
     spyOn(editorService, 'getCollectionHierarchy').and.callThrough();
+    spyOn(editorService, 'getUpdatedNodeMetaData').and.callFake(() => { return treeService.treeCache.nodesModified });
     spyOn(treeService, 'getFirstChild').and.callFake(() => {
       return { data: { metadata: { identifier: '0123' } } };
     });
@@ -539,7 +545,10 @@ describe('EditorService', () => {
   });
 
   it('#getCollectionHierarchy should call when folder false', () => {
+    treeService.treeCache.nodesModified = treeData.treeNode;
+    treeService.treeNativeElement = nativeElement;
     spyOn(editorService, 'getCollectionHierarchy').and.callThrough();
+    spyOn(editorService, 'getUpdatedNodeMetaData').and.callFake(() => { return treeService.treeCache.nodesModified });
     spyOn(treeService, 'getFirstChild').and.callFake(() => {
       return { data: { metadata: { identifier: '0123' } } };
     });
@@ -551,7 +560,10 @@ describe('EditorService', () => {
   });
 
   it('#getCollectionHierarchy should call when no section id and parent', () => {
+    treeService.treeCache.nodesModified = treeData.treeNode;
+    treeService.treeNativeElement = nativeElement;
     spyOn(editorService, 'getCollectionHierarchy').and.callThrough();
+    spyOn(editorService, 'getUpdatedNodeMetaData').and.callFake(() => { return treeService.treeCache.nodesModified });
     spyOn(treeService, 'getFirstChild').and.callFake(() => {
       return { data: { metadata: { identifier: '0123' } } };
     });
@@ -561,6 +573,17 @@ describe('EditorService', () => {
     expect(editorService.getCollectionHierarchy).toHaveBeenCalled();
   });
 
+  it('#getUpdatedNodeMetaData should return root nodesModified data', () => {
+    treeService.treeCache.nodesModified = treeData.treeNode;
+    treeService.treeNativeElement = nativeElement;
+    // $(nativeElement).fancytree('getRootNode');
+    // spyOn($(nativeElement), 'fancytree').withArgs('getRootNode').and.callFake(() => {});
+    spyOn(treeService, 'getFirstChild').and.callFake(()=> treeData.treeNode.data.metadata);
+    spyOn(editorService, 'getUpdatedNodeMetaData').and.callThrough();
+    editorService.getUpdatedNodeMetaData();
+    expect(editorService.getUpdatedNodeMetaData).toHaveBeenCalled();
+  });
+
   it('#_toFlatObjFromHierarchy should call', () => {
     spyOn(editorService, '_toFlatObjFromHierarchy').and.callThrough();
     spyOn(treeService, 'getFirstChild').and.callFake(() => {

projects/questionset-editor-library/src/lib/services/tree/tree.service.spec.ts

@@ -2,7 +2,7 @@ import { editorConfig, nativeElement } from './../../components/editor/editor.co
 import { TestBed, inject } from '@angular/core/testing';
 import { TreeService } from './tree.service';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
-import { treeNode } from './tree.service.spec.data';
+import { treeNode, treeCache } from './tree.service.spec.data';
 
 describe('TreeService', () => {
   let treeService: TreeService;
@@ -70,6 +70,26 @@ describe('TreeService', () => {
     treeService.updateTreeNodeMetadata(treeNode,undefined,'Observation', 'QuestionSet');
   })
 
+
+  it('should call updateEvaluable for root element', ()=> {
+    treeService.treeCache = treeCache;
+    treeService.treeNativeElement = nativeElement;
+    spyOn(treeService, 'getFirstChild').and.callFake(()=> treeNode);
+    spyOn(treeService, 'updateFirstChild').and.callFake(() => {});
+
+    treeService.updateEvaluable('do_113263678834016256111');
+    expect(treeService.getFirstChild).toHaveBeenCalled();
+    expect(treeService.updateFirstChild).toHaveBeenCalled();
+  });
+
+  it('should call updateEvaluable for non root element', ()=> {
+    treeService.treeCache = treeCache;
+
+    spyOn(treeService, 'getFirstChild').and.callFake(()=> treeNode);
+    treeService.updateEvaluable('da0ac2f0-1ea3-464a-bc03-f62b71415837');
+    expect(treeService.getFirstChild).toHaveBeenCalled();
+  });
+
   // it("#updateTreeNodeMetadata() should call #setTreeCache() with primaryCategory", ()=> {
   //   spyOn(treeService, 'updateTreeNodeMetadata').and.callThrough();
   //   spyOn(treeService, 'getActiveNode').and.callFake(()=> treeNode);

server.js

@@ -12,9 +12,9 @@ const BASE_URL = 'https://compass-dev.tarento.com/';
 
 const API_AUTH_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI0WEFsdFpGMFFhc1JDYlFnVXB4b2RvU2tLRUZyWmdpdCJ9.mXD7cSvv3Le6o_32lJplDck2D0IIMHnv0uJKq98YVwk";
 
-const PORTAL_COOKIES= "connect.sid=s%3AsherXnbJZVk9PSaDZZKS067kYwg5wkPT.VXctObnTeEzMd%2F6qDRVMcPxg1TiDo2wxjfUaTKUQRJc"
+const PORTAL_COOKIES= "connect.sid=s%3AVt7WVGstPSBHDO7OPQ93GYfgYMuQg_0D.qPKlYxL4DJvsNRpLRMwB%2B6MPpvSxXsLo6SX9OcDGm7Q"
 
-const USER_TOKEN = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI5YnBaRzhRQWF1SnZodUl2a2VqM2RVU2g3MUMzLTlvc21TdlhNeFBrbENRIn0.eyJqdGkiOiI1NzIyMWU1OC1lZTM0LTRkZWYtOGQzMS1hMjE0NDI5ZThjMTEiLCJleHAiOjE2OTE1MTEwMzEsIm5iZiI6MCwiaWF0IjoxNjkxNDY3ODMxLCJpc3MiOiJodHRwczovL2NvbXBhc3MtZGV2LnRhcmVudG8uY29tL2F1dGgvcmVhbG1zL3N1bmJpcmQiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZjo0NDBjZTUzNi01NTYxLTRjYzgtOGZjMy1mZTRmMjUyMTBiZWY6YzIyNWI1ZTgtMGI5Mi00NWUxLWE1ZGMtODZjY2UwNWMzNTVhIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoibG1zIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiZjJjZmIyZmYtOGExYi00MGFlLWIwZjctYjY3NmNmYjRjYzRkIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwczovL2NvbXBhc3MtZGV2LnRhcmVudG8uY29tIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiIiLCJuYW1lIjoiQ29tcGFzc3JnQWRtaW4xIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiY29tcGFzc2FkbWluMSIsImdpdmVuX25hbWUiOiJDb21wYXNzcmdBZG1pbjEiLCJmYW1pbHlfbmFtZSI6IiIsImVtYWlsIjoiY28qKioqKioqKioqKkB5b3BtYWlsLmNvbSJ9.DID4TH2ipt-5OdyL4G-_Qj0wnSnyOLrLeKTR8Yh7Jr1mkAqILQMF_wRdIJTqO41JMmn0MZEdy1mpTT3IWYnfdzOJ9ASyzgKZv8zPbVVc0rdR2048qMII_JJYjq5j-37Me8hHCBDx_cBasfgmIYGY_3GkCiGCKK8-ip4Q3H2l1fm4PlzZvANATxa3hIHo1XbfoOaTiAZY5H1hQTUcx1uMqnPoqEEexWs-v0IzoAiKEgsTMMvmP108WzSViw9UL45qbfkOUlJt4R0lnAM_D2m-QaQcsAAoKrXNCl8L9UN_Wj3jtV4z0tn7Gz4cjcQB9Fk6ZqNjBjFpnkCYFaGqjoiXMg";
+const USER_TOKEN = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI5YnBaRzhRQWF1SnZodUl2a2VqM2RVU2g3MUMzLTlvc21TdlhNeFBrbENRIn0.eyJqdGkiOiI1MGMyOWE0ZC1iYjNkLTQzN2EtOTg3NC04M2EwMjVkZGFmZjAiLCJleHAiOjE2OTI2MzUyNTUsIm5iZiI6MCwiaWF0IjoxNjkyNTkyMDU1LCJpc3MiOiJodHRwczovL2NvbXBhc3MtZGV2LnRhcmVudG8uY29tL2F1dGgvcmVhbG1zL3N1bmJpcmQiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZjo0NDBjZTUzNi01NTYxLTRjYzgtOGZjMy1mZTRmMjUyMTBiZWY6YzIyNWI1ZTgtMGI5Mi00NWUxLWE1ZGMtODZjY2UwNWMzNTVhIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoibG1zIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiZTRjNjIxOGQtMmE3YS00M2VjLTkwZjYtNzFmYjU3M2YxZTFjIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwOi8vbG9jYWxob3N0OjMwMDAvKiIsImh0dHBzOi8vY29tcGFzcy1kZXYudGFyZW50by5jb20iLCJodHRwOi8vbG9jYWxob3N0OjMwMDAiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6IiIsIm5hbWUiOiJDb21wYXNzcmdBZG1pbjEiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJjb21wYXNzYWRtaW4xIiwiZ2l2ZW5fbmFtZSI6IkNvbXBhc3NyZ0FkbWluMSIsImZhbWlseV9uYW1lIjoiIiwiZW1haWwiOiJjbyoqKioqKioqKioqQHlvcG1haWwuY29tIn0.pT_UiKNpCW-8-a_S7dVyjKcSZnZ2Lrt7tk6Kh2jt8Rs0cqXE-L0Jec84IbGKCB2n-_yr1hdEuHMyEsmYZ4zNeUuVFoDSyRutesk-j_tbzfj8K5f3lmrcKHUf-qPKHIJJIFbtOCwTo6eJOAwFKPlqnBgdDhDAgdpOHTBwBpNAl3TYxO_fYOog7YAwCGTKAyOtRD28lcdd_mVi6nQUdbzbFtGcH3QzzmvpQts2IDCH_uq1Vhlw3zP272qNGv4iQnd34qapijbX7XSXFOVtMW5FD31j7KGN_VArpT9xQffsThUQdi-Lg6v0dmXi7aY7LcwKhhHamKH-my1unRfk9fZSEA";
 
 
 
@@ -43,34 +43,7 @@ app.all(['/api/framework/v1/read/*',
         return proxyReqOpts;
     }
 }));
-// app.use('/action/questionset/v2/*', proxy(BASE_URL, {
-//     https: true,
-//     limit: '30mb',
-//     proxyReqPathResolver: function (req) {
-//         console.log("pavan1", req.originalUrl);
-//         let originalUrl;
-//         if(!req.originalUrl.split("/").includes('update')) {
-//             originalUrl = req.originalUrl.replace('/action/', '/api/');
-//         } else {
-//             originalUrl = req.originalUrl;
-//         }
-//         console.log("pavan2", originalUrl);
-//         originalUrl = originalUrl.replace('/v2/','/v1/');
-//         console.log("pavan3", originalUrl);
-//         console.log('proxyReqPathResolver question', originalUrl, require('url').parse(originalUrl).path);
-//         return require('url').parse(originalUrl).path;
-//     },
-//     proxyReqOptDecorator: function (proxyReqOpts, srcReq) {
-//         console.log('proxyReqOptDecorator 3')
-//         // you can update headers
-//         proxyReqOpts.headers['Content-Type'] = 'application/json';
-//         proxyReqOpts.headers['user-id'] = 'content-editor';
-//         proxyReqOpts.headers['Cookie'] = PORTAL_COOKIES;
-//         proxyReqOpts.headers['authorization'] = `Bearer ${API_AUTH_TOKEN}`;
-//         proxyReqOpts.headers['x-authenticated-user-token'] = USER_TOKEN;
-//          return proxyReqOpts;
-//     }
-// }));
+
 app.use(['/action/questionset/v2/*',
     '/action/question/v2/*',
     '/action/collection/v1/*',
@@ -80,7 +53,6 @@ app.use(['/action/questionset/v2/*',
     https: true,
     limit: '30mb',
     proxyReqPathResolver: function (req) {
-        console.log("adda", req.originalUrl);
         let originalUrl = req.originalUrl.replace('/action/', '/api/')
         console.log('proxyReqPathResolver questionset', originalUrl, require('url').parse(originalUrl).path);
         return require('url').parse(originalUrl).path;
@@ -97,12 +69,12 @@ app.use(['/action/questionset/v2/*',
     }
 }));
 
-app.use(['/action/composite/v3/search'
-    ], proxy(BASE_URL, {
+app.use(['*/action/composite/v3/search'
+], proxy(BASE_URL, {
     https: true,
     limit: '30mb',
     proxyReqPathResolver: function (req) {
-        let originalUrl = req.originalUrl.replace('/action/composite/v3/', '/api/composite/v1/')
+        let originalUrl = req.originalUrl.replace('/action/action/composite/v3/', '/api/composite/v1/')
         console.log('proxyReqPathResolver questionset', originalUrl, require('url').parse(originalUrl).path);
         return require('url').parse(originalUrl).path;
     },
@@ -154,6 +126,8 @@ app.use(['/api','/assets','/action'], proxy(BASE_URL, {
         proxyReqOpts.headers['Content-Type'] = 'application/json';
         proxyReqOpts.headers['user-id'] = 'content-editor';
         proxyReqOpts.headers['Cookie'] = PORTAL_COOKIES;
+        proxyReqOpts.headers['authorization'] = `Bearer ${API_AUTH_TOKEN}`;
+        proxyReqOpts.headers['x-authenticated-user-token'] = USER_TOKEN;
         return proxyReqOpts;
     }
 }));

src/app/data.ts

@@ -7,14 +7,14 @@ export const questionSetEditorConfig = {
       fullName: 'Test User',
       firstName: 'Test',
       lastName: 'User',
-      orgIds: ['01309282781705830427']
+      orgIds: ['0138325860604395527']
     },
-    identifier: 'do_113856505592119296113', //do_1138559490270085121125
+    identifier: 'do_113867262426406912171', //do_113866448761913344127
     authToken: ' ',
     sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV',
     did: '7e85b4967aebd6704ba1f604f20056b6',
     uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45',
-    channel: '01309282781705830427',
+    channel: '0138325860604395527',
     pdata: {
       id: 'dev.dock.portal',
       ver: '2.8.0',

web-component/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@project-sunbird/sunbird-questionset-editor-web-component",
-    "version": "2.1.0-beta.4",
+    "version": "2.1.0-beta.6",
     "description": "The web component package for the sunbird questionset editor",
     "main": "sunbird-questionset-editor.js",
     "scripts": {