diff --git a/README.md b/README.md index d15372926..279c6237d 100644 --- a/README.md +++ b/README.md @@ -1,315 +1,126 @@ +# Sunbird Collection Editor -# :diamond_shape_with_a_dot_inside: Collection Editor library for Sunbird platform -Contains Collection Editor library components powered by angular. These components are designed to be used in the sunbirdEd portal and web portal to drive reusability, maintainability hence reducing the redundant development effort significantly. +## Run Locally -![image](https://user-images.githubusercontent.com/36467967/153172086-5552cfe4-ad39-4b70-b015-e7553610a6fa.png) +`Use node version 14.15.0` -# :bookmark_tabs: Getting Started -This guide explains how to set up your Angular project to begin using the collection editor library. It includes information on prerequisites, installing editor library, and optionally displaying a sample editor library component in your application to verify your setup. +Fork the project -If you are new to Angular or getting started with a new Angular application, see [Angular's full Getting Started Guide](https://angular.io/start) and [Setting up your environment](https://angular.io/guide/setup-local). - -For existing applications, follow the steps below to begin using Collection editor library. - - - -## :label: Step 1: Install the packages - -The following commands will add `sunbird-collection-editor-v9` library to your package.json file along with its dependencies. - -```red -npm i @project-sunbird/sunbird-collection-editor-v9 --save +```bash + https://github.com/Sunbird-Ed/sunbird-collection-editor.git ``` -Don't forget to install the below peer dependencies of the library in your application. that need to be installed in order to use the library in your angular project. +### Setting up the Collection Editor Library +Go to the root directory -``` -npm i common-form-elements-web-v9 --save -npm i ng2-semantic-ui-v9 --save -npm i ngx-infinite-scroll --save -npm i lodash-es --save -npm i jquery.fancytree --save -npm i angular2-uuid --save -npm i @project-sunbird/client-services --save -npm i export-to-csv --save -npm i moment --save -npm i @project-sunbird/ckeditor-build-classic --save -npm i @project-sunbird/sunbird-pdf-player-v9 --save -npm i @project-sunbird/sunbird-epub-player-v9 --save -npm i @project-sunbird/sunbird-video-player-v9 --save -npm i @project-sunbird/sunbird-quml-player-v9 --save -npm i ngx-bootstrap@6.0.0 --save -npm i ng2-cache-service --save -npm i fine-uploader --save -npm i ngx-chips@2.2.0 --save -npm i epubjs --save -npm i videojs-contrib-quality-levels --save -npm i videojs-http-source-selector --save -npm i jquery --save -npm i express-http-proxy --save -npm i mathjax-full --save -npm i svg2img --save -npm i font-awesome --save -npm i @project-sunbird/sb-styles +```bash + cd sunbird-collection-editor ``` +Install dependencies -Note: *As Collection library is build with angular version 9, we are using **bootstrap@4.6.1** and **ngx-bootstrap@6.0.0** which are the compatible versions. -For more reference Check compatibility document for ng-bootstrap [here](https://valor-software.com/ngx-bootstrap/#/documentation#compatibility)* - -## :label: Step 2: create and copy required assests - -After installing the above dependencies, now we have to copy the required assets from the given folder to the assets folder of your angular application. It contains styles and plugins. - -- Copy the assets from: [assets](https://github.com/Sunbird-Ed/sunbird-collection-editor/tree/release-4.8.0/src/assets) - -image - -- Create a latexService.js in the root folder. Refer: [latexService.js](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.8.0/latexService.js) - -- Create a proxy.conf.json in the root folder. Refer: [proxy.conf.json](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.8.0/proxy.conf.json) - -- Create server.js in the root folder. Refer: [server.js](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.8.0/server.js) - - -## :label: Step 3: Include the styles, scripts and assets in angular.json - -Now open the `angular.json` file and add the following under `architect.build.assets` for default project - -```diff -{ - ... - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - ... - ... - "aot": false, - "assets": [ - ... - ... -+ { -+ "glob": "**/*", -+ "input": "node_modules/@project-sunbird/sunbird-pdf-player-v9/lib/assets/", -+ "output": "/assets/" -+ }, -+ { -+ "glob": "**/*", -+ "input": "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/", -+ "output": "/assets/" -+ }, -+ { -+ "glob": "**/*", -+ "input": "node_modules/@project-sunbird/sunbird-collection-editor-v9/lib/assets", -+ "output": "/assets/" -+ }, -+ { -+ "glob": "**/*", -+ "input": "node_modules/@project-sunbird/sunbird-quml-player-v9/lib/assets/", -+ "output": "/assets/" -+ } - ], - "styles": [ - ... -+ "src/assets/quml-styles/quml-carousel.css", -+ "node_modules/@project-sunbird/sb-styles/assets/_styles.scss", -+ "src/assets/lib/semantic/semantic.min.css", -+ "src/assets/styles/styles.scss", -+ "node_modules/font-awesome/css/font-awesome.css", -+ "node_modules/video.js/dist/video-js.min.css", -+ "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs.markers.min.css", -+ "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css" - ], - "scripts": [ - ... -+ "node_modules/epubjs/dist/epub.js", -+ "src/assets/libs/iziToast/iziToast.min.js", -+ "node_modules/jquery/dist/jquery.min.js", -+ "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js", -+ "src/assets/lib/dimmer.min.js", -+ "src/assets/lib/transition.min.js", -+ "src/assets/lib/modal.min.js", -+ "src/assets/lib/semantic-ui-tree-picker.js", -+ "node_modules/@project-sunbird/client-services/index.js", -+ "node_modules/video.js/dist/video.js", -+ "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs-markers.js", -+ "node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js", -+ "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.min.js" - ] - } - } - ... - ... -} +```bash + npm install ``` - -## :label: Step 4: Add question-cursor-implementation.service -Create a **`question-cursor-implementation.service.ts`** in a project and which will implement the `QuestionCursor` and `EditorCursor` abstract class. -`QuestionCursor` and `EditorCursor` is an abstract class, exported from the library, which needs to be implemented. Basically it has some methods which should make an API request over HTTP +Build the library -Let's create the `question-cursor-implementation` service by running the following command: -``` -cd src/app -ng g service question-cursor-implementation +```bash + npm run build-lib ``` -Now open `app.module.ts` file and import like this: - -```diff -+ import { EditorCursor } from 'collection-editor-library'; -+ import { QuestionCursor } from '@project-sunbird/sunbird-quml-player-v9'; -+ import { EditorCursorImplementationService } from './editor-cursor-implementation.service'; - -@NgModule({ - providers: [ -+ { provide: QuestionCursor, useExisting: EditorCursorImplementationService }, -+ { provide: EditorCursor, useExisting: EditorCursorImplementationService } - ], -}) -export class AppModule { } - -``` - - -For more information refer [question-cursor-implementation.service.ts](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.7.0/src/app/editor-cursor-implementation.service.ts) and do not forgot to add your question list API URL -**For example:** `https://staging.sunbirded.org/api/question/v1/list` - - - - -## :label: Step 5: Import the modules and components +It will create a `/dist/collection-editor-library` folder at the root directory and also copy all the required assets. -Include `CollectionEditorLibraryModule` in your app module: -```diff - import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -+ import { CollectionEditorLibraryModule, EditorCursor } from '@project-sunbird/sunbird-collection-editor-v9'; - import { RouterModule } from '@angular/router'; - import { QuestionCursor } from '@project-sunbird/sunbird-quml-player-v9'; - import { EditorCursorImplementationService } from './editor-cursor-implementation.service'; +### Starting up Sample application - @NgModule({ - ... +A sample angular application is included as part of this repo - imports: [ -+ CollectionEditorLibraryModule, - BrowserAnimationsModule, - RouterModule.forRoot([]) - ], - providers: [ - { provide: QuestionCursor, useExisting: EditorCursorImplementationService }, - { provide: EditorCursor, useExisting: EditorCursorImplementationService } - ] +In another terminal tab - - ... - }) +From the root directory - Start the server - export class AppModule { } +```bash + npm run start ``` +The demo app will launch at `http://localhost:4200` -Once your library is imported, you can use its main component, `lib-editor` in your Angular application. +### Run Node server to proxy the APIs +From the root directory - go to `server.js` file +```bash +Update the host variable to which env your pointing. example if you are pointing sunbird dev instance update veriable like below +const host = 'dev.sunbirded.org' -Add the tag to the `app.component.html` like so: - -``` - -``` - -## :label: Step 6: Send input to render Collection Editor - -Create a data.ts file which contains the `collectionEditorConfig` Refer: [data.ts](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.8.0/src/app/data.ts) - -(Note: `data.ts` contains the mock config used in component to send it as input to collection Editor. We need only [collectionEditorConfig](https://github.com/Sunbird-Ed/sunbird-collection-editor/blob/release-4.8.0/src/app/data.ts#L143).Use the mock config in your component to send input to collection editor as `editorConfig`) - -**app.component.ts** -```diff - ... -+ import { collectionEditorConfig } from './data'; - @Component({ - ... - }) - export class AppComponent { - ... -+ public editorConfig: any = collectionEditorConfig; - } +add `authorization` token as shown below +proxyReqOpts.headers['authorization'] = 'Bearer XXXX' ``` -**app.component.html** +### How to use NPM Sunbird-Questionset-Editor library in your Project -```html - -``` +For help getting started with a new Angular app, check out the Angular CLI. -## :orange_circle: Available components -|Feature| Notes| Selector|Code|Input|Output -|--|--|--|------------------------------------------------------------------------------------------|---|--| -| Collection Editor | Can be used to render Editor | lib-editor| *``*|editorConfig|editorEmitter| - -### :small_red_triangle_down: Input Parameters -1. editorConfig: Object - [`Required`] -```javascript -{ - context: Object // Information about the telemetry and default settings for editor API requests - config: Object // default editor config such as sidebar menu list -} -``` -For more information refer this documentation: [CONFIGURATION.MD](/docs/CONFIGURATION.md) +For existing apps, follow these steps to begin using . -### :small_red_triangle_down: Output Events -1. editorEmitter() - It emits event for each action performed in the editor. ---- +###### Step 1: Install the following packages + npm i @project-sunbird/sunbird-collection-editor-v9 -## :label: Step 7: Set the auth token and collection identifier -Go to the root directory - Open `server.js` file +###### Step 2: Include the Sunbird assets in angular.json + "assets": [ + "src/favicon.ico", + "src/assets", + { + "glob": "**/*", + "input": "./node_modules/@project-sunbird/sunbird-collection-editor-v9/lib/assets/", + "output": "/assets/" + } + ], -Update the host variable to which env your pointing. example if you are pointing sunbird dev instance update variable like below -```javascript -const BASE_URL = 'dev.sunbirded.org' -const API_AUTH_TOKEN = 'XXXX' -const USER_TOKEN= 'YYYY' -``` -Note: You will need actual `API_AUTH_TOKEN` and `USER_TOKEN` - -If you are pointing to sunbird dev -> [dev.sunbirded.org](https://dev.sunbirded.org/), create a textbook in sunbird dev, copy the `textbook_id` from the browser url and set the do_id of textbook in the `data.ts` file - -```javascript -export const collectionEditorConfig = { - context: { - ... - identifier: 'do_id', // identifier of textbook created in sunbird dev - ... - }, - config: { - ... - } -``` -## :label: Step 8: Build the library - -Run `npm run build-lib` to build the library. The build artifacts will be stored in the dist/ directory. - -## :label: Step 9: Run the application - -Before running the application, we have to start the node server to proxy the APIs by running the following command: +###### Step 3: Import the modules and components -``` -nodemon server.js -``` +Add to `NgModule` for the application in which you want to use: -Once that is done, Use the following CLI command to run your application locally + import { CollectionEditorLibraryModule } from 'sunbird-collection-editor-v9'; -``` -npm run start -``` + @NgModule({ + ... + imports: [ + CollectionEditorLibraryModule, + ... + }) -To see your application in the browser, go to [http://localhost:4200](http://localhost:4200). +### How to use question editor +In your template add + -# :bookmark_tabs: Editor Contribution and Configuration Guide +#### Input for library -[Contribution guidelines for this project](docs/CONTRIBUTING.md) +A sample config file is included in the demo app at `src/app/data.ts` -[Configuration guidelines for this project](docs/CONFIGURATION.md) + editorConfig: { + context: { + identifier: 'do_1132125506761932801130', + user: {}, + framework: '', + channel: '', + uid: " + }, + config: { + mode: 'edit', // edit / review / read + maxDepth: 0, + objectType: 'QuestionSet', + primaryCategory: 'Practice Question Set', + isRoot: true, + iconClass: 'fa fa-book', + children: { + Question: [ + 'Multiple Choice Question', + 'Subjective Question' + ] + }, + hierarchy: {} + } + } diff --git a/angular.json b/angular.json index 999de9efb..d1c13458d 100644 --- a/angular.json +++ b/angular.json @@ -56,12 +56,9 @@ "src/assets/styles/styles.scss", "node_modules/font-awesome/css/font-awesome.css", "node_modules/katex/dist/katex.min.css", - "node_modules/video.js/dist/video-js.min.css", - "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs.markers.min.css", - "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css" + "node_modules/video.js/dist/video-js.min.css" ], "scripts": [ - "node_modules/epubjs/dist/epub.js", "src/assets/libs/iziToast/iziToast.min.js", "node_modules/jquery/dist/jquery.min.js", "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js", @@ -71,11 +68,7 @@ "src/assets/lib/modal.min.js", "src/assets/lib/semantic-ui-tree-picker.js", "node_modules/@project-sunbird/telemetry-sdk/index.js", - "node_modules/@project-sunbird/client-services/index.js", - "node_modules/video.js/dist/video.js", - "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs-markers.js", - "node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js", - "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.min.js" + "node_modules/@project-sunbird/client-services/index.js" ] }, "configurations": { @@ -137,9 +130,7 @@ "styles": [ "src/styles.scss" ], - "scripts": [ - "node_modules/epubjs/dist/epub.js" - ], + "scripts": [], "assets": [ "src/favicon.ico", "src/assets" diff --git a/docs/Architecture.md b/docs/Architecture.md deleted file mode 100644 index a7ec8eeb3..000000000 --- a/docs/Architecture.md +++ /dev/null @@ -1,2 +0,0 @@ - -![Architecture](https://github.com/vaibhavbhuva/sunbird-collection-editor-1/blob/1df579f51f29a8a255bc502a2af327ab0ed3fb56/docs/collection-editor-architecture.drawio.png) diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md deleted file mode 100644 index 4dd9e0963..000000000 --- a/docs/CONFIGURATION.md +++ /dev/null @@ -1,276 +0,0 @@ -# Configuration Documentation - -Collection Editor is an angular library built with Angular version 9, and it exports some modules and components. - -**Component:** `editor` - -For example: -``` - -``` - -This is the main editor component that accepts some configuration based on it loads the editor. - -Let's deep dive into the editor input [configuration](/projects/collection-editor-library/src/lib/interfaces/editor.ts): - - -```javascript -export interface IEditorConfig { - context: Context; - config: any; -} -``` - -## Context - `Required` - -This required property from the `collectionEditorConfig` provides the context to the editor mostly in terms of the telemetry and it used these properties when the editor launch. - -```javascript -export interface Context { - programId?: string; - contributionOrgId?: string; - user: User; - identifier?: string; - mode?: string; - authToken?: string; - sid: string; - did: string; - uid: string; - channel: string; - pdata: Pdata; - contextRollup: ContextRollup; - tags: string[]; - cdata?: Cdata[]; - timeDiff?: number; - objectRollup?: ObjectRollup; - host?: string; - endpoint?: string; - userData?: { - firstName: string; - lastName: string; - }; - env: string; - defaultLicense?: any; - board?: any; - medium?: any; - gradeLevel?: any; - subject?: any; - topic?: any; - framework: string; - cloudStorageUrls?: string[]; - additionalCategories?: any[]; - labels?: any; - actor?: any; - channelData?: any; - correctionComments?: any; - sourcingResourceStatus?: string; - sourcingResourceStatusClass?: string; - collectionIdentifier?: string; - unitIdentifier?: string; - collectionObjectType?: string; - collectionPrimaryCategory?: string; - targetFWIds?: string[]; -} -``` - -The context has been classified into two parts as below: -1. Telemetry Context -2. Editor Context - -### 1. Telemetry Context: -It provides the context to the editor mostly in terms of the telemetry. -Let's understand the description of the following properties: - -|Property Name | Description | Required | Default Value -|--|------------------------------------------------------------------------------------------|---|--| -| `env` | It is `string` and Unique environment where the event has occured **For example:** in case of collection editor its `collection_editor` | true | `collection_editor OR questionset_editor` | -| `sid` | It is `string` and session id of the requestor stamped by portal **For example:** `vLpZ1rFl6-sxMVHi4RrmrlHw0HsX9ggC` | true | | -| `did` | It is `string` and uuid of the device, created during app installation or browser **For example:** `1d8e290dd3c2a6a9eeac58568cdef28d` | true | | -| `uid` | It is `string` and Current logged in user id **For example:** `5a587cc1-e018-4859-a0a8-e842650b9d64` | true | | -| `channel` | It is `string` which defines channel identifier to know which channel is currently using. **For example:** `01309282781705830427` | true | | -| `pdata` | It is an `object` which defines the producer information it should have identifier and version and canvas will log in the telemetry. **For example:** `{ id: 'local.sunbird.portal', ver: '4.1.0', pid: 'sunbird-portal' }` | true | | -| `contextRollup` | It is an `object` which defines collection roll up data For example: `{ l1: 'do_1234567890' }` | true | | -| `tags` | It is an `object` and Encrypted dimension tags passed by respective channels. For example: `['01307938306521497658']` | true | | -| `identifier` | It is `string` and Identifier of collection. | false | `''` | -| `authToken` | It is `string` and Auth key to make api calls. | false | `''` | -| `cdata` | It is an `array` which defines the correlation data | false | `[]` | -| `timeDiff` | It is `number` and timeDiff (in sec) is diff of server date and local date | false | `''` | -| `objectRollup` | It is an `object` which defines object rollup data (Only 4 levels are allowed) | false | `{}` | -| `host` | It is `string` which defines the from which domain collection should be load. **For example:** `https://dev.sunbirded.org` | false | `''` | -| `endpoint` | It is `string` and Telemetry API endpoint. **For example:** `/data/v3/telemetry` | false | `''` | -| `userData` | It is `object` and first and last name of logged in user | false | `{}` | - - -### 2. Editor Context: -The editor context is used while launching the editor. -Let's understand the description of the following properties: -|Property Name | Description | Required | Default Value -|--|------------------------------------------------------------------------------------------|---|--| -| `framework` | It is `string` and Organisation framework id. **For example:** `ekstep_ncert_k-12` | true | | -| `user` | It is an `object` which defines user data which contains users id, fullName, lastName, orgIds. | true | **For example:** ``` { id: '5a587cc1-e018-4859-a0a8-e842650b9d64', orgIds: [ '01309282781705830427' ], organisations: {}, fullName: 'Vaibhav Bhuva', firstName: 'Vaibhav', lastName: 'Bhuva', isRootOrgAdmin: true } ``` | -| `programId` | It is `string` and program id in which questionset is created. For example: `f72ad8b0-36df-11ec-a56f-4b503455085f` | false | `''` | -| `contributionOrgId` | It is `string` and Organisation id of the contributor. | false | `''` | -| `identifier` | It is `string` and Identifier of collection. For example: `do_1134357224765685761203`| false | `''` | -| `defaultLicense` | It is `string` and default license of editor. For example: `CC BY 4.0` | false | `''` | -| `cloudStorageUrls` | It is `array` and Array of cloud storage urls | false | `[]` | -| `additionalCategories` | It is `array` and Array of objects of additional categories. For example: `[ { value: 'Classroom Teaching Video', label: 'Classroom Teaching Video' }, { value: 'Concept Map', label: 'Concept Map' }]` | false | `[]` | -| `labels` | It is `object` and Additional labels to be used in editor| false | `{}` | -| `targetFWIds` | It is `array` and Array of target framework ids | false | `[]` | - - -## Config - `Required` -This required property from the `collectionEditorConfig` provides the configuration for the editor to enable/disable some functionalities. - -```javascript -config: { - mode: 'string', //Ex.: 'edit'/'review'/'read'/'sourcingReview'/'orgReview' - editableFields: { - sourcingreview: string[], //Ex.: ["name","description"] - orgreview: string[], - review: string[], - }, - maxDepth: number, //Ex.: 1 - dialcodeMinLength: number, //Ex.: 2 - dialcodeMaxLength: number, //Ex.: 250 - showAddCollaborator: 'boolen', // true | false - enableBulkUpload: 'boolen', - publicStorageAccount: 'url', //Ex.: https://dockstorage.blob.core.windows.net/ - assetConfig: object, - objectType: 'string', //Ex.: Collection - primaryCategory: 'string', //Ex.: Digital Textbook - isRoot: boolean, //Ex.: true - iconClass: 'string', //Ex.: 'fa fa-book' - children: { - Content: [ - 'Explanation Content', - 'Learning Resource', - 'eTextbook', - 'Teacher Resource', - 'Course Assessment' - ] - }, - hierarchy: { - level1: { - name: '', //ex: 'name of the section' - type: '', //ex: 'Unit' - mimeType: 'string', //Ex.: application/vnd.ekstep.content-collection - contentType: 'string', //Ex.: TextBookUnit - primaryCategory: 'string', //ex: 'Textbook Unit' - iconClass: 'string' //ex: 'fa fa-folder-o', - children: {} - }, - level2: { - name: 'string', //Ex.: 'Sub Section' - ... - ... - }, - level3: { - ... - ... - } - }, - contentPolicyUrl: 'string' //Ex.: '/term-of-use.html' - } -``` - -Note: If any of the property is added in object-category-definition. It will take the config from there, otherwise editor will take the mock config passed as input to the editor. - -Description of the properties for the config: - -|Property Name | Description | Required | Default Value -|--|------------------------------------------------------------------------------------------|---|--| -| `isRoot` | It is `boolen` and that defines the node is root node. | true | `true` | -| `objectType` | It is `string` and that defines the object type of collection | true | | -| `iconClass` | It is `string` and that defines the icon of root node | true | `fa fa-book` | -| `children` | It is an `object` and If maxdepth is 0 than children inside the root node defines the content type. **For example:** `children: { Content: [ 'Explanation Content', 'Learning Resource', 'eTextbook' ] }` | true | | -| `contentPolicyUrl` | It is `string` and It defines where should the content policy link will be redirected. | true | `/term-of-use.html` | -| `publicStorageAccount` | It is `url` and URL of the blob storage **For example:** `https://dockstorage.blob.core.windows.net/` | true | | -| `mode` | It is `string` and that defines the mode in editor is to be loaded. **For example:** `edit / review / read / sourcingReview / orgReview` | false | `edit` | -| `editableFields` | It is an `object` and that defines the mode in editor is to be loaded. | false | `{ sourcingreview: [], orgreview: [], review: [], }` | -| `maxDepth` | It is `number` and Defines the depth to which the textbook is to be created. If the depth is 1, hierarchy should have level1 described. | false | **For example:** `1` | -| `dialcodeMinLength` | It is `number` and it specifies the minimum number of characters required in an input field | false | `2` | -| `dialcodeMaxLength` | It is `number` and it specifies the maximum number of characters required in an input field | false | `250` | -| `showAddCollaborator` | It is `boolen` and this is to enable/disable the functionality of add collaborator in editor. If it is true add collobrorator button will be enabled and created can add the collolaborator to collaborate in textbook. | false | `false` | -| `assetConfig` | It is an `object` and `assetConfig` sets the max size limit and type for image and videos to be uploaded in the editor. **For example:** `{ "image": { "size": "1", "sizeType": "MB", "accepted": "png, jpeg" }, "video": { "size": "50", "sizeType": "MB", "accepted": "mp4, webm" } }` | false | `{}` | -| `hierarchy` | It is an `object` and If maxdepth is > 0 then hierarchy should have definiton of the levels. **For example:** `{ level1: { name: 'Textbook Unit', type: 'Unit', mimeType: 'application/vnd.ekstep.content-collection', contentType: 'TextBookUnit', primaryCategory: 'Textbook Unit', iconClass: 'fa fa-folder-o', children: { Content: [ 'Explanation Content', 'Learning Resource' ] } }}` | false | `{}` | - -Following are the configuration for different types of collections. - -**1. Digital Textbook** -```json -{ - "maxDepth": 2, - "objectType": "Collection", - "primaryCategory": "Digital Textbook", - "isRoot": true, - "iconClass": "fa fa-book", - "children": {}, - "hierarchy": { - "level1": { - "name": "Chapter", - "type": "unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": {} - }, - "level2": { - "name": "Sub-Chapter", - "type": "unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [] - } - } - } -} -``` - -**2. Course** -```json -{ - "maxDepth": 2, - "objectType": "Collection", - "primaryCategory": "Course", - "isRoot": true, - "iconClass": "fa fa-book", - "children": {}, - "hierarchy": { - "level1": { - "name": "Chapter", - "type": "unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {} - }, - "level2": { - "name": "Sub-Chapter", - "type": "unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [ - "Explanation Content", - "Learning Resource", - "eTextbook", - "Teacher Resource", - "Course Assessment" - ], - "QuestionSet": [ - "Practice Question Set" - ] - } - } - } -} -``` - - -### References: - -https://project-sunbird.atlassian.net/wiki/spaces/SingleSource/pages/2696183813/How+to+configure+forms+in+primaryCategory#Overview -https://project-sunbird.atlassian.net/wiki/spaces/SingleSource/pages/2118451214/Editor+Generalisation+Configurations diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md deleted file mode 100644 index 51ade33b1..000000000 --- a/docs/CONTRIBUTING.md +++ /dev/null @@ -1,96 +0,0 @@ -# Welcome to Editor contributing guide - -In this guide you will get an overview of the contribution workflow of the editor. - -**If you don't have git on your machine,** [install it](https://help.github.com/articles/set-up-git/). - -## Getting started - -#### Fork the project -Go to GitHub and [fork the repository](https://github.com/Sunbird-Ed/sunbird-collection-editor.git). -The forked repository will appear in your GitHub account as - -`https://github.com//sunbird-collection-editor` -#### Clone the repository - -Now clone the forked repository to your machine. Go to your GitHub account, open the forked repository, click on the code button and then click the copy to clipboard icon. - -Open a terminal and run the following git command: - -``` -git clone "url you just copied" -``` -For example: `git clone https://github.com/Sunbird-Ed/sunbird-collection-editor.git` - -#### Go to the root directory and run the following command - -``` -cd sunbird-collection-editor -``` - -#### Install dependencies - -``` -npm install -``` - -#### Build the library - -``` -npm run build-lib -``` - -It will create a `/dist/collection-editor-library` folder at the root directory and also copy all the required assets. - -#### Starting up the sample application - -A sample angular application is included as part of this repo - -Open your terminal, then start the server - - -``` -npm run start -``` - -The demo app will launch at http://localhost:4200 - - -#### Set the auth token and collection identifier - -Go to the root directory - Open `server.js` file - - -Update the host variable to which env your pointing. example if you are pointing sunbird dev instance update variable like below -```javascript -const BASE_URL = 'dev.sunbirded.org' -const API_AUTH_TOKEN = 'XXXX' -const USER_TOKEN= 'YYYY' -``` -Note: You will need actual `API_AUTH_TOKEN` and `USER_TOKEN` - -If you are pointing to sunbird dev ([dev.sunbirded.org](https://dev.sunbirded.org/)), create a collection in sunbird dev and set the do_id of created collection in `data.ts` file - -```javascript -export const collectionEditorConfig = { - context: { - ... - identifier: 'do_id', // identifier of collection created in sunbird dev - ... - }, - config: { - ... - ... - } -} -``` -Run Node server to proxy the APIs (Open one more terminal in root folder and run the server.js ) as: - - - ``` -nodemon server.js -``` - -#### Now make the changes. Stick to the code-style guidelines and remember about tests and 100% code coverage! -#### Commit your changes and Push your changes to your forked repository -#### Go to your forked repository on GitHub. Use the pull request button to create the pull request of your changes. \ No newline at end of file diff --git a/docs/Course.json b/docs/Course.json deleted file mode 100644 index 8271bea01..000000000 --- a/docs/Course.json +++ /dev/null @@ -1,648 +0,0 @@ -{ - "request": { - "objectCategoryDefinition": { - "objectMetadata": { - "config": { - "frameworkMetadata": { - "orgFWType": ["K-12", "TPD"], - "targetFWType": ["K-12"] - }, - "sourcingSettings": { - "collection": { - "maxDepth": 4, - "objectType": "Collection", - "primaryCategory": "Course", - "isRoot": true, - "iconClass": "fa fa-book", - "children": {}, - "hierarchy": { - "level1": { - "name": "Course Unit", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {"Content": []} - }, - "level2": { - "name": "Course Unit", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {"Content": []} - }, - "level3": { - "name": "Course Unit", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {"Content": []} - }, - "level4": { - "name": "Course Unit", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {"Content": []} - } - } - } - } - }, - "schema": { - "properties": { - "trackable": { - "type": "object", - "properties": { - "enabled": { - "type": "string", - "enum": ["Yes", "No"], - "default": "Yes" - }, - "autoBatch": { - "type": "string", - "enum": ["Yes", "No"], - "default": "Yes" - } - }, - "default": {"enabled": "Yes", "autoBatch": "Yes"}, - "additionalProperties": false - }, - "monitorable": { - "type": "array", - "items": { - "type": "string", - "enum": ["progress-report", "score-report"] - } - }, - "credentials": { - "type": "object", - "properties": { - "enabled": { - "type": "string", - "enum": ["Yes", "No"], - "default": "Yes" - } - }, - "default": {"enabled": "Yes"}, - "additionalProperties": false - }, - "userConsent": { - "type": "string", - "enum": ["Yes", "No"], - "default": "Yes" - }, - "mimeType": { - "type": "string", - "enum": ["application/vnd.ekstep.content-collection"] - } - } - } - }, - "languageCode": [], - "forms": { - "create": { - "templateName": "", - "required": [], - "properties": [ - { - "name": "First Section", - "fields": [ - { - "code": "appIcon", - "dataType": "text", - "description": "appIcon of the content", - "editable": true, - "inputType": "appIcon", - "label": "Icon", - "name": "Icon", - "placeholder": "Icon", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true - }, - { - "code": "name", - "dataType": "text", - "description": "Name of the content", - "editable": true, - "inputType": "text", - "label": "Title", - "name": "Name", - "placeholder": "Title", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "80", - "message": "Input is Exceeded" - }, - {"type": "required", "message": "Title is required"} - ] - }, - { - "code": "description", - "dataType": "text", - "description": "Description of the content", - "editable": true, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Description", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "required": false, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "256", - "message": "Input is Exceeded" - } - ] - }, - { - "code": "keywords", - "visible": true, - "editable": true, - "dataType": "list", - "name": "Keywords", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "description": "Keywords for the content", - "inputType": "keywords", - "label": "Keywords", - "placeholder": "Enter Keywords", - "required": false, - "validations": [] - } - ] - }, - { - "name": "Second Section", - "fields": [ - { - "code": "primaryCategory", - "dataType": "text", - "description": "Type", - "editable": false, - "renderingHints": {}, - "inputType": "select", - "label": "Category", - "name": "Type", - "placeholder": "", - "required": true, - "visible": true, - "validations": [] - }, - { - "code": "additionalCategories", - "dataType": "list", - "depends": ["primaryCategory"], - "description": "Additonal Category of the Content", - "editable": true, - "inputType": "nestedselect", - "label": "Additional Category", - "name": "Additional Category", - "placeholder": "Select Additional Category", - "renderingHints": {}, - "required": false, - "visible": true - } - ] - }, - { - "name": "Organisation Framework Terms", - "fields": [ - { - "code": "framework", - "visible": true, - "editable": true, - "dataType": "text", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "", - "label": "Course Type", - "required": true, - "name": "Framework", - "inputType": "framework", - "placeholder": "Select Course Type", - "output": "identifier", - "validations": [ - {"type": "required", "message": "Course Type is required"} - ] - }, - { - "code": "subjectIds", - "visible": true, - "editable": true, - "dataType": "list", - "depends": ["framework"], - "sourceCategory": "subject", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "", - "label": "Subjects covered in the course", - "required": true, - "name": "Subject", - "inputType": "frameworkCategorySelect", - "placeholder": "Select Subject(s)", - "output": "identifier", - "validations": [ - { - "type": "required", - "message": "Subjects Taught is required" - } - ] - }, - { - "code": "topicsIds", - "visible": true, - "editable": true, - "dataType": "list", - "depends": ["framework", "subjectIds"], - "sourceCategory": "topic", - "renderingHints": {}, - "name": "Topic", - "description": "Choose a Topics", - "inputType": "topicselector", - "label": "Topics covered in the course", - "placeholder": "Choose Topics", - "required": false, - "output": "identifier" - } - ] - }, - { - "name": "Target Framework Terms", - "fields": [ - { - "code": "audience", - "dataType": "list", - "description": "Audience", - "editable": true, - "inputType": "nestedselect", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "label": "Audience Type", - "name": "Audience Type", - "placeholder": "Select Audience Type", - "required": false, - "visible": true, - "range": ["Student", "Teacher", "Parent", "Administrator"] - }, - { - "code": "targetBoardIds", - "visible": true, - "depends": [], - "editable": true, - "dataType": "list", - "sourceCategory": "board", - "output": "identifier", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "Board", - "label": "Board/Syllabus of the audience", - "required": true, - "name": "Board/Syllabus", - "inputType": "select", - "placeholder": "Select Board/Syllabus", - "validations": [ - {"type": "required", "message": "Board is required"} - ] - }, - { - "code": "targetMediumIds", - "visible": true, - "depends": ["targetBoardIds"], - "editable": true, - "dataType": "list", - "sourceCategory": "medium", - "output": "identifier", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "", - "label": "Medium(s) of the audience", - "required": true, - "name": "Medium", - "inputType": "nestedselect", - "placeholder": "Select Medium", - "validations": [ - {"type": "required", "message": "Medium is required"} - ] - }, - { - "code": "targetGradeLevelIds", - "visible": true, - "depends": ["targetBoardIds", "targetMediumIds"], - "editable": true, - "dataType": "list", - "sourceCategory": "gradeLevel", - "output": "identifier", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "Class", - "label": "Class(es) of the audience", - "required": true, - "name": "Class", - "inputType": "nestedselect", - "placeholder": "Select Class", - "validations": [ - {"type": "required", "message": "Class is required"} - ] - }, - { - "code": "targetSubjectIds", - "visible": true, - "depends": [ - "targetBoardIds", - "targetMediumIds", - "targetGradeLevelIds" - ], - "editable": true, - "dataType": "list", - "sourceCategory": "subject", - "output": "identifier", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "description": "", - "label": "Subject(s) of the audience", - "required": true, - "name": "Subject", - "inputType": "nestedselect", - "placeholder": "Select Subject", - "validations": [ - {"type": "required", "message": "Subject is required"} - ] - } - ] - }, - { - "name": "Fourth Section", - "fields": [ - { - "code": "author", - "dataType": "text", - "description": "Author of the content", - "editable": true, - "inputType": "text", - "label": "Author", - "name": "Author", - "placeholder": "Author", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "required": false, - "visible": true - }, - { - "code": "attributions", - "dataType": "text", - "description": "Attributions", - "editable": true, - "inputType": "text", - "label": "Attributions", - "name": "Attributions", - "placeholder": "Attributions", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "required": false, - "visible": true - }, - { - "code": "copyright", - "dataType": "text", - "description": "Copyright", - "editable": true, - "inputType": "text", - "label": "Copyright", - "name": "Copyright & year", - "placeholder": "Copyright", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true, - "validations": [ - {"type": "required", "message": "Copyright is required"} - ] - }, - { - "code": "copyrightYear", - "dataType": "number", - "description": "Year", - "editable": true, - "inputType": "text", - "label": "Copyright Year", - "name": "Copyright Year", - "placeholder": "Copyright Year", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true, - "validations": [ - { - "type": "required", - "message": "Copyright Year is required" - } - ] - }, - { - "code": "license", - "dataType": "text", - "description": "license", - "editable": true, - "inputType": "select", - "label": "License", - "name": "license", - "placeholder": "Select License", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true, - "defaultValue": "CC BY 4.0", - "validations": [ - {"type": "required", "message": "License is required"} - ] - } - ] - } - ] - }, - "search": { - "templateName": "", - "required": [], - "properties": [ - { - "code": "primaryCategory", - "dataType": "list", - "description": "Type", - "editable": true, - "default": [], - "renderingHints": {"class": "sb-g-col-lg-1"}, - "inputType": "nestedselect", - "label": "Content Type(s)", - "name": "Type", - "placeholder": "Select ContentType", - "required": false, - "visible": true - }, - { - "code": "board", - "visible": true, - "depends": [], - "editable": true, - "dataType": "list", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "description": "Board", - "label": "Board", - "required": false, - "name": "Board", - "inputType": "select", - "placeholder": "Select Board", - "output": "name" - }, - { - "code": "medium", - "visible": true, - "depends": ["board"], - "editable": true, - "dataType": "list", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "description": "", - "label": "Medium(s)", - "required": false, - "name": "Medium", - "inputType": "nestedselect", - "placeholder": "Select Medium", - "output": "name" - }, - { - "code": "gradeLevel", - "visible": true, - "depends": ["board", "medium"], - "editable": true, - "default": "", - "dataType": "list", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "description": "Class", - "label": "Class(es)", - "required": false, - "name": "Class", - "inputType": "nestedselect", - "placeholder": "Select Class", - "output": "name" - }, - { - "code": "subject", - "visible": true, - "depends": ["board", "medium", "gradeLevel"], - "editable": true, - "default": "", - "dataType": "list", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "description": "", - "label": "Subject(s)", - "required": false, - "name": "Subject", - "inputType": "nestedselect", - "placeholder": "Select Subject", - "output": "name" - }, - { - "code": "topic", - "visible": true, - "editable": true, - "dataType": "list", - "depends": ["board", "medium", "gradeLevel", "subject"], - "default": "", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "name": "Topic", - "description": "Choose a Topics", - "inputType": "topicselector", - "label": "Topic(s)", - "placeholder": "Choose Topics", - "required": false - } - ] - }, - "unitMetadata": { - "templateName": "", - "required": [], - "properties": [ - { - "name": "First Section", - "fields": [ - { - "code": "name", - "dataType": "text", - "description": "Name of the content", - "editable": true, - "inputType": "text", - "label": "Title", - "name": "Title", - "placeholder": "Title", - "renderingHints": {"class": "sb-g-col-lg-1 required"}, - "required": true, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "120", - "message": "Input is Exceeded" - }, - {"type": "required", "message": "Title is required"} - ] - }, - { - "code": "description", - "dataType": "text", - "description": "Description of the content", - "editable": true, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Description", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "required": false, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "256", - "message": "Input is Exceeded" - } - ] - }, - { - "code": "keywords", - "visible": true, - "editable": true, - "dataType": "list", - "name": "Keywords", - "renderingHints": {"class": "sb-g-col-lg-1"}, - "index": 3, - "description": "Keywords for the content", - "inputType": "keywords", - "label": "Keywords", - "placeholder": "Enter Keywords", - "required": false, - "validations": [] - }, - { - "code": "topic", - "visible": true, - "depends": [], - "editable": true, - "dataType": "list", - "renderingHints": {}, - "name": "Topic", - "description": "Choose a Topics", - "index": 11, - "inputType": "topicselector", - "label": "Topics", - "placeholder": "Choose Topics", - "required": false, - "validations": [] - } - ] - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/docs/Digital Textbook.json b/docs/Digital Textbook.json deleted file mode 100644 index 6f4c461e0..000000000 --- a/docs/Digital Textbook.json +++ /dev/null @@ -1,1381 +0,0 @@ -{ - "request": { - "objectCategoryDefinition": { - "objectMetadata": { - "config": { - "sourcingSettings": { - "collection": { - "maxDepth": 4, - "objectType": "Collection", - "primaryCategory": "Digital Textbook", - "isRoot": true, - "iconClass": "fa fa-book", - "children": {}, - "hierarchy": { - "level1": { - "name": "Textbook Unit", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "TextBookUnit", - "primaryCategory": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [], - "Collection": [] - } - }, - "level2": { - "name": "Section", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "TextBookUnit", - "primaryCategory": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [], - "Collection": [] - } - }, - "level3": { - "name": "Section", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "TextBookUnit", - "primaryCategory": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [], - "Collection": [] - } - }, - "level4": { - "name": "Section", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "TextBookUnit", - "primaryCategory": "Textbook Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [], - "Collection": [] - } - } - } - } - } - }, - "schema": { - "properties": { - "generateDIALCodes": { - "type": "string", - "enum": [ - "Yes", - "No" - ], - "default": "Yes" - }, - "trackable": { - "type": "object", - "properties": { - "enabled": { - "type": "string", - "enum": [ - "Yes", - "No" - ], - "default": "No" - }, - "autoBatch": { - "type": "string", - "enum": [ - "Yes", - "No" - ], - "default": "No" - } - }, - "default": { - "enabled": "No", - "autoBatch": "No" - }, - "additionalProperties": false - }, - "additionalCategories": { - "type": "array", - "items": { - "type": "string" - }, - "default": [ - "Textbook" - ] - }, - "userConsent": { - "type": "string", - "enum": [ - "Yes", - "No" - ], - "default": "Yes" - } - } - } - }, - "forms": { - "childMetadata": { - "templateName": "", - "required": [], - "properties": [ - { - "code": "name", - "editable": true, - "displayProperty": "Editable", - "dataType": "text", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "Name", - "index": 1, - "label": "Name", - "required": true, - "name": "Name", - "inputType": "text", - "placeholder": "Name", - "validations": [ - { - "type": "maxLength", - "value": "120", - "message": "Exceeded the limit of 120 characters" - }, - { - "type": "required", - "message": "Name is required" - } - ] - }, - { - "code": "description", - "dataType": "text", - "description": "Description of the content", - "editable": true, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Description", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "1000", - "message": "Exceeded the limit of 1000 characters" - } - ] - }, - { - "code": "primaryCategory", - "dataType": "text", - "description": "Type", - "editable": false, - "renderingHints": {}, - "inputType": "select", - "label": "Category", - "name": "Type", - "placeholder": "", - "required": true, - "visible": true, - "validations": [] - }, - { - "code": "additionalCategories", - "visible": true, - "editable": true, - "displayProperty": "Editable", - "dataType": "list", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "Additional Categories", - "index": 7, - "label": "Additional Categories", - "required": false, - "name": "additionalCategories", - "inputType": "nestedselect", - "placeholder": "Additional Categories" - }, - { - "code": "boardIds", - "visible": true, - "depends": [], - "editable": false, - "dataType": "list", - "sourceCategory": "board", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Board", - "required": true, - "name": "Board", - "inputType": "nestedselect", - "placeholder": "Select Board" - }, - { - "code": "mediumIds", - "visible": true, - "depends": [], - "editable": false, - "dataType": "list", - "sourceCategory": "medium", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Medium(s)", - "required": true, - "name": "Medium", - "inputType": "nestedselect", - "placeholder": "Select Medium" - }, - { - "code": "gradeLevelIds", - "visible": true, - "depends": [], - "editable": false, - "dataType": "list", - "sourceCategory": "gradeLevel", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Class(es)", - "required": true, - "name": "Grade Level", - "inputType": "nestedselect", - "placeholder": "Select Grade" - }, - { - "code": "subjectIds", - "visible": true, - "depends": [], - "editable": false, - "dataType": "list", - "sourceCategory": "subject", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Subject(s)", - "required": true, - "name": "Subject", - "inputType": "nestedselect", - "placeholder": "Select Subject" - }, - { - "code": "topicsIds", - "visible": true, - "editable": true, - "dataType": "list", - "depends": [ - "boardIds", - "mediumIds", - "gradeLevelIds", - "subjectIds" - ], - "sourceCategory": "topic", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "name": "Topic", - "description": "Choose Topics", - "inputType": "topicselector", - "label": "Topic(s)", - "placeholder": "Select Topic", - "required": false, - "output": "identifier" - }, - { - "code": "copyright", - "dataType": "text", - "description": "Copyright", - "editable": true, - "index": 4, - "inputType": "text", - "label": "Copyright and Year:", - "name": "Copyright", - "placeholder": "Enter Copyright and Year", - "tooltip": "If you are an individual, creating original content, you are the copyright holder. If you are creating this content on behalf of an organisation, the organisation may be the copyright holder. ", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "validations": [ - { - "type": "required", - "message": "Copyright is required" - } - ] - }, - { - "code": "license", - "visible": true, - "editable": true, - "displayProperty": "Editable", - "dataType": "text", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "License", - "index": 6, - "label": "License", - "required": true, - "name": "license", - "inputType": "select", - "placeholder": "license", - "tooltip": "Choose the more appropriate Creative commons license for this Content. ", - "validations": [ - { - "type": "required", - "message": "License is required" - } - ] - }, - { - "code": "author", - "dataType": "text", - "description": "Author", - "editable": true, - "index": 5, - "inputType": "text", - "label": "Author", - "name": "Author", - "placeholder": "Author", - "tooltip": "Provide name of creator of this content.", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": true, - "validations": [ - { - "type": "required", - "message": "Author is required" - } - ] - }, - { - "code": "attributions", - "dataType": "list", - "description": "Attributions", - "editable": true, - "index": 3, - "inputType": "text", - "label": "Attributions", - "name": "attribution", - "placeholder": "", - "tooltip": "If you have relied on another work to create this content, provide the name of that creator and the source of that work.", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false - }, - { - "code": "contentPolicyCheck", - "visible": true, - "editable": true, - "displayProperty": "Editable", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "Content Policy check", - "index": 7, - "labelHtml": "

I agree that by submitting / publishing this Content, I confirm that this Content complies with prescribed guidelines, including the Terms of Use and Content Policy and that I consent to publish it under the Creative Commons Framework in accordance with the Content Policy. I have made sure that I do not violate others' copyright or privacy rights.

", - "required": true, - "name": "contentPolicyCheck", - "inputType": "checkbox", - "placeholder": "Content Policy Check", - "validations": [ - { - "type": "required", - "message": "Content Policy Check is required" - } - ] - } - ] - }, - "create": { - "templateName": "", - "required": [], - "properties": [ - { - "name": "First Section", - "fields": [ - { - "code": "appIcon", - "dataType": "text", - "description": "appIcon of the content", - "editable": true, - "inputType": "appIcon", - "label": "Icon", - "name": "Icon", - "placeholder": "Icon", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true - }, - { - "code": "name", - "dataType": "text", - "description": "Name of the content", - "editable": true, - "inputType": "text", - "label": "Name", - "name": "Name", - "placeholder": "Name", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "120", - "message": "Exceeded the limit of 120 characters" - }, - { - "type": "required", - "message": "Name is required" - } - ] - }, - { - "code": "description", - "dataType": "text", - "description": "Description of the content", - "editable": true, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Description", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "1000", - "message": "Exceeded the limit of 1000 characters" - } - ] - }, - { - "code": "keywords", - "visible": true, - "editable": true, - "dataType": "list", - "name": "Keywords", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "Keywords for the content", - "inputType": "keywords", - "label": "Keywords", - "placeholder": "Input the keyword and press enter", - "required": false, - "validations": [] - } - ] - }, - { - "name": "Second Section", - "fields": [ - { - "code": "dialcodeRequired", - "dataType": "text", - "description": "QR CODE REQUIRED", - "editable": true, - "default": "No", - "index": 5, - "inputType": "radio", - "label": "QR code required?", - "name": "dialcodeRequired", - "placeholder": "QR code required?", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "range": [ - "Yes", - "No" - ], - "required": false, - "visible": true - }, - { - "code": "dialcodes", - "depends": [ - "dialcodeRequired" - ], - "dataType": "list", - "description": "Digital Infrastructure for Augmented Learning", - "editable": true, - "inputType": "dialcode", - "label": "QR code", - "name": "dialcode", - "placeholder": "Enter code here", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "minLength", - "value": "2" - }, - { - "type": "maxLength", - "value": "20" - } - ] - } - ] - }, - { - "name": "Third Section", - "fields": [ - { - "code": "primaryCategory", - "dataType": "text", - "description": "Type", - "editable": false, - "renderingHints": {}, - "inputType": "select", - "label": "Category", - "name": "Type", - "placeholder": "", - "required": true, - "visible": true, - "validations": [] - }, - { - "code": "additionalCategories", - "dataType": "list", - "description": "Additional Category of the Content", - "editable": true, - "inputType": "nestedselect", - "label": "Additional Category", - "name": "Additional Category", - "placeholder": "Select Additional Category", - "renderingHints": {}, - "required": false, - "visible": true - } - ] - }, - { - "name": "Framework Terms", - "fields": [ - { - "code": "audience", - "dataType": "list", - "description": "Audience", - "editable": true, - "inputType": "nestedselect", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "label": "Audience Type", - "name": "Audience Type", - "placeholder": "Select Audience Type", - "required": false, - "visible": true, - "range": [ - "Student", - "Teacher", - "Parent", - "Administrator", - "Other" - ] - }, - { - "code": "boardIds", - "visible": true, - "depends": [], - "editable": true, - "dataType": "list", - "sourceCategory": "board", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "Board", - "label": "Board", - "required": true, - "name": "Board/Syllabus", - "inputType": "select", - "placeholder": "Select Board/Syllabus", - "validations": [ - { - "type": "required", - "message": "Board is required" - } - ] - }, - { - "code": "mediumIds", - "visible": true, - "depends": [ - "boardIds" - ], - "editable": true, - "dataType": "list", - "sourceCategory": "medium", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "", - "label": "Medium(s)", - "required": true, - "name": "Medium", - "inputType": "nestedselect", - "placeholder": "Select Medium", - "validations": [ - { - "type": "required", - "message": "Medium is required" - } - ] - }, - { - "code": "gradeLevelIds", - "visible": true, - "depends": [ - "boardIds", - "mediumIds" - ], - "editable": true, - "dataType": "list", - "sourceCategory": "gradeLevel", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "Class", - "label": "Class(es)", - "required": true, - "name": "Class", - "inputType": "nestedselect", - "placeholder": "Select Class", - "validations": [ - { - "type": "required", - "message": "Class is required" - } - ] - }, - { - "code": "subjectIds", - "visible": true, - "depends": [ - "boardIds", - "mediumIds", - "gradeLevelIds" - ], - "editable": true, - "dataType": "list", - "sourceCategory": "subject", - "output": "identifier", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "description": "", - "label": "Subject(s)", - "required": true, - "name": "Subject", - "inputType": "nestedselect", - "placeholder": "Select Subject", - "validations": [ - { - "type": "required", - "message": "Subject is required" - } - ] - } - ] - }, - { - "name": "Fourth Section", - "fields": [ - { - "code": "author", - "dataType": "text", - "description": "Author of the content", - "editable": true, - "inputType": "text", - "label": "Author", - "name": "Author", - "placeholder": "Author", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true - }, - { - "code": "attributions", - "dataType": "list", - "description": "Attributions", - "editable": true, - "inputType": "text", - "label": "Attributions", - "name": "Attributions", - "placeholder": "Attributions", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true - }, - { - "code": "copyright", - "dataType": "text", - "description": "Copyright", - "editable": true, - "inputType": "text", - "label": "Copyright", - "name": "Copyright", - "placeholder": "Copyright", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "required", - "message": "Copyright is required" - } - ] - }, - { - "code": "copyrightYear", - "dataType": "number", - "description": "Year", - "editable": true, - "inputType": "text", - "label": "Copyright Year", - "name": "Copyright Year", - "placeholder": "Copyright Year", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "required", - "message": "Copyright Year is required" - }, - { - "type": "minLength", - "message": "Year should be a 4 digit number", - "value": 4 - }, - { - "type": "maxLength", - "message": "Year should be a 4 digit number", - "value": 4 - } - ] - }, - { - "code": "license", - "dataType": "text", - "description": "license", - "editable": true, - "inputType": "select", - "label": "License", - "name": "license", - "placeholder": "Select License", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "defaultValue": "CC BY 4.0", - "validations": [ - { - "type": "required", - "message": "License is required" - } - ] - } - ] - } - ] - }, - "delete": {}, - "publish": {}, - "publishchecklist": { - "templateName": "", - "required": [], - "properties": [ - { - "name": "Appropriateness", - "renderingHints": { - "class": "d-grid-inline-3 display-sectionName" - }, - "fields": [ - { - "code": "appropriatenessOne", - "name": "No Hate speech, Abuse, Violence, Profanity", - "label": "No Hate speech, Abuse, Violence, Profanity", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "appropriatenessTwo", - "name": "No Sexual content, Nudity or Vulgarity", - "label": "No Sexual content, Nudity or Vulgarity", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "appropriatenessThree", - "name": "No Discrimination or Defamation", - "label": "No Discrimination or Defamation", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "appropriatenessFour", - "name": "Is suitable for children", - "label": "Is suitable for children", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - } - ] - }, - { - "name": "Content details", - "renderingHints": { - "class": "d-grid-inline-3 display-sectionName" - }, - "fields": [ - { - "code": "contentdetailsOne", - "name": "Appropriate Title, Description", - "label": "Appropriate Title, Description", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "contentdetailsTwo", - "name": "Correct Board, Grade, Subject, Medium", - "label": "Correct Board, Grade, Subject, Medium", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "contentdetailsThree", - "name": "Appropriate tags such as Resource Type, Concepts", - "label": "Appropriate tags such as Resource Type, Concepts", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "contentdetailsFour", - "name": "Relevant Keywords", - "label": "Relevant Keywords", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - } - ] - }, - { - "name": "Usability", - "renderingHints": { - "class": "d-grid-inline-3 display-sectionName" - }, - "fields": [ - { - "code": "usabilityOne", - "name": "Content plays correctly", - "label": "Content plays correctly", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "usabilityTwo", - "name": "Can see the content clearly on Desktop and App", - "label": "Can see the content clearly on Desktop and App", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "usabilityThree", - "name": "Audio (if any) is clear and easy to understand", - "label": "Audio (if any) is clear and easy to understand", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "usabilityFour", - "name": "No Spelling mistakes in the text", - "label": "No Spelling mistakes in the text", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "usabilityFive", - "name": "Language is simple to understand", - "label": "Language is simple to understand", - "dataType": "boolean", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "validations": [ - { - "type": "required", - "message": "" - } - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - } - } - ] - } - ] - }, - "review": {}, - "search": { - "templateName": "", - "required": [], - "properties": [ - { - "code": "primaryCategory", - "dataType": "list", - "description": "Type", - "editable": true, - "default": [], - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "inputType": "nestedselect", - "label": "Content Type(s)", - "name": "Type", - "placeholder": "Select ContentType", - "required": false, - "visible": true - }, - { - "code": "board", - "visible": true, - "depends": [], - "editable": true, - "dataType": "list", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "Board", - "label": "Board", - "required": false, - "name": "Board", - "inputType": "select", - "placeholder": "Select Board", - "output": "name" - }, - { - "code": "medium", - "visible": true, - "depends": [ - "board" - ], - "editable": true, - "dataType": "list", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Medium(s)", - "required": false, - "name": "Medium", - "inputType": "nestedselect", - "placeholder": "Select Medium", - "output": "name" - }, - { - "code": "gradeLevel", - "visible": true, - "depends": [ - "board", - "medium" - ], - "editable": true, - "default": "", - "dataType": "list", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "Class", - "label": "Class(es)", - "required": false, - "name": "Class", - "inputType": "nestedselect", - "placeholder": "Select Class", - "output": "name" - }, - { - "code": "subject", - "visible": true, - "depends": [ - "board", - "medium", - "gradeLevel" - ], - "editable": true, - "default": "", - "dataType": "list", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "description": "", - "label": "Subject(s)", - "required": false, - "name": "Subject", - "inputType": "nestedselect", - "placeholder": "Select Subject", - "output": "name" - }, - { - "code": "topic", - "visible": true, - "editable": true, - "dataType": "list", - "depends": [ - "board", - "medium", - "gradeLevel", - "subject" - ], - "default": "", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "name": "Topic", - "description": "Choose a Topics", - "inputType": "topicselector", - "label": "Topic(s)", - "placeholder": "Choose Topics", - "required": false - } - ] - }, - "unitMetadata": { - "templateName": "", - "required": [], - "properties": [ - { - "name": "First Section", - "fields": [ - { - "code": "name", - "dataType": "text", - "description": "Name of the content", - "editable": true, - "inputType": "text", - "label": "Name", - "name": "Title", - "placeholder": "Name", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "120", - "message": "Exceeded the limit of 120 characters" - }, - { - "type": "required", - "message": "Name is required" - } - ] - }, - { - "code": "description", - "dataType": "text", - "description": "Description of the content", - "editable": true, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Description", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true, - "validations": [ - { - "type": "maxLength", - "value": "1000", - "message": "Exceeded the limit of 120 characters" - } - ] - }, - { - "code": "keywords", - "visible": true, - "editable": true, - "dataType": "list", - "name": "Keywords", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "index": 3, - "description": "Keywords for the content", - "inputType": "keywords", - "label": "Keywords", - "placeholder": "Input the keyword and press enter", - "required": false, - "validations": [] - }, - { - "code": "topic", - "visible": true, - "editable": true, - "dataType": "list", - "depends": [ - "board", - "medium", - "gradeLevel", - "subject" - ], - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "name": "Topic", - "description": "Choose a Topics", - "inputType": "topicselector", - "label": "Topics covered in the course", - "placeholder": "Choose Topics", - "required": false - }, - { - "code": "dialcodeRequired", - "dataType": "text", - "description": "QR CODE REQUIRED", - "editable": true, - "default": "No", - "index": 5, - "inputType": "radio", - "label": "QR code required?", - "name": "dialcodeRequired", - "placeholder": "QR code required?", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "range": [ - "Yes", - "No" - ], - "required": false, - "visible": true - }, - { - "code": "dialcodes", - "depends": [ - "dialcodeRequired" - ], - "dataType": "list", - "description": "Digital Infrastructure for Augmented Learning", - "editable": true, - "inputType": "dialcode", - "label": "QR code", - "name": "dialcode", - "placeholder": "Enter code here", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "minLength", - "value": "2" - }, - { - "type": "maxLength", - "value": "20" - } - ] - } - ] - } - ] - }, - "update": {} - } - } - } - } \ No newline at end of file diff --git a/docs/collection-editor-architecture.drawio.png b/docs/collection-editor-architecture.drawio.png deleted file mode 100644 index 662dac89c..000000000 Binary files a/docs/collection-editor-architecture.drawio.png and /dev/null differ diff --git a/package-lock.json b/package-lock.json index 8645b5874..4e6775b8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2976,53 +2976,34 @@ "resolved": "https://registry.npmjs.org/@project-sunbird/sb-styles/-/sb-styles-0.0.7.tgz", "integrity": "sha512-XirxDLdQnaKJC+tFh4IAD05ULHS7DE9ZkNsPRHglWzly8erTXe6M1DAL+XWKYVFLf+GK9U6HVKlvvxIUpRCiVw==" }, - "@project-sunbird/sunbird-epub-player-v9": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-v9/-/sunbird-epub-player-v9-4.5.5.tgz", - "integrity": "sha512-nQdzxp1v0pdfk1uGDt6UODQ+TFReATPxSd4qWNpcxGCoXN66uXARmRyjTD9eRsH7TRAR+VVqxeUmdTxwV9I2hg==", - "requires": { - "@project-sunbird/sunbird-player-sdk-v9": "4.4.4" - } - }, "@project-sunbird/sunbird-pdf-player-v9": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-v9/-/sunbird-pdf-player-v9-4.2.0.tgz", - "integrity": "sha512-RxmXPpvGaAsMDmQJXf1tJZt3/JT5CXCOi6x4kZjmjDynMME8oVRn4HRPyxqgielbWhTop2CpOt51BC8hM3ujKQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-v9/-/sunbird-pdf-player-v9-4.1.1.tgz", + "integrity": "sha512-KN/bphOZePttenhQEMxqJY8u1SlX0BigtGrZu2FzXqkhEblfzwU3Gtck/vdkmFdjcx7X7sAAQLQtKIfDjzQd1g==", "requires": { - "@project-sunbird/sunbird-player-sdk-v9": "^4.2.0" + "@project-sunbird/sunbird-player-sdk-v9": "4.1.0" } }, "@project-sunbird/sunbird-player-sdk-v9": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-4.4.4.tgz", - "integrity": "sha512-AsHyA3SUpNRcGiCTVkp4rLtuFPPIQTOHhthREHHe90g4HX+JeeaSz3FYRzZ3nLjZdNFWOJ/9Xqni00sJQcuDfQ==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-4.1.0.tgz", + "integrity": "sha512-NCU0VQZab2yDicbj5Trcb85qG5aAbIyEMme96zEoqfu1SgVlvxDKPCLBbNBukXVkWs7BWNj5UBxrsKZbVdtFSA==" }, "@project-sunbird/sunbird-quml-player-v9": { - "version": "4.8.11", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-v9/-/sunbird-quml-player-v9-4.8.11.tgz", - "integrity": "sha512-RktWW5ZmadduzbWcq6F50YYiSK6Ve+c6yKffzz9oByzsFoQ+XvrwejVHdUqaXa7dwArQveD/f2AbdCE0s28yOQ==", + "version": "4.4.16", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-v9/-/sunbird-quml-player-v9-4.4.16.tgz", + "integrity": "sha512-jDaQLtbHo3Zz2ABiMtZfEmMOUV/0ZUpQ+MaKGKKcHyR4NduiSh2Ii17Klab1mxOyDLo73trTsOEvoJ9Infs59w==", "requires": { - "@project-sunbird/sunbird-player-sdk-v9": "4.8.0" + "@project-sunbird/sunbird-player-sdk-v9": "^4.4.4" }, "dependencies": { "@project-sunbird/sunbird-player-sdk-v9": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-4.8.0.tgz", - "integrity": "sha512-8qj3Gg027eT6dqLw9iPGJ1GApoytvnglHSOb7p5E0lwZH+pneGh1iESP0avX98klg5CkHn0Sh+V/m4tP0/f4Gw==", - "requires": { - "ally.js": "1.4.1" - } + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-4.4.4.tgz", + "integrity": "sha512-AsHyA3SUpNRcGiCTVkp4rLtuFPPIQTOHhthREHHe90g4HX+JeeaSz3FYRzZ3nLjZdNFWOJ/9Xqni00sJQcuDfQ==" } } }, - "@project-sunbird/sunbird-resource-library": { - "version": "0.0.14", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-resource-library/-/sunbird-resource-library-0.0.14.tgz", - "integrity": "sha512-VH6xOFENjePIPqh1LdQ2ZG/iKAPRlDIWMO2e4FA4sa72G43MMGgdPfY/BXwt6R52iLSIuEFZ8YRGjZzpwDz/4A==", - "requires": { - "tslib": "^1.10.0" - } - }, "@project-sunbird/sunbird-video-player-v9": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-video-player-v9/-/sunbird-video-player-v9-4.4.2.tgz", @@ -3247,14 +3228,6 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, - "@types/localforage": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.34.tgz", - "integrity": "sha1-XjHDLdh5HsS5/z70fJy1Wy0NlDg=", - "requires": { - "localforage": "*" - } - }, "@types/minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz", @@ -3556,16 +3529,6 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -3577,12 +3540,12 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" + "mime-types": "~2.1.34", + "negotiator": "0.6.3" } }, "acorn": { @@ -3671,15 +3634,6 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, - "ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha1-n7fmuljvrE7pExyymqnuO1QLzx4=", - "requires": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "alphanum-sort": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", @@ -4430,26 +4384,36 @@ "dev": true }, "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", + "bytes": "3.1.2", + "content-type": "~1.0.5", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" }, "dependencies": { - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } } } }, @@ -4828,9 +4792,9 @@ "dev": true }, "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "cacache": { "version": "15.0.0", @@ -4999,12 +4963,15 @@ } }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "caller-callsite": { @@ -5495,9 +5462,9 @@ "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, "common-form-elements-web-v9": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/common-form-elements-web-v9/-/common-form-elements-web-v9-4.7.2.tgz", - "integrity": "sha512-MsH0QLghlZZpN/z27iCgGQckUecSoBhGDIzIuVKqsIBPEVqVqktDtuHl2Mxiv9XWAhZa31IVM0shVoAWVX8LDg==", + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/common-form-elements-web-v9/-/common-form-elements-web-v9-4.4.6.tgz", + "integrity": "sha512-9uak+bkon9N4ORS+vwMnTvraSx6oFYIB5fwVG4s/i/omgCr10myWaCMpi5HaDbCIz8t2X2SR7vcvJ0zazDMH9g==", "requires": { "immutable": "^4.0.0-rc.12", "moment": "^2.29.1", @@ -5651,24 +5618,17 @@ "dev": true }, "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "safe-buffer": "5.2.1" } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" }, "convert-source-map": { "version": "1.7.0", @@ -6130,11 +6090,6 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" }, - "css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=" - }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", @@ -6432,6 +6387,16 @@ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", "dev": true }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -6543,7 +6508,8 @@ "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "dev": true }, "dependency-graph": { "version": "0.7.2", @@ -6562,9 +6528,9 @@ } }, "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "detect-file": { "version": "1.0.0", @@ -6931,39 +6897,6 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, - "epubjs": { - "version": "0.3.88", - "resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.88.tgz", - "integrity": "sha512-VRumULpUELYmYwzypyfbDwoSIqDp2LXOXCtY3o55o3YDW5Zm32UjtZuX/xaWFGqyZORNNMWWQ8VlMaY1djnDYg==", - "requires": { - "@types/localforage": "0.0.34", - "core-js": "^3.6.5", - "event-emitter": "^0.3.5", - "jszip": "^3.4.0", - "localforage": "^1.7.3", - "lodash": "^4.17.15", - "marks-pane": "^1.0.9", - "path-webpack": "0.0.3", - "xmldom": "^0.3.0" - }, - "dependencies": { - "core-js": { - "version": "3.20.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz", - "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==" - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "xmldom": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz", - "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==" - } - } - }, "err-code": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", @@ -7008,6 +6941,19 @@ "string.prototype.trimstart": "^1.0.3" } }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -7162,16 +7108,7 @@ "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "eventemitter3": { "version": "4.0.7", @@ -7310,62 +7247,100 @@ "homedir-polyfill": "^1.0.1" } }, - "export-to-csv": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-0.2.1.tgz", - "integrity": "sha512-KTbrd3CAZ0cFceJEZr1e5uiMasabeCpXq1/5uvVxDl53o4jXJHnltasQoj2NkzrxD8hU9kdwjnMhoir/7nNx/A==" - }, "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz", + "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==", "requires": { - "accepts": "~1.3.7", + "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", + "depd": "2.0.0", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "finalhandler": "1.2.0", "fresh": "0.5.2", - "merge-descriptors": "1.0.1", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", + "path-to-regexp": "0.1.10", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" }, "dependencies": { "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" + }, + "finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "dependencies": { + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + } + } + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } }, "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "requires": { + "side-channel": "^1.0.4" + } }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" } } }, @@ -7874,9 +7849,9 @@ } }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fragment-cache": { "version": "0.2.1", @@ -7889,7 +7864,7 @@ "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" }, "from2": { "version": "2.3.0", @@ -7965,9 +7940,9 @@ } }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "gauge": { "version": "2.7.4", @@ -8003,13 +7978,15 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz", - "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-stream": { @@ -8180,6 +8157,14 @@ "sparkles": "^1.0.0" } }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "requires": { + "get-intrinsic": "^1.1.3" + } + }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -8504,10 +8489,23 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, + "has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "requires": { + "es-define-property": "^1.0.0" + } + }, + "has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + }, "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "has-unicode": { "version": "2.0.1", @@ -8589,6 +8587,14 @@ "minimalistic-assert": "^1.0.1" } }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, "hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", @@ -8668,15 +8674,32 @@ "dev": true }, "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + } } }, "http-proxy": { @@ -8835,7 +8858,8 @@ "immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", + "dev": true }, "immutable": { "version": "4.0.0", @@ -9953,6 +9977,16 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -9968,6 +10002,7 @@ "version": "3.5.0", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz", "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==", + "dev": true, "requires": { "lie": "~3.3.0", "pako": "~1.0.2", @@ -10342,6 +10377,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, "requires": { "immediate": "~3.0.5" } @@ -10419,24 +10455,6 @@ "json5": "^2.1.2" } }, - "localforage": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", - "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", - "requires": { - "lie": "3.1.1" - }, - "dependencies": { - "lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", - "requires": { - "immediate": "~3.0.5" - } - } - } - }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -10679,11 +10697,6 @@ "object-visit": "^1.0.0" } }, - "marks-pane": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/marks-pane/-/marks-pane-1.0.9.tgz", - "integrity": "sha512-Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg==" - }, "matchdep": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", @@ -10769,9 +10782,9 @@ } }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "merge-source-map": { "version": "1.1.0", @@ -10843,16 +10856,16 @@ "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==" }, "mime-db": { - "version": "1.45.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", - "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==" + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" }, "mime-types": { - "version": "2.1.28", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", - "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "requires": { - "mime-db": "1.45.0" + "mime-db": "1.52.0" } }, "mimic-fn": { @@ -11224,9 +11237,9 @@ } }, "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, "neo-async": { "version": "2.6.2", @@ -11877,9 +11890,9 @@ "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==", "dev": true, "requires": { - "JSONStream": "^1.3.4", "bluebird": "^3.5.1", "figgy-pudding": "^3.4.1", + "JSONStream": "^1.3.4", "lru-cache": "^5.1.1", "make-fetch-happen": "^5.0.0", "npm-package-arg": "^6.1.0", @@ -12009,9 +12022,9 @@ } }, "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "object-is": { "version": "1.1.5", @@ -12134,21 +12147,6 @@ "unbox-primitive": "^1.0.1" } }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" - }, "is-callable": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", @@ -12163,11 +12161,6 @@ "has-symbols": "^1.0.2" } }, - "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==" - }, "string.prototype.trimend": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", @@ -12676,7 +12669,8 @@ "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true }, "parallel-transform": { "version": "1.2.0", @@ -12816,9 +12810,9 @@ "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "path-type": { "version": "4.0.0", @@ -12826,11 +12820,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "path-webpack": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz", - "integrity": "sha1-/23sdJ7sWpRgXATV9j/FVgegOhY=" - }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", @@ -12891,11 +12880,6 @@ "find-up": "^3.0.0" } }, - "platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha1-ZGx3ARiZhwtqCQPnXpl+jlHadGE=" - }, "plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -13957,11 +13941,11 @@ } }, "proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, @@ -14059,11 +14043,11 @@ "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==" }, "qs": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", - "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "query-string": { @@ -14125,12 +14109,12 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", + "bytes": "3.1.2", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } @@ -14914,34 +14898,52 @@ } }, "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "2.0.0", "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", + "ms": "2.1.3", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" } } }, @@ -14990,14 +14992,64 @@ } }, "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz", + "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.1" + "send": "0.18.0" + }, + "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + } } }, "set-blocking": { @@ -15005,10 +15057,24 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + } + }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true }, "set-value": { "version": "2.0.1", @@ -15038,9 +15104,9 @@ "dev": true }, "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "sha.js": { "version": "2.4.11", @@ -15077,13 +15143,14 @@ "dev": true }, "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" } }, "signal-exit": { @@ -15791,6 +15858,21 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -15819,21 +15901,6 @@ "define-properties": "^1.1.3" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -16418,9 +16485,9 @@ } }, "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "tough-cookie": { "version": "2.5.0", @@ -16587,13 +16654,6 @@ "has-bigints": "^1.0.1", "has-symbols": "^1.0.2", "which-boxed-primitive": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" - } } }, "unc-path-regex": { @@ -17005,23 +17065,6 @@ "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", "unbox-primitive": "^1.0.1" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" - } - } - }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" } }, "is-callable": { @@ -17036,20 +17079,8 @@ "requires": { "call-bind": "^1.0.2", "has-symbols": "^1.0.2" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" - } } }, - "object-inspect": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", - "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==" - }, "string.prototype.trimend": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", @@ -17148,30 +17179,11 @@ "videojs-vtt.js": "^0.15.2" } }, - "videojs-contrib-quality-levels": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz", - "integrity": "sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==", - "requires": { - "global": "^4.3.2", - "video.js": "^6 || ^7" - } - }, "videojs-font": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz", "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==" }, - "videojs-http-source-selector": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/videojs-http-source-selector/-/videojs-http-source-selector-1.1.6.tgz", - "integrity": "sha512-6b5MmKTT2cVnrjtdNj4z1VO91udbXkZkTYA6LlD8WN2aHlG2rqFTmtMab4NK4nlkkkbRnm3c2q2IddL3jffLmg==", - "requires": { - "global": "^4.3.2", - "video.js": "^7.0.0", - "videojs-contrib-quality-levels": "^2.0.4" - } - }, "videojs-vtt.js": { "version": "0.15.2", "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.2.tgz", diff --git a/package.json b/package.json index 44dd51b77..c7c2ad254 100644 --- a/package.json +++ b/package.json @@ -25,20 +25,16 @@ "@project-sunbird/ckeditor-build-classic": "^4.1.3", "@project-sunbird/client-services": "4.2.3", "@project-sunbird/sb-styles": "0.0.7", - "@project-sunbird/sunbird-epub-player-v9": "4.5.5", - "@project-sunbird/sunbird-pdf-player-v9": "4.2.0", - "@project-sunbird/sunbird-quml-player-v9": "4.8.11", - "@project-sunbird/sunbird-resource-library": "0.0.14", + "@project-sunbird/sunbird-pdf-player-v9": "4.1.1", + "@project-sunbird/sunbird-quml-player-v9": "4.4.16", "@project-sunbird/sunbird-video-player-v9": "4.4.2", "@project-sunbird/telemetry-sdk": "0.0.26", "@types/jquery": "^3.5.5", "alphanum-sort": "^1.0.2", "angular2-uuid": "^1.1.1", - "common-form-elements-web-v9": "4.7.2", + "common-form-elements-web-v9": "4.4.6", "core-js": "^2.5.4", - "epubjs": "0.3.88", - "export-to-csv": "^0.2.1", - "express": "^4.17.1", + "express": "^4.20.0", "express-http-proxy": "^1.6.2", "fine-uploader": "^5.15.7", "font-awesome": "^4.7.0", @@ -61,8 +57,6 @@ "svg2img": "^0.6.1", "tslib": "^1.10.0", "video.js": "^7.10.2", - "videojs-contrib-quality-levels": "^2.1.0", - "videojs-http-source-selector": "^1.1.6", "zone.js": "~0.10.2" }, "devDependencies": { diff --git a/projects/collection-editor-library/package.json b/projects/collection-editor-library/package.json index bf8cea1e8..b0ed1f75a 100644 --- a/projects/collection-editor-library/package.json +++ b/projects/collection-editor-library/package.json @@ -1,10 +1,10 @@ { "name": "@project-sunbird/sunbird-collection-editor-v9", - "version": "4.8.24", + "version": "4.5.1", "peerDependencies": { "@angular/common": "~9.1.13", "@angular/core": "~9.1.13", - "common-form-elements-web-v9": "4.7.2", + "common-form-elements-web-v9": "4.4.6", "@project-sunbird/ckeditor-build-classic": "4.1.3", "ng2-semantic-ui-v9": "0.0.3" } diff --git a/projects/collection-editor-library/src/lib/collection-editor-library.module.ts b/projects/collection-editor-library/src/lib/collection-editor-library.module.ts index 8f31fb4e1..021fe8d7d 100644 --- a/projects/collection-editor-library/src/lib/collection-editor-library.module.ts +++ b/projects/collection-editor-library/src/lib/collection-editor-library.module.ts @@ -6,8 +6,6 @@ import { CommonFormElementsModule, DialcodeCursor } from 'common-form-elements-w import { SuiModule } from 'ng2-semantic-ui-v9'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { HttpClientModule } from '@angular/common/http'; -import { SanitizeHtmlPipe } from './pipes/sanitize-html.pipe'; -import { InterpolatePipe } from './pipes/interpolate.pipe'; import { CollectionEditorLibraryComponent } from './collection-editor-library.component'; import { ContentplayerPageComponent } from './components/contentplayer-page/contentplayer-page.component'; import { EditorComponent } from './components/editor/editor.component'; @@ -27,12 +25,10 @@ import { AnswerComponent } from './components/answer/answer.component'; import { CkeditorToolComponent } from './components/ckeditor-tool/ckeditor-tool.component'; import { QuestionComponent } from './components/question/question.component'; import {SunbirdPdfPlayerModule} from '@project-sunbird/sunbird-pdf-player-v9'; -import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9'; import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v9'; import { QumlLibraryModule } from '@project-sunbird/sunbird-quml-player-v9'; import {CarouselModule} from 'ngx-bootstrap/carousel'; import { TelemetryInteractDirective } from './directives/telemetry-interact/telemetry-interact.directive'; -import { DateFormatPipe } from './directives/date-format/date-format.pipe'; import { AssetBrowserComponent } from './components/asset-browser/asset-browser.component'; import { CollectionIconComponent } from './components/collection-icon/collection-icon.component'; import { CacheService } from 'ng2-cache-service'; @@ -41,28 +37,19 @@ import { CacheSessionStorage } from 'ng2-cache-service/dist/src/services/storage import { QumlPlayerComponent } from './components/quml-player/quml-player.component'; import { DialcodeComponent } from './components/dialcode/dialcode.component'; import { DialcodeService } from './services/dialcode/dialcode.service'; -import { QuestionOptionSubMenuComponent } from './components/question-option-sub-menu/question-option-sub-menu.component'; import { CsvUploadComponent } from './components/csv-upload/csv-upload.component'; import { ManageCollaboratorComponent } from './components/manage-collaborator/manage-collaborator.component'; -import { SliderComponent } from './components/slider/slider.component'; -import { TranslationsComponent } from './components/translations/translations.component'; import { PublishChecklistComponent } from './components/publish-checklist/publish-checklist.component'; -import { BulkUploadComponent } from './components/bulk-upload/bulk-upload.component'; -import { RelationalMetadataComponent } from './components/relational-metadata/relational-metadata.component'; -import { ResourceLibraryModule } from '@project-sunbird/sunbird-resource-library'; -import { AppLoaderComponent } from './components/app-loader/app-loader.component'; @NgModule({ - declarations: [CollectionEditorLibraryComponent, InterpolatePipe, SanitizeHtmlPipe, ContentplayerPageComponent, - EditorComponent, QumlplayerPageComponent, HeaderComponent, FancyTreeComponent, MetaFormComponent, LibraryComponent, - LibraryFilterComponent, LibraryListComponent, QuestionComponent, OptionsComponent, AnswerComponent, CkeditorToolComponent, - LibraryPlayerComponent, ResourceReorderComponent, SkeletonLoaderComponent, TemplateComponent, DateFormatPipe, - TelemetryInteractDirective, AssetBrowserComponent, CollectionIconComponent, - QumlPlayerComponent, DialcodeComponent, BulkUploadComponent, CsvUploadComponent, ManageCollaboratorComponent, - PublishChecklistComponent, QuestionOptionSubMenuComponent, SliderComponent, TranslationsComponent,AppLoaderComponent, - RelationalMetadataComponent], + declarations: [CollectionEditorLibraryComponent, ContentplayerPageComponent, EditorComponent, QumlplayerPageComponent, + HeaderComponent, FancyTreeComponent, MetaFormComponent, LibraryComponent, LibraryFilterComponent, LibraryListComponent, + QuestionComponent, OptionsComponent, AnswerComponent, CkeditorToolComponent, + LibraryPlayerComponent, ResourceReorderComponent, SkeletonLoaderComponent, TemplateComponent, TelemetryInteractDirective, + AssetBrowserComponent, CollectionIconComponent, + QumlPlayerComponent, DialcodeComponent, CsvUploadComponent, ManageCollaboratorComponent, PublishChecklistComponent,], imports: [CommonModule, FormsModule, ReactiveFormsModule, RouterModule.forChild([]), SuiModule, CommonFormElementsModule, InfiniteScrollModule, HttpClientModule, SunbirdPdfPlayerModule, SunbirdVideoPlayerModule, - QumlLibraryModule, CarouselModule, SunbirdEpubPlayerModule, ResourceLibraryModule], + QumlLibraryModule, CarouselModule], providers: [ CacheService, { provide: CacheStorageAbstract, useClass: CacheSessionStorage }, diff --git a/projects/collection-editor-library/src/lib/components/answer/answer.component.html b/projects/collection-editor-library/src/lib/components/answer/answer.component.html index dc764cfbf..b895aaaac 100644 --- a/projects/collection-editor-library/src/lib/components/answer/answer.component.html +++ b/projects/collection-editor-library/src/lib/components/answer/answer.component.html @@ -1,15 +1,9 @@
-
- + - - -
-

-
-
diff --git a/projects/collection-editor-library/src/lib/components/answer/answer.component.ts b/projects/collection-editor-library/src/lib/components/answer/answer.component.ts index 057d7d4c6..9ec9caef8 100644 --- a/projects/collection-editor-library/src/lib/components/answer/answer.component.ts +++ b/projects/collection-editor-library/src/lib/components/answer/answer.component.ts @@ -8,7 +8,6 @@ import { ConfigService } from '../../services/config/config.service'; export class AnswerComponent implements OnInit { @Input() editorState; @Input() showFormError; - @Input() isReadOnlyMode; @Output() editorDataOutput: EventEmitter = new EventEmitter(); constructor(public configService: ConfigService) { } diff --git a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.html b/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.html deleted file mode 100644 index d62275bb3..000000000 --- a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
- {{headerMessage}} -
-

{{loaderMessage}}

-
-
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.spec.ts b/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.spec.ts deleted file mode 100644 index dede2f20d..000000000 --- a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppLoaderComponent } from './app-loader.component'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ConfigService } from '../../services/config/config.service'; - - - -describe('AppLoaderComponent', () => { - let component: AppLoaderComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - declarations: [ AppLoaderComponent ], - providers: [ConfigService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AppLoaderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.ts b/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.ts deleted file mode 100644 index 664092e43..000000000 --- a/projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Input } from '@angular/core'; -import {ILoaderMessage} from '../../interfaces/loader'; -import { ConfigService } from '../../services/config/config.service'; -import * as _ from 'lodash-es'; - -/** - * loader component - */ -@Component({ - selector: 'app-loader', - templateUrl: './app-loader.component.html' -}) -export class AppLoaderComponent implements OnInit { - @Input() data: ILoaderMessage; - headerMessage: string; - loaderMessage: string; - - constructor(public configService: ConfigService) { - this.headerMessage = _.get(this.configService, 'labelConfig.lbl.loaderHeading'); - this.loaderMessage = _.get(this.configService, 'labelConfig.lbl.loaderMessage'); - } - - ngOnInit() { - if (this.data) { - this.headerMessage = this.data.headerMessage || this.headerMessage; - this.loaderMessage = this.data.loaderMessage || this.loaderMessage; - } - } -} diff --git a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.html b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.html index 3efb03200..26cc0d3e6 100644 --- a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.html +++ b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.html @@ -59,7 +59,7 @@
-
{{configService.labelConfig?.lbl?.uploadAndUse}}
@@ -111,11 +111,10 @@
{{configService.labelConfig?.lbl?.copyRightsAndLicense}}
-
diff --git a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.ts b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.ts index f5f0c1b97..bb7465430 100644 --- a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.ts @@ -7,7 +7,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { mockData } from './asset-browser.component.spec.data'; import { FormsModule } from '@angular/forms'; import { EditorService } from '../../services/editor/editor.service'; -import { of, throwError } from 'rxjs'; +import { of } from 'rxjs'; import * as _ from 'lodash-es'; const mockEditorService = { @@ -137,49 +137,21 @@ describe('AssetBrowserComponent', () => { node_id: 'do_123' } })); - spyOn(questionService, 'generatePreSignedUrl').and.returnValue(of({ - result: { - node_id: 'do_234', - pre_signed_url: '/test' - } - })); - spyOn(component, 'addImageInEditor').and.callThrough(); - spyOn(component, 'dismissPops').and.callThrough(); - component.uploadAndUseImage(modal); - expect(questionService.createMediaAsset).toHaveBeenCalled(); - expect(component.loading).toEqual(true); - expect(component.isClosable).toEqual(false); - expect(component.imageFormValid).toEqual(false); - }); - it('#uploadAndUseImage should upload image and call upload to blob', async () => { - component.showImageUploadModal = false; - let questionService: QuestionService = TestBed.inject(QuestionService); - let modal = true; - spyOn(questionService, 'createMediaAsset').and.returnValue(of({ - result: { - node_id: 'do_123' - } - })); - spyOn(questionService, 'generatePreSignedUrl').and.returnValue(of({ - result: { - node_id: 'do_234', - pre_signed_url: '/test' - } - })); - spyOn(component, 'uploadToBlob').and.returnValue(of(true)); spyOn(questionService, 'uploadMedia').and.returnValue(of({ result: { node_id: 'do_234', content_url: '/test' } })); - spyOn(component, 'addImageInEditor').and.callThrough(); - spyOn(component, 'dismissPops').and.callThrough(); + spyOn(component, 'addImageInEditor'); + spyOn(component, 'dismissPops'); component.uploadAndUseImage(modal); expect(questionService.createMediaAsset).toHaveBeenCalled(); - expect(questionService.generatePreSignedUrl).toHaveBeenCalled(); - expect(component.uploadToBlob).toHaveBeenCalled(); - }); + expect(questionService.uploadMedia).toHaveBeenCalled(); + expect(component.addImageInEditor).toHaveBeenCalledWith('/test', 'do_234'); + expect(component.showImageUploadModal).toEqual(false); + expect(component.dismissPops).toHaveBeenCalledWith(modal); + }) it('#generateAssetCreateRequest() should return asset create request', () => { let fileName = 'test'; let fileType = 'image/png'; diff --git a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.ts b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.ts index e974fa84c..851603cd5 100644 --- a/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.ts +++ b/projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.ts @@ -46,7 +46,6 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { public termsAndCondition: any; public assetName: any; public emptySearchMessage: any; - public imageFile: any; ngOnInit() { this.initialFormConfig = _.get(config, 'uploadIconFormConfig'); this.formConfig = _.get(config, 'uploadIconFormConfig'); @@ -154,7 +153,6 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { this.getAllImages(offset, this.query, true); } uploadImage(event) { - this.imageFile = event.target.files[0]; const file = event.target.files[0]; const reader = new FileReader(); this.formData = new FormData(); @@ -201,67 +199,22 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { this.formConfig = formvalue; } uploadAndUseImage(modal) { - this.isClosable = false; - this.loading = true; - this.showErrorMsg = false; - this.imageFormValid = false; - this.questionService.createMediaAsset({ asset: this.assestData }).pipe(catchError(err => { + this.questionService.createMediaAsset({ content: this.assestData }).pipe(catchError(err => { const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; - this.loading = false; - this.isClosable = true; - this.imageFormValid = true; return throwError(this.editorService.apiErrorHandling(err, errInfo)); })).subscribe((res) => { const imgId = res.result.node_id; - const preSignedRequest = { - content: { - fileName: this.assetName - } + const request = { + data: this.formData }; - this.questionService.generatePreSignedUrl(preSignedRequest, imgId).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.026') }; - this.loading = false; - this.isClosable = true; - this.imageFormValid = true; + this.questionService.uploadMedia(request, imgId).pipe(catchError(err => { + const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; return throwError(this.editorService.apiErrorHandling(err, errInfo)); })).subscribe((response) => { - const signedURL = response.result.pre_signed_url; - const blobConfig = { - processData: false, - contentType: 'Asset', - headers: { - 'x-ms-blob-type': 'BlockBlob' - } - }; - this.uploadToBlob(signedURL, this.imageFile, blobConfig).subscribe(() => { - const fileURL = signedURL.split('?')[0]; - const data = new FormData(); - data.append('fileUrl', fileURL); - data.append('mimeType', _.get(this.imageFile, 'type')); - const config1 = { - enctype: 'multipart/form-data', - processData: false, - contentType: false, - cache: false - }; - const uploadMediaConfig = { - data, - param: config1 - }; - this.questionService.uploadMedia(uploadMediaConfig, imgId).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; - this.isClosable = true; - this.loading = false; - this.imageFormValid = true; - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - })).subscribe((response1) => { - this.addImageInEditor(response1.result.content_url, response1.result.node_id); - this.showImageUploadModal = false; - this.dismissPops(modal); - }); - }); + this.addImageInEditor(response.result.content_url, response.result.node_id); + this.showImageUploadModal = false; + this.dismissPops(modal); }); - }); } generateAssetCreateRequest(fileName, fileType, mediaType) { @@ -286,10 +239,8 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { dismissImageUploadModal() { - if (this.isClosable) { this.showImagePicker = true; this.showImageUploadModal = false; - } } openImageUploadModal() { this.showImageUploadModal = true; @@ -298,14 +249,10 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { this.imageUploadLoader = false; this.imageFormValid = false; this.showErrorMsg = false; - this.loading = false; - this.isClosable = true; } dismissPops(modal) { this.dismissImagePicker(); - if (modal && modal.deny) { - modal.deny(); - } + modal.deny(); } dismissImagePicker() { this.showImagePicker = false; diff --git a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.html b/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.html deleted file mode 100644 index b1c36f8a9..000000000 --- a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.html +++ /dev/null @@ -1,210 +0,0 @@ -
- -
-
-
{{configService.labelConfig?.lbl?.lastUploaded}} : {{ process?.updatedon | dateFormat: 'D MMMM YYYY' }}
-
- - {{configService.labelConfig?.lbl?.bulkInProgress}} -
- {{configService.labelConfig?.lbl?.viewDetails}} -
-
- - - -
- {{configService.labelConfig?.lbl?.bulkUploadQuestion}} -
-
-
-
- -
- - -
- -
- - - - {{completionPercentage}}% - -
-
- -
-
{{configService.labelConfig?.lbl?.downloadSampleMetadataCsvFileAndCreate}}
-
{{configService.labelConfig?.lbl?.makeSureYourFile}} :
-
    -
  • {{configService.labelConfig?.lbl?.allColumnsAreAvailableShownFormat}}
    • -
  • {{configService.labelConfig?.lbl?.hasAllMandatoryColumnsFilledAsMarkedInFormat}}
    • -
  • {{configService.labelConfig?.lbl?.hasNoDuplicateUrlsFilepathColumn}}
    • -
- -
- -
-
-
-
- -
- - {{configService.labelConfig?.lbl?.processingDroppedFiles}} - - -
    -
  • -
    -
    -
    - - - - - - - -
    • -
-
-
- {{configService.labelConfig?.lbl?.dragAndDrop}}
- {{configService.labelConfig?.lbl?.or}} -
-
-
{{configService.labelConfig?.lbl?.selectFile}}
-
-

{{configService.labelConfig?.lbl?.uploadCSVXlEntries}}

-
- -
-
- - -
- - -
- -
- - -
- -
-
-
-
-
-
-
- -
-
-
- -
-
-
- - -
{{configService.labelConfig?.lbl?.validatingCSVFile}}
- -
-
-
- -
-
- {{configService.labelConfig?.lbl?.metadataFileValidationFailed}} -
-
{{configService.labelConfig?.lbl?.metadataFollowingError}}
-
    -
  • {{msg}}
    • -
- -
- -
-
{{configService.labelConfig?.lbl?.uploadingYourContentFromCSV}}
-
-
-
{{configService.labelConfig?.lbl?.uploadFail}} : {{ process?.overall_stats?.upload_failed }}
-
{{configService.labelConfig?.lbl?.uploadSuccessful}} : {{ process?.overall_stats?.upload_success}}
-
{{configService.labelConfig?.lbl?.uploadRemaining}} : {{ process?.overall_stats?.upload_pending }}
-
-
-
- -
-
{{configService.labelConfig?.lbl?.bulkUploadComplete}}
-
-
-
{{configService.labelConfig?.lbl?.uploadFail}} : {{ process?.overall_stats?.upload_failed }}
-
{{configService.labelConfig?.lbl?.contentUploaded}} : {{ process?.overall_stats?.total }}
-
{{configService.labelConfig?.lbl?.uploadSuccessful}} : {{ process?.overall_stats?.upload_success }}
-
-
- -
-
-
-
- - - -
-
- {{configService.labelConfig?.lbl?.bulkUploadNoticeLine1}} - '{{configService.labelConfig?.lbl?.close}}' - {{configService.labelConfig?.lbl?.bulkUploadNoticeLine2}}
- {{configService.labelConfig?.lbl?.bulkUploadNoticeLine3}} -
-
-
- \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.scss b/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.scss deleted file mode 100644 index 8e10e6342..000000000 --- a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.scss +++ /dev/null @@ -1,40 +0,0 @@ -.qq-uploader.qq-uploader-selector.custom-qq-uploader { - background: inherit; - border-color: none; - max-height: inherit; - min-height: inherit; - overflow-y: inherit; - width: inherit; - height: 240px; - display: flex; - justify-content: center; - align-items: center; -} - -.sb-bk-upload h6 { - line-height: 22px; -} - -@media screen and (min-width: 768px) { - .sb-bk-upload .my--20 { - margin: -1.25rem 0 !important; - } -} - -.sb-bk-upload .sb-circle-download-icon { - background: var(--secondary-100); - display: inline-block; - width: 1.8rem; - height: 1.8rem; - line-height: 1.8rem; - color: var(--white); - border-radius: 100%; - text-align: center; - font-size: 0.8rem; -} - -.sb-loader-with-lbl{ - .sb-loader{ - position: relative !important; - } -} diff --git a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.spec.ts b/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.spec.ts deleted file mode 100644 index 2f8da62a6..000000000 --- a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.spec.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BulkUploadComponent } from './bulk-upload.component'; -import { ToasterService } from '../../services/toaster/toaster.service'; -import { EditorService } from '../../services/editor/editor.service'; -import { ConfigService } from '../../services/config/config.service'; -import { BulkJobService } from '../../services/bulk-job/bulk-job.service'; -import { TreeService } from '../../services/tree/tree.service'; -import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -describe('BulkUploadComponent', () => { - let component: BulkUploadComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ BulkUploadComponent ], - imports: [HttpClientTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - providers: [ToasterService, EditorService, ConfigService, - BulkJobService, TreeService, EditorTelemetryService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(BulkUploadComponent); - component = fixture.componentInstance; - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - it('should call closeBulkUploadModal', () => { - component.closeBulkUploadModal(); - expect(component.showBulkUploadModal).toBeFalsy(); - expect(component.bulkUploadState).toBe(0); - }); - it('should call downloadSampleCSVFile', () => { - spyOn(window, 'open').and.callThrough(); - component.sampleMetadataCsvUrl = 'https://dockstorage.blob.core.windows.net/content-service/bulk-question-upload-sample-format.csv'; - const downloadConfig = { - blobUrl: component.sampleMetadataCsvUrl, - successMessage: false, - fileType: 'csv', - fileName: 'do_11339645670870220811360' - }; - component.downloadSampleCSVFile(); - expect(window.open).toHaveBeenCalledWith(downloadConfig.blobUrl, '_blank'); - }); - xit('should call updateBulkUploadState for state 6', () => { - component.bulkUploadState = 6; - spyOn(component, 'closeBulkUploadModal').and.callThrough(); - component.updateBulkUploadState('increment'); - expect(component.closeBulkUploadModal).toHaveBeenCalled(); - }); - xit('should call updateBulkUploadState for state other than 4', () => { - component.bulkUploadState = 1; - spyOn(component, 'initiateDocumentUploadModal').and.callThrough(); - component.updateBulkUploadState('increment'); - expect(component.initiateDocumentUploadModal).toHaveBeenCalled(); - }); -}); diff --git a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.ts b/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.ts deleted file mode 100644 index 80dea3345..000000000 --- a/projects/collection-editor-library/src/lib/components/bulk-upload/bulk-upload.component.ts +++ /dev/null @@ -1,468 +0,0 @@ -import { Component, OnInit, ViewChild, ElementRef, Output, EventEmitter } from '@angular/core'; -import { FineUploader } from 'fine-uploader'; -import * as _ from 'lodash-es'; -import { throwError } from 'rxjs'; -import { catchError, map, mergeMap } from 'rxjs/operators'; -import { ToasterService } from '../../services/toaster/toaster.service'; -import { EditorService } from '../../services/editor/editor.service'; -import { ConfigService } from '../../services/config/config.service'; -import { BulkJobService } from '../../services/bulk-job/bulk-job.service'; -import { TreeService } from '../../services/tree/tree.service'; -import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; - -@Component({ - selector: 'lib-bulk-upload', - templateUrl: './bulk-upload.component.html', - styleUrls: ['./bulk-upload.component.scss'] -}) -export class BulkUploadComponent implements OnInit { - public collectionId: string; - @ViewChild('fineUploaderUI') fineUploaderUI: ElementRef; - @Output() bulkUploadEmitter = new EventEmitter(); - public storedCollectionData; - public process: any = { - process_id: '', - status: '', - type: 'bulk_upload', - overall_stats: { - total: 0, - upload_failed: 0, - upload_pending: 0, - upload_success: 0 - } - }; - public oldProcessStatus = ''; - public stageStatus = ''; - public contents: Array = []; - public completionPercentage = 0; - public showBulkUploadModal = false; - public bulkUploadState = 0; - public loading = false; - public telemetryPageId: string; - public assetConfig: any = { - csv: { - accepted: 'csv', - size: 50 - } - }; - uploader; - public bulkUploadErrorMsgs = []; - public bulkUploadValidationError = ''; - public sampleMetadataCsvUrl = ''; - constructor( - private toasterService: ToasterService, private editorService: EditorService, public configService: ConfigService, - private bulkJobService: BulkJobService, private treeService: TreeService, public telemetryService: EditorTelemetryService) { } - - ngOnInit() { - this.collectionId = _.get(this.editorService.editorConfig, 'context.identifier'); - // tslint:disable-next-line:max-line-length - this.sampleMetadataCsvUrl = _.get(this.editorService, 'editorConfig.config.publicStorageAccount') + _.get(this.configService.urlConFig, 'URLS.BULKJOB.SAMPLE_QUESTION_FILE'); - this.checkBulkUploadStatus(); - this.stageStatus = this.getContentStatus(); - } - - calculateCompletionPercentage() { - this.completionPercentage = 0; - console.log('process.overall_stats', this.process.overall_stats); - const { total, upload_pending } = this.process.overall_stats; - - // tslint:disable-next-line:radix - this.completionPercentage = parseInt(_.toNumber(100 - ((upload_pending / total) * 100))); - console.log('completionPercentage', this.completionPercentage); - } - - checkBulkUploadStatus() { - const reqData = { - filters: { - program_id: _.get(this.editorService.editorConfig, 'context.programId', ''), - collection_id: this.collectionId, - type: 'bulk_upload', - createdby: _.get(this.editorService.editorConfig, 'context.user.id') - }, - limit: 1 - }; - this.bulkJobService.getBulkOperationStatus(reqData) - .subscribe((statusResponse) => { - const count = _.get(statusResponse, 'result.count', 0); - if (!count) { - return; - } - - this.process = _.first(_.get(statusResponse, 'result.process', [])); - this.oldProcessStatus = this.process.status; - this.searchContentWithProcessId(); - this.bulkUploadState = 5; - }, (error) => { - console.log(error); - }); - } - - searchContentWithProcessId() { - this.bulkJobService.searchContentWithProcessId(this.process.process_id).subscribe((searchResponse) => { - this.process.overall_stats.upload_failed = 0; - this.process.overall_stats.upload_success = 0; - this.process.overall_stats.upload_pending = 0; - - if (_.get(searchResponse, 'result.count', 0) > 0) { - this.contents = _.compact(_.get(searchResponse.result, 'Question')); - let status = this.stageStatus; - if (status === 'draft') { - status = 'Draft'; - } - _.each(this.contents, (content) => { - if (content.status === 'Retired') { - this.process.overall_stats.upload_failed++; - } else if (content.status === status) { - this.process.overall_stats.upload_success++; - } else { - this.process.overall_stats.upload_pending++; - } - }); - - this.process.overall_stats.upload_pending = this.process.overall_stats.total - - (this.process.overall_stats.upload_success + this.process.overall_stats.upload_failed); - - if (this.process.overall_stats.upload_pending === 0) { - this.process.status = 'completed'; - } - this.editorService.fetchCollectionHierarchy(this.collectionId).subscribe((response) => { - this.storedCollectionData = response.result.questionSet; - this.calculateCompletionPercentage(); - if (this.oldProcessStatus !== this.process.status) { - this.updateJob(); - } - - }); - if (this.process.status === 'completed') { - this.editorService.nextBulkUploadStatus('completed'); - } else { - this.editorService.nextBulkUploadStatus('processing'); - } - this.bulkUploadEmitter.emit({ status: true, type: 'updateHierarchy' }); - } - }, (error) => { - console.log(error); - }); - } - - downloadReport() { - const headers = ['Name of the Question', 'Level 1 Question Set Section', 'Keywords', 'Audience', - 'Author', 'Copyright', 'License', 'Attributions', 'Identifier of the question ']; - try { - headers.push('Status'); - headers.push('Reason for failure'); - - const tableData = _.map(this.contents, (content, i) => { - const result: any = {}; - result.name = _.get(content, 'name', ''); - result.level1 = ''; - result.keywords = _.join(_.get(content, 'keywords', []), ', '); - result.audience = _.join(_.get(content, 'audience', []), ', '); - result.creator = _.get(content, 'author', ''); - result.copyright = _.get(content, 'copyright', ''); - result.license = _.get(content, 'license', ''); - result.attributions = _.join(_.get(content, 'attributions', []), ', '); - result.identifier = _.get(content, 'identifier', ''); - const selctedUnitParents: any = this.getParents(this.storedCollectionData.children, content.identifier); - if (selctedUnitParents.found && !_.isEmpty(selctedUnitParents.parents)) { - result.level1 = selctedUnitParents.parents; - } - - let status = _.get(content, 'status', ''); - if ((this.stageStatus === 'draft' && status === 'Draft')) { - status = 'Success'; - } else if (status === 'Retired') { - status = 'Failure'; - } - - result.status = status; - result.failedReason = _.get(content, 'questionUploadStatus', ''); - return result; - }); - - const csvDownloadConfig = { - filename: `Bulk Upload ${this.questionSetMetadata.name.trim()}`, - tableData, - headers, - showTitle: false - }; - this.editorService.generateCSV(csvDownloadConfig); - } catch (err) { - console.log(err); - this.toasterService.error(_.get(this.configService.labelConfig, 'messages.error.001')); - } - } - - updateJob() { - const reqData = { - process_id: this.process.process_id, - overall_stats: this.process.overall_stats, - status: this.process.status, - updatedby: _.get(this.editorService.editorConfig, 'context.user.id') - }; - this.bulkJobService.updateBulkJob(reqData) - .subscribe((updateResponse) => { - if (this.process.status === 'completed') { - this.bulkUploadState = 6; - } else if (this.process.status === 'processing') { - this.bulkUploadState = 5; - } - this.oldProcessStatus = this.process.status; - }, (error) => { - console.log(error); - }); - } - - initiateDocumentUploadModal() { - this.loading = false; - this.bulkUploadValidationError = ''; - this.bulkUploadErrorMsgs = []; - return setTimeout(() => { - this.initiateUploadModal(); - }, 0); - } - - initiateUploadModal() { - this.uploader = new FineUploader({ - element: document.getElementById('upload-document-div'), - template: 'qq-template-validation', - multiple: false, - autoUpload: false, - request: { - endpoint: '/assets/uploads' - }, - validation: { - allowedExtensions: [this.assetConfig.csv.accepted], - acceptFiles: ['text/csv'], - itemLimit: 1, - sizeLimit: _.toNumber(this.assetConfig.csv.size) * 1024 * 1024 // Convert into MB - }, - messages: { - sizeError: `{file} is too large, maximum file size is ${this.assetConfig.csv.size} MB.`, - typeError: `Invalid content type (supported type: ${this.assetConfig.csv.accepted})` - }, - callbacks: { - onStatusChange: () => { }, - onSubmit: () => { - this.uploadContent(); - }, - onError: () => { - this.uploader.reset(); - } - } - }); - this.fineUploaderUI.nativeElement.remove(); - } - - uploadContent() { - const file = this.uploader.getFile(0); - const filename = this.uploader.getName(0); - if (file == null) { - this.toasterService.error('File is required to upload'); - this.uploader.reset(); - return; - } - this.bulkUploadState = 3; - this.startBulkUpload(file, filename); - } - - startBulkUpload(file, filename) { - this.generatePreSignedUrl(filename).pipe( - map(response => { - return _.get(response.result, 'pre_signed_url'); - }), mergeMap(signedURL => { - return this.uploadToBlob(signedURL, file); - }), mergeMap(signedURL => this.createImportRequest(signedURL).pipe( - map(importResponse => { - this.process.process_id = _.get(importResponse, 'result.processId'); - return _.get(importResponse, 'result.count'); - }))), mergeMap(totalQuestion => this.createJobRequest(totalQuestion) - )).subscribe((jobResponse) => { - this.process = _.get(jobResponse, 'result'); - this.oldProcessStatus = this.process.status; - this.calculateCompletionPercentage(); - this.editorService.nextBulkUploadStatus('processing'); - this.bulkUploadEmitter.emit({ status: true, type: 'updateHierarchy' }); - console.log('response ::', jobResponse); - }); - } - - generatePreSignedUrl(filename) { - const request = { - content: { - fileName: filename - } - }; - return this.editorService.generatePreSignedUrl(request, this.collectionId, 'hierarchy').pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.035') }; - this.uploader.reset(); - this.updateBulkUploadState('decrement'); - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - })); - } - - uploadToBlob(signedURL, file) { - const config = { - processData: false, - contentType: 'text/csv', - headers: { - 'x-ms-blob-type': 'BlockBlob' - } - }; - return this.editorService.httpClient.put(signedURL, file, config).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.036')}; - this.uploader.reset(); - this.updateBulkUploadState('decrement'); - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - }), map(data => signedURL.split('?')[0])); - } - - createImportRequest(fileUrl) { - let reqBody = { - fileUrl, - questionType: 'MCQ', - createdBy: _.get(this.editorService.editorConfig, 'context.user.id'), - author: _.get(this.editorService.editorConfig, 'context.user.fullName', ''), - status: 'Draft', - questionSetId: this.collectionId - }; - const headers = { 'X-Channel-ID': _.get(this.editorService.editorConfig, 'context.channel') }; - const derivedProperties = ['additionalCategories', 'board', 'medium', 'gradeLevel', 'subject', 'audience', - 'license', 'framework', 'topic']; - reqBody = _.merge({}, reqBody, _.pick(this.questionSetMetadata, derivedProperties)); - return this.bulkJobService.createBulkImport(reqBody, headers).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.001')}; - this.uploader.reset(); - if (_.get(err, 'error.result.messages')) { - this.bulkUploadState = 4; - this.bulkUploadErrorMsgs = _.get(err, 'error.result.messages'); - return throwError({}); - } else { - this.updateBulkUploadState('decrement'); - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - } - })); - } - - get questionSetMetadata() { - const rootNode = this.treeService.getFirstChild(); - return _.get(rootNode, 'data.metadata'); - } - - viewDetails($event) { - $event.preventDefault(); - this.showBulkUploadModal = true; - if (this.process.status === 'processing') { - this.bulkUploadState = 5; - this.checkBulkUploadStatus(); - } else { - this.bulkUploadState = 6; - } - } - - getContentStatus() { - return 'draft'; - } - - createJobRequest(rowsCount) { - this.bulkUploadState = 5; - const orgId = _.get(this.editorService.editorConfig, 'context.contributionOrgId'); - const createdby = _.get(this.editorService.editorConfig, 'context.user.id'); - const programId = _.get(this.editorService.editorConfig, 'context.programId', ''); - const collectionId = this.collectionId; - - this.process.overall_stats = { - total: rowsCount, - upload_pending: rowsCount, - upload_failed: 0, - upload_success: 0 - }; - this.process.data = { - program_id: programId, - collection_id: collectionId - }; - this.process.createdon = new Date(); - this.process.createdby = createdby; - this.process.program_id = programId; - this.process.collection_id = collectionId; - this.process.status = 'processing'; - - if (orgId) { - this.process.data.org_id = orgId; - this.process.org_id = orgId; - } - const request = { ...this.process }; - return this.bulkJobService.createBulkJob(request); - } - - async openBulkUploadModal() { - this.bulkUploadState = 0; - this.showBulkUploadModal = true; - this.updateBulkUploadState('increment'); - } - - closeBulkUploadModal() { - this.showBulkUploadModal = false; - this.bulkUploadState = 0; - if (this.uploader) { - this.uploader.reset(); - } - } - - updateBulkUploadState(action) { - if (this.bulkUploadState === 6 && action === 'increment') { - return this.closeBulkUploadModal(); - } - if (this.bulkUploadState === 4 && action === 'decrement') { - this.bulkUploadState = 3; - } - this.bulkUploadState += (action === 'increment') ? 1 : -1; - if (this.bulkUploadState === 2) { - this.initiateDocumentUploadModal(); - } - } - - getParentsHelper(tree: any, id: string, parents: string = '') { - const self = this; - if (tree.identifier === id) { - return { - found: true, - parents - }; - } - let result = { - found: false, - }; - if (tree.children) { - _.forEach(tree.children, (subtree, key) => { - let maybeParents = parents; - if (tree.identifier !== undefined) { - maybeParents = tree.name; - } - const maybeResult: any = self.getParentsHelper(subtree, id, maybeParents); - if (maybeResult.found) { - result = maybeResult; - return false; - } - }); - } - return result; - } - - getParents(data: Array, id: string) { - const tree = { - children: data - }; - return this.getParentsHelper(tree, id); - } - - downloadSampleCSVFile() { - const downloadConfig = { - blobUrl: this.sampleMetadataCsvUrl, - successMessage: false, - fileType: 'csv', - fileName: this.collectionId - }; - window.open(downloadConfig.blobUrl, '_blank'); - } -} diff --git a/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.html b/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.html index 7e0a1f044..b68af0fbb 100644 --- a/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.html +++ b/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.html @@ -39,7 +39,7 @@
- {{data?.name}} +
@@ -64,7 +64,7 @@
- {{data?.name}} +
@@ -109,7 +109,7 @@ (click)="selectVideo(data)">
- {{data?.name}} +
@@ -137,7 +137,7 @@ (click)="selectVideo(data);">
- {{data?.name}} +
@@ -157,7 +157,7 @@ -
{{configService.labelConfig?.lbl?.uploadAndUse}}
@@ -209,11 +209,10 @@
{{configService.labelConfig?.lbl?.copyRightsAndLicense}}
-
diff --git a/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.ts b/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.ts index f473a0abf..1712a46cf 100644 --- a/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.ts +++ b/projects/collection-editor-library/src/lib/components/ckeditor-tool/ckeditor-tool.component.ts @@ -62,7 +62,6 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { public initialFormConfig: any; public imageFormValid = false; public videoFile: any; - public imageFile: any; public termsAndCondition: any; public assetName: any; public emptyImageSearchMessage: any; @@ -176,15 +175,11 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { this.videoDataOutput.emit(false); } dismissImageUploadModal() { - if (this.isClosable) { this.showImageUploadModal = false; } - } initiateImageUploadModal() { this.showImagePicker = false; this.showImageUploadModal = true; - this.loading = false; - this.isClosable = true; } dismissVideoUploadModal() { @@ -372,7 +367,7 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { }); } - addImageInEditor(imageUrl, imageId, imageName) { + addImageInEditor(imageUrl, imageId) { const src = this.getMediaOriginURL(imageUrl); const baseUrl = _.get(this.editorService.editorConfig, 'context.host') || document.location.origin; this.mediaobj = { @@ -384,7 +379,7 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { this.editorInstance.model.change(writer => { const imageElement = writer.createElement('image', { src, - alt: imageName, + alt: imageId, 'data-asset-variable': imageId }); this.editorInstance.model.insertContent(imageElement, this.editorInstance.model.document.selection); @@ -539,7 +534,6 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { * function to upload image */ uploadImage(event) { - this.imageFile = event.target.files[0]; const file = event.target.files[0]; this.assetName = file.name; const reader = new FileReader(); @@ -586,66 +580,21 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { this.formConfig = formvalue; } uploadAndUseImage(modal) { - this.isClosable = false; - this.loading = true; - this.showErrorMsg = false; - this.imageFormValid = false; - this.questionService.createMediaAsset({ asset: this.assestData }).pipe(catchError(err => { + this.questionService.createMediaAsset({ content: this.assestData }).pipe(catchError(err => { const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; - this.loading = false; - this.isClosable = true; - this.imageFormValid = true; return throwError(this.editorService.apiErrorHandling(err, errInfo)); })).subscribe((res) => { const imgId = res.result.node_id; - const preSignedRequest = { - content: { - fileName: this.assetName - } + const request = { + data: this.formData }; - this.questionService.generatePreSignedUrl(preSignedRequest, imgId).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.026') }; - this.loading = false; - this.isClosable = true; - this.imageFormValid = true; + this.questionService.uploadMedia(request, imgId).pipe(catchError(err => { + const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; return throwError(this.editorService.apiErrorHandling(err, errInfo)); })).subscribe((response) => { - const signedURL = response.result.pre_signed_url; - const blobConfig = { - processData: false, - contentType: 'Asset', - headers: { - 'x-ms-blob-type': 'BlockBlob' - } - }; - this.uploadToBlob(signedURL, this.imageFile, blobConfig).subscribe(() => { - const fileURL = signedURL.split('?')[0]; - const data = new FormData(); - data.append('fileUrl', fileURL); - data.append('mimeType', this.imageFile.type); - const config1 = { - enctype: 'multipart/form-data', - processData: false, - contentType: false, - cache: false - }; - const uploadMediaConfig = { - data, - param: config1 - }; - this.questionService.uploadMedia(uploadMediaConfig, imgId).pipe(catchError(err => { - const errInfo = { errorMsg: _.get(this.configService.labelConfig, 'messages.error.019') }; - this.isClosable = true; - this.loading = false; - this.imageFormValid = true; - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - })).subscribe((response1) => { - this.addImageInEditor(response1.result.content_url, response1.result.node_id, this.assestData['name']); - this.dismissPops(modal); - }); - }); + this.addImageInEditor(response.result.content_url, response.result.node_id); + this.dismissPops(modal); }); - }); } openImageUploadModal() { @@ -690,8 +639,6 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { this.formConfig = this.initialFormConfig; this.imageUploadLoader = false; this.imageFormValid = false; - this.loading = false; - this.isClosable = true; } /** * function to upload video @@ -743,7 +690,7 @@ export class CkeditorToolComponent implements OnInit, AfterViewInit, OnChanges { this.showErrorMsg = false; this.imageFormValid = false; if (!this.showErrorMsg) { - this.questionService.createMediaAsset({ asset: this.assestData }).pipe(catchError(err => { + this.questionService.createMediaAsset({ content: this.assestData }).pipe(catchError(err => { this.loading = false; this.isClosable = true; this.imageFormValid = true; diff --git a/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.html b/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.html index 0da8c59a8..f403b73db 100644 --- a/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.html +++ b/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.html @@ -1,13 +1,15 @@
{{appIconConfig?.label}}
-
+
{{configService.labelConfig?.lbl?.addAnImage}}
- app icon +
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.spec.ts b/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.spec.ts index 520c9a319..255087296 100644 --- a/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/collection-icon/collection-icon.component.spec.ts @@ -18,6 +18,7 @@ describe('CollectionIconComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(CollectionIconComponent); component = fixture.componentInstance; + fixture.detectChanges(); }); it('should create', () => { diff --git a/projects/collection-editor-library/src/lib/components/contentplayer-page/contentplayer-page.component.html b/projects/collection-editor-library/src/lib/components/contentplayer-page/contentplayer-page.component.html index d6051a510..6ae5b8588 100644 --- a/projects/collection-editor-library/src/lib/components/contentplayer-page/contentplayer-page.component.html +++ b/projects/collection-editor-library/src/lib/components/contentplayer-page/contentplayer-page.component.html @@ -1,9 +1,6 @@
- - - + diff --git a/projects/collection-editor-library/src/lib/components/csv-upload/csv-upload.component.scss b/projects/collection-editor-library/src/lib/components/csv-upload/csv-upload.component.scss index 0b722ce29..8b4756e6b 100644 --- a/projects/collection-editor-library/src/lib/components/csv-upload/csv-upload.component.scss +++ b/projects/collection-editor-library/src/lib/components/csv-upload/csv-upload.component.scss @@ -97,17 +97,4 @@ } } } - } -.upload-input-button { - input[type="file"] { - position: absolute; - right: 0px; - top: 0px; - font-size: 118px; - margin: 0px; - padding: 0px; - cursor: pointer; - opacity: 0; - height: 100%; - } -} + } \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/editor/editor.component.html b/projects/collection-editor-library/src/lib/components/editor/editor.component.html index 6cc9acd5d..1626cc86f 100755 --- a/projects/collection-editor-library/src/lib/components/editor/editor.component.html +++ b/projects/collection-editor-library/src/lib/components/editor/editor.component.html @@ -2,7 +2,7 @@
+ [labelConfigData]="toolbarConfig" [buttonLoaders]="buttonLoaders" (toolbarEmitter)="toolbarEventListener($event)">
@@ -13,7 +13,7 @@ @@ -109,7 +105,7 @@ class="font-weight-bold mb-4 d-block">"{{configService.labelConfig?.lbl?.iAgreeSubmit}}
{{configService.labelConfig?.lbl?.iconfirmContent}} {{configService.labelConfig?.lbl?.createCommonFramework}} - {{configService.labelConfig?.lbl?.accordance}} + {{configService.labelConfig?.lbl?.accordance}} {{configService.labelConfig?.lbl?.contentPolicy}} {{configService.labelConfig?.lbl?.privacyRights}}"
@@ -130,7 +126,7 @@ {{configService.labelConfig?.lbl?.questionSetPreview}}
-
+
@@ -140,15 +136,12 @@
- - - - - + + - + diff --git a/projects/collection-editor-library/src/lib/components/editor/editor.component.scss b/projects/collection-editor-library/src/lib/components/editor/editor.component.scss old mode 100644 new mode 100755 index bec7d65be..636773933 --- a/projects/collection-editor-library/src/lib/components/editor/editor.component.scss +++ b/projects/collection-editor-library/src/lib/components/editor/editor.component.scss @@ -1,599 +1,585 @@ -lib-editor { - .fancytree-helper-hidden{display:none}.fancytree-helper-indeterminate-cb{color:#777}.fancytree-helper-disabled{color:silver}.fancytree-helper-spin{-webkit-animation:spin 1s infinite linear;animation:spin 1s infinite linear}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}ul.fancytree-container{font-family:inherit;font-size:10pt;white-space:nowrap;padding:3px;margin:0;background-color:#fff;border:1px dotted gray;min-height:0;position:relative}ul.fancytree-container ul{padding:0 0 0 16px;margin:0}ul.fancytree-container ul>li:before{content:none}ul.fancytree-container li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0}ul.fancytree-container li.fancytree-lastsib{background-image:none}.ui-fancytree-disabled ul.fancytree-container{opacity:.5;background-color:silver}ul.fancytree-connectors.fancytree-container li{background-image:url(../../assets/images/vline.gif);background-position:0 0}ul.fancytree-container li.fancytree-lastsib,ul.fancytree-no-connector>li{background-image:none}li.fancytree-animating{position:relative}#fancytree-drop-marker,span.fancytree-checkbox,span.fancytree-drag-helper-img,span.fancytree-empty,span.fancytree-expander,span.fancytree-icon,span.fancytree-vline{width:16px;height:16px;display:inline-block;vertical-align:top;background-repeat:no-repeat;background-image:url(../../assets/images/icons.gif);background-position:0 0}span.fancytree-checkbox,span.fancytree-custom-icon,span.fancytree-expander,span.fancytree-icon{margin-top:0}span.fancytree-custom-icon{width:16px;height:16px;display:inline-block;margin-left:3px;background-position:0 0}img.fancytree-icon{width:16px;height:16px;margin-left:3px;margin-top:0;vertical-align:top;border-style:none}span.fancytree-expander{cursor:pointer}.fancytree-exp-n span.fancytree-expander,.fancytree-exp-nl span.fancytree-expander{background-image:none;cursor:default}.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-connectors .fancytree-exp-nl span.fancytree-expander{background-image:url(../../assets/images/icons.gif);margin-top:0}.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-connectors .fancytree-exp-n span.fancytree-expander:hover{background-position:0 -64px}.fancytree-connectors .fancytree-exp-nl span.fancytree-expander,.fancytree-connectors .fancytree-exp-nl span.fancytree-expander:hover{background-position:-16px -64px}.fancytree-exp-c span.fancytree-expander{background-position:0 -80px}.fancytree-exp-c span.fancytree-expander:hover{background-position:-16px -80px}.fancytree-exp-cl span.fancytree-expander{background-position:0 -96px}.fancytree-exp-cl span.fancytree-expander:hover{background-position:-16px -96px}.fancytree-exp-cd span.fancytree-expander{background-position:-64px -80px}.fancytree-exp-cd span.fancytree-expander:hover{background-position:-80px -80px}.fancytree-exp-cdl span.fancytree-expander{background-position:-64px -96px}.fancytree-exp-cdl span.fancytree-expander:hover{background-position:-80px -96px}.fancytree-exp-e span.fancytree-expander,.fancytree-exp-ed span.fancytree-expander{background-position:-32px -80px}.fancytree-exp-e span.fancytree-expander:hover,.fancytree-exp-ed span.fancytree-expander:hover{background-position:-48px -80px}.fancytree-exp-edl span.fancytree-expander,.fancytree-exp-el span.fancytree-expander{background-position:-32px -96px}.fancytree-exp-edl span.fancytree-expander:hover,.fancytree-exp-el span.fancytree-expander:hover{background-position:-48px -96px}.fancytree-fade-expander span.fancytree-expander{transition:opacity 1.5s;opacity:0}.fancytree-fade-expander .fancytree-treefocus span.fancytree-expander,.fancytree-fade-expander [class*=fancytree-statusnode-] span.fancytree-expander,.fancytree-fade-expander.fancytree-treefocus span.fancytree-expander,.fancytree-fade-expander:hover span.fancytree-expander{transition:opacity .6s;opacity:1}span.fancytree-checkbox{margin-left:3px;background-position:0 -32px}span.fancytree-checkbox:hover{background-position:-16px -32px}span.fancytree-checkbox.fancytree-radio{background-position:0 -48px}span.fancytree-checkbox.fancytree-radio:hover{background-position:-16px -48px}.fancytree-partsel span.fancytree-checkbox{background-position:-64px -32px}.fancytree-partsel span.fancytree-checkbox:hover{background-position:-80px -32px}.fancytree-partsel span.fancytree-checkbox.fancytree-radio{background-position:-64px -48px}.fancytree-partsel span.fancytree-checkbox.fancytree-radio:hover{background-position:-80px -48px}.fancytree-selected span.fancytree-checkbox{background-position:-32px -32px}.fancytree-selected span.fancytree-checkbox:hover{background-position:-48px -32px}.fancytree-selected span.fancytree-checkbox.fancytree-radio{background-position:-32px -48px}.fancytree-selected span.fancytree-checkbox.fancytree-radio:hover{background-position:-48px -48px}.fancytree-unselectable span.fancytree-checkbox{opacity:.4}.fancytree-unselectable span.fancytree-checkbox:hover{background-position:0 -32px}.fancytree-unselectable span.fancytree-checkbox.fancytree-radio:hover{background-position:0 -48px}.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover{background-position:-64px -32px}.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover{background-position:-32px -32px}.fancytree-unselectable.fancytree-selected span.fancytree-checkbox.fancytree-radio:hover{background-position:-32px -48px}.fancytree-container.fancytree-checkbox-auto-hide span.fancytree-checkbox{visibility:hidden}.fancytree-container.fancytree-checkbox-auto-hide .fancytree-node.fancytree-selected span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide .fancytree-node:hover span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide tr.fancytree-selected td span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide tr:hover td span.fancytree-checkbox{visibility:unset}.fancytree-container.fancytree-checkbox-auto-hide.fancytree-treefocus .fancytree-node.fancytree-active span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide.fancytree-treefocus tr.fancytree-active td span.fancytree-checkbox{visibility:unset}span.fancytree-icon{margin-left:3px;background-position:0 0}.fancytree-ico-c span.fancytree-icon:hover{background-position:-16px 0}.fancytree-has-children.fancytree-ico-c span.fancytree-icon{background-position:-32px 0}.fancytree-has-children.fancytree-ico-c span.fancytree-icon:hover{background-position:-48px 0}.fancytree-ico-e span.fancytree-icon{background-position:-64px 0}.fancytree-ico-e span.fancytree-icon:hover{background-position:-80px 0}.fancytree-ico-cf span.fancytree-icon{background-position:0 -16px}.fancytree-ico-cf span.fancytree-icon:hover{background-position:-16px -16px}.fancytree-has-children.fancytree-ico-cf span.fancytree-icon{background-position:-32px -16px}.fancytree-has-children.fancytree-ico-cf span.fancytree-icon:hover{background-position:-48px -16px}.fancytree-ico-ef span.fancytree-icon{background-position:-64px -16px}.fancytree-ico-ef span.fancytree-icon:hover{background-position:-80px -16px}.fancytree-loading span.fancytree-expander,.fancytree-loading span.fancytree-expander:hover,.fancytree-statusnode-loading span.fancytree-icon,.fancytree-statusnode-loading span.fancytree-icon:hover,span.fancytree-icon.fancytree-icon-loading{background-image:url(../../assets/images/loading.gif);background-position:0 0}.fancytree-statusnode-error span.fancytree-icon,.fancytree-statusnode-error span.fancytree-icon:hover{background-position:0 -112px}span.fancytree-node{display:inherit;width:100%;margin-top:1px;min-height:16px}span.fancytree-title{color:#000;cursor:pointer;display:inline-block;vertical-align:top;min-height:16px;padding:0 3px 0 3px;margin:0 0 0 3px;border:1px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;-ms-border-radius:0;-o-border-radius:0;border-radius:0}span.fancytree-node.fancytree-error span.fancytree-title{color:red}span.fancytree-childcounter{color:#fff;background:#337ab7;border:1px solid gray;border-radius:10px;padding:2px;text-align:center}div.fancytree-drag-helper span.fancytree-childcounter,div.fancytree-drag-helper span.fancytree-dnd-modifier{display:inline-block;color:#fff;background:#337ab7;border:1px solid gray;min-width:10px;height:10px;line-height:1;vertical-align:baseline;border-radius:10px;padding:2px;text-align:center;font-size:9px}div.fancytree-drag-helper span.fancytree-childcounter{position:absolute;top:-6px;right:-6px}div.fancytree-drag-helper span.fancytree-dnd-modifier{background:#5cb85c;border:none;font-weight:bolder}div.fancytree-drag-helper.fancytree-drop-accept span.fancytree-drag-helper-img{background-position:-32px -112px}div.fancytree-drag-helper.fancytree-drop-reject span.fancytree-drag-helper-img{background-position:-16px -112px}#fancytree-drop-marker{width:32px;position:absolute;background-position:0 -128px;margin:0}#fancytree-drop-marker.fancytree-drop-after,#fancytree-drop-marker.fancytree-drop-before{width:64px;background-position:0 -144px}#fancytree-drop-marker.fancytree-drop-copy{background-position:-64px -128px}#fancytree-drop-marker.fancytree-drop-move{background-position:-32px -128px}span.fancytree-drag-source.fancytree-drag-remove{opacity:.15}.fancytree-container.fancytree-rtl span.fancytree-connector,.fancytree-container.fancytree-rtl span.fancytree-drag-helper-img,.fancytree-container.fancytree-rtl span.fancytree-expander,.fancytree-container.fancytree-rtl span.fancytree-icon{background-image:url(../../assets/images/icons-rtl.gif)}.fancytree-container.fancytree-rtl .fancytree-exp-n span.fancytree-expander,.fancytree-container.fancytree-rtl .fancytree-exp-nl span.fancytree-expander{background-image:none}.fancytree-container.fancytree-rtl.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-container.fancytree-rtl.fancytree-connectors .fancytree-exp-nl span.fancytree-expander{background-image:url(../../assets/images/icons-rtl.gif)}ul.fancytree-container.fancytree-rtl ul{padding:0 16px 0 0}ul.fancytree-container.fancytree-rtl.fancytree-connectors li{background-position:right 0;background-image:url(../../assets/images/vline-rtl.gif)}ul.fancytree-container.fancytree-rtl li.fancytree-lastsib,ul.fancytree-container.fancytree-rtl.fancytree-no-connector>li{background-image:none}#fancytree-drop-marker.fancytree-rtl{background-image:url(../../assets/images/icons-rtl.gif)}table.fancytree-ext-table{font-family:inherit;font-size:10pt;border-collapse:collapse}table.fancytree-ext-table span.fancytree-node{display:inline-block;box-sizing:border-box}table.fancytree-ext-table td.fancytree-status-merged{text-align:center;font-style:italic;color:silver}table.fancytree-ext-table tr.fancytree-statusnode-error td.fancytree-status-merged{color:red}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode>tbody>tr.fancytree-active>td{background-color:#eee}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode>tbody>tr>td.fancytree-active-cell{background-color:#cbe8f6}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode.fancytree-cell-nav-mode>tbody>tr>td.fancytree-active-cell{background-color:#3875d7}table.fancytree-ext-columnview tbody tr td{position:relative;border:1px solid gray;vertical-align:top;overflow:auto}table.fancytree-ext-columnview tbody tr td>ul{padding:0}table.fancytree-ext-columnview tbody tr td>ul li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0}table.fancytree-ext-columnview span.fancytree-node{position:relative;display:inline-block}table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded{background-color:#e0e0e0}table.fancytree-ext-columnview span.fancytree-node.fancytree-active{background-color:#cbe8f6}table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right{position:absolute;right:3px;background-position:0 -80px}table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right:hover{background-position:-16px -80px}.fancytree-ext-filter-dimm span.fancytree-node span.fancytree-title{color:silver;font-weight:lighter}.fancytree-ext-filter-dimm span.fancytree-node.fancytree-submatch span.fancytree-title,.fancytree-ext-filter-dimm tr.fancytree-submatch span.fancytree-title{color:#000;font-weight:400}.fancytree-ext-filter-dimm span.fancytree-node.fancytree-match span.fancytree-title,.fancytree-ext-filter-dimm tr.fancytree-match span.fancytree-title{color:#000;font-weight:700}.fancytree-ext-filter-hide span.fancytree-node.fancytree-hide,.fancytree-ext-filter-hide tr.fancytree-hide{display:none}.fancytree-ext-filter-hide span.fancytree-node.fancytree-submatch span.fancytree-title,.fancytree-ext-filter-hide tr.fancytree-submatch span.fancytree-title{color:silver;font-weight:lighter}.fancytree-ext-filter-hide span.fancytree-node.fancytree-match span.fancytree-title,.fancytree-ext-filter-hide tr.fancytree-match span.fancytree-title{color:#000;font-weight:400}.fancytree-ext-filter-hide-expanders span.fancytree-node.fancytree-match span.fancytree-expander,.fancytree-ext-filter-hide-expanders tr.fancytree-match span.fancytree-expander{visibility:hidden}.fancytree-ext-filter-hide-expanders span.fancytree-node.fancytree-submatch span.fancytree-expander,.fancytree-ext-filter-hide-expanders tr.fancytree-submatch span.fancytree-expander{visibility:visible}.fancytree-ext-childcounter span.fancytree-custom-icon,.fancytree-ext-childcounter span.fancytree-icon,.fancytree-ext-filter span.fancytree-custom-icon,.fancytree-ext-filter span.fancytree-icon{position:relative}.fancytree-ext-childcounter span.fancytree-childcounter,.fancytree-ext-filter span.fancytree-childcounter{color:#fff;background:#777;border:1px solid gray;position:absolute;top:-6px;right:-6px;min-width:10px;height:10px;line-height:1;vertical-align:baseline;border-radius:10px;padding:2px;text-align:center;font-size:9px}ul.fancytree-ext-wide{position:relative;min-width:100%;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.fancytree-ext-wide span.fancytree-node>span{position:relative;z-index:2}ul.fancytree-ext-wide span.fancytree-node span.fancytree-title{position:absolute;z-index:1;left:0;min-width:100%;margin-left:0;margin-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fancytree-ext-fixed-wrapper .fancytree-ext-fixed-hidden{display:none}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-scroll-border-bottom{border-bottom:3px solid rgba(0,0,0,.75)}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-scroll-border-right{border-right:3px solid rgba(0,0,0,.75)}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-tl{position:absolute;overflow:hidden;z-index:3;top:0;left:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-tr{position:absolute;overflow:hidden;z-index:2;top:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-bl{position:absolute;overflow:hidden;z-index:2;left:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-br{position:absolute;overflow:scroll;z-index:1}span.fancytree-title{border:1px solid transparent;border-radius:0}span.fancytree-focused span.fancytree-title{outline:1px dotted #000}span.fancytree-active span.fancytree-title,span.fancytree-selected span.fancytree-title{background-color:#d4d4d4}span.fancytree-selected span.fancytree-title{font-style:italic}.fancytree-treefocus span.fancytree-active span.fancytree-title,.fancytree-treefocus span.fancytree-selected span.fancytree-title{color:#fff;background-color:#3875d7}table.fancytree-ext-table{border-collapse:collapse}table.fancytree-ext-table tbody tr.fancytree-focused{background-color:#99defd}table.fancytree-ext-table tbody tr.fancytree-active{background-color:#4169e1}table.fancytree-ext-table tbody tr.fancytree-selected{background-color:#99defd}table.fancytree-ext-columnview tbody tr td{border:1px solid gray}table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded{background-color:#ccc}table.fancytree-ext-columnview span.fancytree-node.fancytree-active{background-color:#4169e1} - .optionsArrayMap, - .optionsLast, - .optionsArray { - color: #000 !important; - } - .dynamic-form { - .required { - .sb-modal-dropdown-web { - label { - &::after { - content: ' ' !important; - } +.fancytree-helper-hidden{display:none}.fancytree-helper-indeterminate-cb{color:#777}.fancytree-helper-disabled{color:silver}.fancytree-helper-spin{-webkit-animation:spin 1s infinite linear;animation:spin 1s infinite linear}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}ul.fancytree-container{font-family:inherit;font-size:10pt;white-space:nowrap;padding:3px;margin:0;background-color:#fff;border:1px dotted gray;min-height:0;position:relative}ul.fancytree-container ul{padding:0 0 0 16px;margin:0}ul.fancytree-container ul>li:before{content:none}ul.fancytree-container li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0}ul.fancytree-container li.fancytree-lastsib{background-image:none}.ui-fancytree-disabled ul.fancytree-container{opacity:.5;background-color:silver}ul.fancytree-connectors.fancytree-container li{background-image:url(../../assets/images/vline.gif);background-position:0 0}ul.fancytree-container li.fancytree-lastsib,ul.fancytree-no-connector>li{background-image:none}li.fancytree-animating{position:relative}#fancytree-drop-marker,span.fancytree-checkbox,span.fancytree-drag-helper-img,span.fancytree-empty,span.fancytree-expander,span.fancytree-icon,span.fancytree-vline{width:16px;height:16px;display:inline-block;vertical-align:top;background-repeat:no-repeat;background-image:url(../../assets/images/icons.gif);background-position:0 0}span.fancytree-checkbox,span.fancytree-custom-icon,span.fancytree-expander,span.fancytree-icon{margin-top:0}span.fancytree-custom-icon{width:16px;height:16px;display:inline-block;margin-left:3px;background-position:0 0}img.fancytree-icon{width:16px;height:16px;margin-left:3px;margin-top:0;vertical-align:top;border-style:none}span.fancytree-expander{cursor:pointer}.fancytree-exp-n span.fancytree-expander,.fancytree-exp-nl span.fancytree-expander{background-image:none;cursor:default}.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-connectors .fancytree-exp-nl span.fancytree-expander{background-image:url(../../assets/images/icons.gif);margin-top:0}.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-connectors .fancytree-exp-n span.fancytree-expander:hover{background-position:0 -64px}.fancytree-connectors .fancytree-exp-nl span.fancytree-expander,.fancytree-connectors .fancytree-exp-nl span.fancytree-expander:hover{background-position:-16px -64px}.fancytree-exp-c span.fancytree-expander{background-position:0 -80px}.fancytree-exp-c span.fancytree-expander:hover{background-position:-16px -80px}.fancytree-exp-cl span.fancytree-expander{background-position:0 -96px}.fancytree-exp-cl span.fancytree-expander:hover{background-position:-16px -96px}.fancytree-exp-cd span.fancytree-expander{background-position:-64px -80px}.fancytree-exp-cd span.fancytree-expander:hover{background-position:-80px -80px}.fancytree-exp-cdl span.fancytree-expander{background-position:-64px -96px}.fancytree-exp-cdl span.fancytree-expander:hover{background-position:-80px -96px}.fancytree-exp-e span.fancytree-expander,.fancytree-exp-ed span.fancytree-expander{background-position:-32px -80px}.fancytree-exp-e span.fancytree-expander:hover,.fancytree-exp-ed span.fancytree-expander:hover{background-position:-48px -80px}.fancytree-exp-edl span.fancytree-expander,.fancytree-exp-el span.fancytree-expander{background-position:-32px -96px}.fancytree-exp-edl span.fancytree-expander:hover,.fancytree-exp-el span.fancytree-expander:hover{background-position:-48px -96px}.fancytree-fade-expander span.fancytree-expander{transition:opacity 1.5s;opacity:0}.fancytree-fade-expander .fancytree-treefocus span.fancytree-expander,.fancytree-fade-expander [class*=fancytree-statusnode-] span.fancytree-expander,.fancytree-fade-expander.fancytree-treefocus span.fancytree-expander,.fancytree-fade-expander:hover span.fancytree-expander{transition:opacity .6s;opacity:1}span.fancytree-checkbox{margin-left:3px;background-position:0 -32px}span.fancytree-checkbox:hover{background-position:-16px -32px}span.fancytree-checkbox.fancytree-radio{background-position:0 -48px}span.fancytree-checkbox.fancytree-radio:hover{background-position:-16px -48px}.fancytree-partsel span.fancytree-checkbox{background-position:-64px -32px}.fancytree-partsel span.fancytree-checkbox:hover{background-position:-80px -32px}.fancytree-partsel span.fancytree-checkbox.fancytree-radio{background-position:-64px -48px}.fancytree-partsel span.fancytree-checkbox.fancytree-radio:hover{background-position:-80px -48px}.fancytree-selected span.fancytree-checkbox{background-position:-32px -32px}.fancytree-selected span.fancytree-checkbox:hover{background-position:-48px -32px}.fancytree-selected span.fancytree-checkbox.fancytree-radio{background-position:-32px -48px}.fancytree-selected span.fancytree-checkbox.fancytree-radio:hover{background-position:-48px -48px}.fancytree-unselectable span.fancytree-checkbox{opacity:.4}.fancytree-unselectable span.fancytree-checkbox:hover{background-position:0 -32px}.fancytree-unselectable span.fancytree-checkbox.fancytree-radio:hover{background-position:0 -48px}.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover{background-position:-64px -32px}.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover{background-position:-32px -32px}.fancytree-unselectable.fancytree-selected span.fancytree-checkbox.fancytree-radio:hover{background-position:-32px -48px}.fancytree-container.fancytree-checkbox-auto-hide span.fancytree-checkbox{visibility:hidden}.fancytree-container.fancytree-checkbox-auto-hide .fancytree-node.fancytree-selected span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide .fancytree-node:hover span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide tr.fancytree-selected td span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide tr:hover td span.fancytree-checkbox{visibility:unset}.fancytree-container.fancytree-checkbox-auto-hide.fancytree-treefocus .fancytree-node.fancytree-active span.fancytree-checkbox,.fancytree-container.fancytree-checkbox-auto-hide.fancytree-treefocus tr.fancytree-active td span.fancytree-checkbox{visibility:unset}span.fancytree-icon{margin-left:3px;background-position:0 0}.fancytree-ico-c span.fancytree-icon:hover{background-position:-16px 0}.fancytree-has-children.fancytree-ico-c span.fancytree-icon{background-position:-32px 0}.fancytree-has-children.fancytree-ico-c span.fancytree-icon:hover{background-position:-48px 0}.fancytree-ico-e span.fancytree-icon{background-position:-64px 0}.fancytree-ico-e span.fancytree-icon:hover{background-position:-80px 0}.fancytree-ico-cf span.fancytree-icon{background-position:0 -16px}.fancytree-ico-cf span.fancytree-icon:hover{background-position:-16px -16px}.fancytree-has-children.fancytree-ico-cf span.fancytree-icon{background-position:-32px -16px}.fancytree-has-children.fancytree-ico-cf span.fancytree-icon:hover{background-position:-48px -16px}.fancytree-ico-ef span.fancytree-icon{background-position:-64px -16px}.fancytree-ico-ef span.fancytree-icon:hover{background-position:-80px -16px}.fancytree-loading span.fancytree-expander,.fancytree-loading span.fancytree-expander:hover,.fancytree-statusnode-loading span.fancytree-icon,.fancytree-statusnode-loading span.fancytree-icon:hover,span.fancytree-icon.fancytree-icon-loading{background-image:url(../../assets/images/loading.gif);background-position:0 0}.fancytree-statusnode-error span.fancytree-icon,.fancytree-statusnode-error span.fancytree-icon:hover{background-position:0 -112px}span.fancytree-node{display:inherit;width:100%;margin-top:1px;min-height:16px}span.fancytree-title{color:#000;cursor:pointer;display:inline-block;vertical-align:top;min-height:16px;padding:0 3px 0 3px;margin:0 0 0 3px;border:1px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;-ms-border-radius:0;-o-border-radius:0;border-radius:0}span.fancytree-node.fancytree-error span.fancytree-title{color:red}span.fancytree-childcounter{color:#fff;background:#337ab7;border:1px solid gray;border-radius:10px;padding:2px;text-align:center}div.fancytree-drag-helper span.fancytree-childcounter,div.fancytree-drag-helper span.fancytree-dnd-modifier{display:inline-block;color:#fff;background:#337ab7;border:1px solid gray;min-width:10px;height:10px;line-height:1;vertical-align:baseline;border-radius:10px;padding:2px;text-align:center;font-size:9px}div.fancytree-drag-helper span.fancytree-childcounter{position:absolute;top:-6px;right:-6px}div.fancytree-drag-helper span.fancytree-dnd-modifier{background:#5cb85c;border:none;font-weight:bolder}div.fancytree-drag-helper.fancytree-drop-accept span.fancytree-drag-helper-img{background-position:-32px -112px}div.fancytree-drag-helper.fancytree-drop-reject span.fancytree-drag-helper-img{background-position:-16px -112px}#fancytree-drop-marker{width:32px;position:absolute;background-position:0 -128px;margin:0}#fancytree-drop-marker.fancytree-drop-after,#fancytree-drop-marker.fancytree-drop-before{width:64px;background-position:0 -144px}#fancytree-drop-marker.fancytree-drop-copy{background-position:-64px -128px}#fancytree-drop-marker.fancytree-drop-move{background-position:-32px -128px}span.fancytree-drag-source.fancytree-drag-remove{opacity:.15}.fancytree-container.fancytree-rtl span.fancytree-connector,.fancytree-container.fancytree-rtl span.fancytree-drag-helper-img,.fancytree-container.fancytree-rtl span.fancytree-expander,.fancytree-container.fancytree-rtl span.fancytree-icon{background-image:url(../../assets/images/icons-rtl.gif)}.fancytree-container.fancytree-rtl .fancytree-exp-n span.fancytree-expander,.fancytree-container.fancytree-rtl .fancytree-exp-nl span.fancytree-expander{background-image:none}.fancytree-container.fancytree-rtl.fancytree-connectors .fancytree-exp-n span.fancytree-expander,.fancytree-container.fancytree-rtl.fancytree-connectors .fancytree-exp-nl span.fancytree-expander{background-image:url(../../assets/images/icons-rtl.gif)}ul.fancytree-container.fancytree-rtl ul{padding:0 16px 0 0}ul.fancytree-container.fancytree-rtl.fancytree-connectors li{background-position:right 0;background-image:url(../../assets/images/vline-rtl.gif)}ul.fancytree-container.fancytree-rtl li.fancytree-lastsib,ul.fancytree-container.fancytree-rtl.fancytree-no-connector>li{background-image:none}#fancytree-drop-marker.fancytree-rtl{background-image:url(../../assets/images/icons-rtl.gif)}table.fancytree-ext-table{font-family:inherit;font-size:10pt;border-collapse:collapse}table.fancytree-ext-table span.fancytree-node{display:inline-block;box-sizing:border-box}table.fancytree-ext-table td.fancytree-status-merged{text-align:center;font-style:italic;color:silver}table.fancytree-ext-table tr.fancytree-statusnode-error td.fancytree-status-merged{color:red}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode>tbody>tr.fancytree-active>td{background-color:#eee}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode>tbody>tr>td.fancytree-active-cell{background-color:#cbe8f6}table.fancytree-ext-table.fancytree-ext-ariagrid.fancytree-cell-mode.fancytree-cell-nav-mode>tbody>tr>td.fancytree-active-cell{background-color:#3875d7}table.fancytree-ext-columnview tbody tr td{position:relative;border:1px solid gray;vertical-align:top;overflow:auto}table.fancytree-ext-columnview tbody tr td>ul{padding:0}table.fancytree-ext-columnview tbody tr td>ul li{list-style-image:none;list-style-position:outside;list-style-type:none;-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background-attachment:scroll;background-color:transparent;background-position:0 0;background-repeat:repeat-y;background-image:none;margin:0}table.fancytree-ext-columnview span.fancytree-node{position:relative;display:inline-block}table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded{background-color:#e0e0e0}table.fancytree-ext-columnview span.fancytree-node.fancytree-active{background-color:#cbe8f6}table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right{position:absolute;right:3px;background-position:0 -80px}table.fancytree-ext-columnview .fancytree-has-children span.fancytree-cv-right:hover{background-position:-16px -80px}.fancytree-ext-filter-dimm span.fancytree-node span.fancytree-title{color:silver;font-weight:lighter}.fancytree-ext-filter-dimm span.fancytree-node.fancytree-submatch span.fancytree-title,.fancytree-ext-filter-dimm tr.fancytree-submatch span.fancytree-title{color:#000;font-weight:400}.fancytree-ext-filter-dimm span.fancytree-node.fancytree-match span.fancytree-title,.fancytree-ext-filter-dimm tr.fancytree-match span.fancytree-title{color:#000;font-weight:700}.fancytree-ext-filter-hide span.fancytree-node.fancytree-hide,.fancytree-ext-filter-hide tr.fancytree-hide{display:none}.fancytree-ext-filter-hide span.fancytree-node.fancytree-submatch span.fancytree-title,.fancytree-ext-filter-hide tr.fancytree-submatch span.fancytree-title{color:silver;font-weight:lighter}.fancytree-ext-filter-hide span.fancytree-node.fancytree-match span.fancytree-title,.fancytree-ext-filter-hide tr.fancytree-match span.fancytree-title{color:#000;font-weight:400}.fancytree-ext-filter-hide-expanders span.fancytree-node.fancytree-match span.fancytree-expander,.fancytree-ext-filter-hide-expanders tr.fancytree-match span.fancytree-expander{visibility:hidden}.fancytree-ext-filter-hide-expanders span.fancytree-node.fancytree-submatch span.fancytree-expander,.fancytree-ext-filter-hide-expanders tr.fancytree-submatch span.fancytree-expander{visibility:visible}.fancytree-ext-childcounter span.fancytree-custom-icon,.fancytree-ext-childcounter span.fancytree-icon,.fancytree-ext-filter span.fancytree-custom-icon,.fancytree-ext-filter span.fancytree-icon{position:relative}.fancytree-ext-childcounter span.fancytree-childcounter,.fancytree-ext-filter span.fancytree-childcounter{color:#fff;background:#777;border:1px solid gray;position:absolute;top:-6px;right:-6px;min-width:10px;height:10px;line-height:1;vertical-align:baseline;border-radius:10px;padding:2px;text-align:center;font-size:9px}ul.fancytree-ext-wide{position:relative;min-width:100%;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.fancytree-ext-wide span.fancytree-node>span{position:relative;z-index:2}ul.fancytree-ext-wide span.fancytree-node span.fancytree-title{position:absolute;z-index:1;left:0;min-width:100%;margin-left:0;margin-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fancytree-ext-fixed-wrapper .fancytree-ext-fixed-hidden{display:none}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-scroll-border-bottom{border-bottom:3px solid rgba(0,0,0,.75)}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-scroll-border-right{border-right:3px solid rgba(0,0,0,.75)}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-tl{position:absolute;overflow:hidden;z-index:3;top:0;left:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-tr{position:absolute;overflow:hidden;z-index:2;top:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-bl{position:absolute;overflow:hidden;z-index:2;left:0}.fancytree-ext-fixed-wrapper div.fancytree-ext-fixed-wrapper-br{position:absolute;overflow:scroll;z-index:1}span.fancytree-title{border:1px solid transparent;border-radius:0}span.fancytree-focused span.fancytree-title{outline:1px dotted #000}span.fancytree-active span.fancytree-title,span.fancytree-selected span.fancytree-title{background-color:#d4d4d4}span.fancytree-selected span.fancytree-title{font-style:italic}.fancytree-treefocus span.fancytree-active span.fancytree-title,.fancytree-treefocus span.fancytree-selected span.fancytree-title{color:#fff;background-color:#3875d7}table.fancytree-ext-table{border-collapse:collapse}table.fancytree-ext-table tbody tr.fancytree-focused{background-color:#99defd}table.fancytree-ext-table tbody tr.fancytree-active{background-color:#4169e1}table.fancytree-ext-table tbody tr.fancytree-selected{background-color:#99defd}table.fancytree-ext-columnview tbody tr td{border:1px solid gray}table.fancytree-ext-columnview span.fancytree-node.fancytree-expanded{background-color:#ccc}table.fancytree-ext-columnview span.fancytree-node.fancytree-active{background-color:#4169e1} +.optionsArrayMap, +.optionsLast, +.optionsArray { + color: #000 !important; +} + +.dynamic-form { + .required { + .sb-modal-dropdown-web { + label { + &::after { + content: ' ' !important; } } } - sb-dynamic-checkbox { - margin-top: 3.5rem; - } - .sb-dropdown-select { - padding: 16px 8px !important; - } - .list-border { - margin-top: 2px !important; - } } - body { - background: #fff !important; + sb-dynamic-checkbox { + margin-top: 3.5rem; + } + .sb-dropdown-select { + padding: 16px 8px !important; } - .add-to-library { + .list-border { + margin-top: 2px !important; + } +} +body { + background: #fff !important; +} +.add-to-library { + position: relative; + z-index: 999 !important; + background: #e5edf5; + .sb-required { + color: #ff4558; + padding-left: 2px; position: relative; - z-index: 998 !important; - background: #e5edf5; - .sb-required { - color: #ff4558; - padding-left: 2px; - position: relative; - top: -5px; + top: -5px; + } + .back-btn { + &:hover { + background: none !important; } - .back-btn { - &:hover { - background: none !important; + } + .back-btn { + min-width: auto; + } + .dynamic-form { + .multi-select-section-app { + label { + margin-bottom: 0.3rem !important; + z-index: inherit; } } - .back-btn { - min-width: auto; + } + .dynamic-form { + label { + font-size: 12px !important; + margin-bottom: 0.5rem !important; + color: #121213e0; + font-weight: 600; } - .dynamic-form { - .multi-select-section-app { - label { - margin-bottom: 0.3rem !important; - z-index: inherit; - } - } + + .sb-textbox, + select, + .sb-textarea, + .list-border { + border: 1px solid rgba(34, 36, 38, 0.15) !important; + padding: 0.85rem 0.5rem !important; + border-radius: 0.28571429rem; + font-size: 0.785rem !important; + font-weight: 500; + // text-transform: capitalize; + } + select { + padding: 12px 8px !important; + } + .list-border { + margin-top: 14px !important; + min-height: 43px !important; + height: inherit !important; + padding: 5px 8px !important; } - .dynamic-form { - label { - font-size: 12px !important; - margin-bottom: 0.5rem !important; - color: #121213e0; - font-weight: 600; - } - .sb-textbox, - select, - .sb-textarea, - .list-border { - border: 1px solid rgba(34, 36, 38, 0.15) !important; - padding: 0.85rem 0.5rem !important; - border-radius: 0.28571429rem; - font-size: 0.785rem !important; - font-weight: 500; - // text-transform: capitalize; - } - select { - padding: 12px 8px !important; - } + .multi-select-container { .list-border { - margin-top: 2px !important; - min-height: 43px !important; - height: inherit !important; - padding: 5px 8px !important; - } - - .multi-select-container { - .list-border { - .placeholder { - font-weight: 500 !important; - color: #333 !important; - } - ul { - @extend label; - color: #333; - padding: 0; - margin: 0 !important; - opacity: 1 !important; - font-weight: 500 !important; - position: inherit !important; - } + .placeholder { + font-weight: 500 !important; + color: #333 !important; } - } - - .sb-modal-dropdown-web { ul { + @extend label; color: #333; padding: 0; margin: 0 !important; opacity: 1 !important; - font-size: 12px !important; - font-weight: 500; - border: 2px solid #eeeeef; - z-index: 99999 !important; + font-weight: 500 !important; + position: inherit !important; } } - .sb-keywordbox { - border: 1px solid rgba(34, 36, 38, 0.15) !important; - padding: 0.45rem 0.5rem !important; - border-radius: 0.28571429rem; - font-size: 0.785rem !important; + } + + .sb-modal-dropdown-web { + ul { + color: #333; + padding: 0; + margin: 0 !important; + opacity: 1 !important; + font-size: 12px !important; font-weight: 500; - padding: 0 !important; - .ng2-tag-input { - padding: 0; - tag { - margin-left: 0.5rem; - } - } - .ng2-tags-container { - margin-top: 0.2rem; - } - .tag-wrapper, - delete-icon svg { - height: 24px; - line-height: 24px; - } + border: 2px solid #eeeeef; + z-index: 99999 !important; } - .topic-picker-selector { - @extend .sb-textbox; - } - .sb-dropdown { - label { - padding: 0; - } - } - .textbox { - .sb-textarea-container { - .sb-textarea { - height: 10rem !important; - padding-top: 0.5rem !important; - } - label { - padding: 0; - } - } - } - - .sb-textarea-container { - .sb-textarea { - height: 2.9rem; - padding-top: 0.5rem !important; - } - label { - padding: 0; + } + .sb-keywordbox { + border: 1px solid rgba(34, 36, 38, 0.15) !important; + padding: 0.45rem 0.5rem !important; + border-radius: 0.28571429rem; + font-size: 0.785rem !important; + font-weight: 500; + padding: 0 !important; + .ng2-tag-input { + padding: 0; + tag { + margin-left: 0.5rem; } } - - .sb-checkbox { - padding: 0; - margin-top: 0; + .ng2-tags-container { + margin-top: 0.2rem; } - sb-icon-dropdown { - top: 10px !important; - right: 6px !important; + .tag-wrapper, + delete-icon svg { + height: 24px; + line-height: 24px; } } - .sb-textarea-container, + .topic-picker-selector { + @extend .sb-textbox; + } .sb-dropdown { - margin: 1rem 0 !important; + label { + padding: 0; + } } - .sb-container { - width: 95% !important; + .sb-textarea-container { + .sb-textarea { + height: 2.9rem; + padding-top: 0.5rem !important; + } + label { + padding: 0; + } } - } - .sb-checkbox-tnc { - .sb-required { - position: absolute; - padding-left: 0; - left: 18px; + .sb-checkbox { + padding: 0; + margin-top: 0; } - } - - .h-100vh { - height: 100vh; - } - .ui.column.grid > [class*='eight wide'].column { - width: 73% !important; - } - .footer-fix { - padding-bottom: 1rem !important; - } - .bg-white, - .ui.twelve.grid { - background: #fff !important; - } - - @keyframes spinner-border { - to { - transform: rotate(360deg); + sb-icon-dropdown { + top: 10px !important; + right: 6px !important; } } - .sb-loading-spinner { - width: 1rem; - height: 1rem; - margin-right: 8px; - border-width: 0.2em; - display: inline-block; - vertical-align: text-bottom; - border: 0.15em solid currentColor; - border-right-color: transparent; - border-radius: 50%; - -webkit-animation: spinner-border 0.75s linear infinite; - animation: spinner-border 0.75s linear infinite; + .sb-textarea-container, + .sb-dropdown { + margin: 1rem 0 !important; } - .sb-btn-loading:before { - position: absolute; - content: ''; - top: 50%; - left: 50%; - margin: -0.64285714em 0 0 -0.64285714em; - width: 1.28571429em; - height: 1.28571429em; - border-radius: 500rem; - border: 0.2em solid rgba(0, 0, 0, 0.15); + .sb-container { + width: 95% !important; } - .sb-btn-loading:after { +} +.sb-checkbox-tnc { + .sb-required { position: absolute; - content: ''; - top: 50%; - left: 50%; - margin: -0.64285714em 0 0 -0.64285714em; - width: 1.28571429em; - height: 1.28571429em; - -webkit-animation: button-spin 0.6s linear; - animation: button-spin 0.6s linear; - -webkit-animation-iteration-count: infinite; - animation-iteration-count: infinite; - border-radius: 500rem; - border-color: #fff transparent transparent; - border-style: solid; - border-width: 0.2em; - -webkit-box-shadow: 0 0 0 1px transparent; - box-shadow: 0 0 0 1px transparent; - } - .sb-btn-outline-disabled { - background-color: #ffffff; - border: 1px solid #cccccc; - color: #999999; - cursor: default; - font-weight: 400; + padding-left: 0; + left: 18px; } +} - lib-chat-window, - .chat_bot { - display: none !important; - } - .sb-textbox::-webkit-input-placeholder { - color: var(--gray-100) !important; - font-weight: 600 !important; - } - .treepicker-parent { - margin: 0.6rem 0 !important; +.h-100vh { + height: 100vh; +} +.ui.column.grid > [class*='eight wide'].column { + width: 73% !important; +} +.footer-fix { + padding-bottom: 1rem !important; +} +.bg-white, +.ui.twelve.grid { + background: #fff !important; +} + +@keyframes spinner-border { + to { + transform: rotate(360deg); } - .ck-content ul { - list-style-type: disc !important; - li { - margin-bottom: 0px !important; - } +} +.sb-loading-spinner { + width: 1rem; + height: 1rem; + margin-right: 8px; + border-width: 0.2em; + display: inline-block; + vertical-align: text-bottom; + border: 0.15em solid currentColor; + border-right-color: transparent; + border-radius: 50%; + -webkit-animation: spinner-border 0.75s linear infinite; + animation: spinner-border 0.75s linear infinite; +} +.sb-btn-loading:before { + position: absolute; + content: ''; + top: 50%; + left: 50%; + margin: -0.64285714em 0 0 -0.64285714em; + width: 1.28571429em; + height: 1.28571429em; + border-radius: 500rem; + border: 0.2em solid rgba(0, 0, 0, 0.15); +} +.sb-btn-loading:after { + position: absolute; + content: ''; + top: 50%; + left: 50%; + margin: -0.64285714em 0 0 -0.64285714em; + width: 1.28571429em; + height: 1.28571429em; + -webkit-animation: button-spin 0.6s linear; + animation: button-spin 0.6s linear; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + border-radius: 500rem; + border-color: #fff transparent transparent; + border-style: solid; + border-width: 0.2em; + -webkit-box-shadow: 0 0 0 1px transparent; + box-shadow: 0 0 0 1px transparent; +} +.sb-btn-outline-disabled { + background-color: #ffffff; + border: 1px solid #cccccc; + color: #999999; + cursor: default; + font-weight: 400; +} + +lib-chat-window, +.chat_bot { + display: none !important; +} +.sb-textbox::-webkit-input-placeholder { + color: var(--gray-100) !important; + font-weight: 600 !important; +} +.treepicker-parent { + margin: 0.6rem 0 !important; +} +.ck-content ul { + list-style-type: disc !important; + li { + margin-bottom: 0px !important; } - sb-dynamic-richtext +} +sb-dynamic-richtext .ck-rounded-corners .ck.ck-editor__top .ck-sticky-panel .ck-toolbar { - border-left: 1px solid #c4c4c4 !important; - border-right: 1px solid #c4c4c4 !important; - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; - border-bottom: 0 !important; - } - sb-dynamic-richtext + border-left: 1px solid #c4c4c4 !important; + border-right: 1px solid #c4c4c4 !important; + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; + border-bottom: 0 !important; +} +sb-dynamic-richtext .ck-rounded-corners .ck.ck-editor__main > .ck-editor__editable, - sb-dynamic-richtext +sb-dynamic-richtext .ck.ck-editor__main > .ck-editor__editable.ck-rounded-corners { - border: 1px solid #c4c4c4 !important; - border-color: var(--ck-color-base-border) !important; - } + border: 1px solid #c4c4c4 !important; + border-color: var(--ck-color-base-border) !important; +} - sb-dynamic-richtext .ck-content .table { - margin: 0.8rem 0 !important; - } +sb-dynamic-richtext .ck-content .table { + margin: 0.8rem 0 !important; +} - .sb-textbox, - .sb-textarea { - &::placeholder { - color: #333 !important; - font-weight: 500 !important; - } +.sb-textbox, +.sb-textarea { + &::placeholder { + color: #333 !important; + font-weight: 500 !important; } +} - .multi-select-container { - .sb-modal-dropdown-web { - ul { - border: 1px solid #d6d4d4 !important; - box-shadow: 0 0 2px #cecaca !important; - } +.multi-select-container { + .sb-modal-dropdown-web { + ul { + border: 1px solid #d6d4d4 !important; + box-shadow: 0 0 2px #cecaca !important; } } +} - .sb-disabled-textarea { - background: var(--gray-0) !important; - border: 0.0625rem solid var(--gray-100) !important; - opacity: 0.45 !important; - pointer-events: none !important; - font-size: 1em !important; - } +.sb-disabled-textarea { + background: var(--gray-0) !important; + border: 0.0625rem solid var(--gray-100) !important; + opacity: 0.45 !important; + pointer-events: none !important; + font-size: 1em !important; +} - .overflow-y { - overflow-y: auto; - } +.overflow-y { + overflow-y: auto; +} +input:focus-visible { + border: none !important; +} + +.dialcodeModal { input:focus-visible { - border: none !important; + border: .0625rem solid #999999 !important; } - - .dialcodeModal { - input:focus-visible { - border: .0625rem solid #999999 !important; - } +} +// Fancy tree css +#fancytree-drop-marker.fa-long-arrow-right:before{ + content: " " !important; +} +.sb-collectionTree-fancyTreelist { + ul> li> span:first-child{ + padding: 15px 33px; } - // Fancy tree css - #fancytree-drop-marker.fa-long-arrow-right:before{ - content: " " !important; + .fancytree-exp-n span.fancytree-expander,.fancytree-exp-nl span.fancytree-expander{ + background: none !important; } - .sb-collectionTree-fancyTreelist { - ul> li> span:first-child{ - padding: 15px 33px; - } - .fancytree-exp-n span.fancytree-expander,.fancytree-exp-nl span.fancytree-expander{ - background: none !important; - } - .ui-fancytree:before, .ui-fancytree ul:before{ - content: none !important; - } - .ui-fancytree li:before, .ui-fancytree ul li:before{ - content: none !important; - } - .ui-fancytree li .fancytree-custom-icon::before { - color: var(--primary-color)!important; - margin-left: 5px; - } - .ui-fancytree .fancytree-folder .fancytree-title { - color: var(--primary-color)!important; - font-size: .9286rem!important; - font-weight: 700!important; - padding-left: 5px; - width: inherit!important; - } - .ui-fancytree .fa-caret-right, .ui-fancytree .fa-caret-down, .ui-fancytree ul .fa-caret-right, .ui-fancytree ul .fa-caret-down{ - display: block !important; - } - - ul.fancytree-container{ - font-size: inherit !important; - font-family: inherit !important; - border: none !important; - } - ul.fancytree-connectors.fancytree-container li{ - background-image: none !important; - } - span.fancytree-node{ - width: inherit !important; - } - span.fancytree-active span.fancytree-title, span.fancytree-selected span.fancytree-title{ - background: none !important; - } - .fancytree-treefocus span.fancytree-active span.fancytree-title, .fancytree-treefocus span.fancytree-selected span.fancytree-title{ - background: none !important; - } - .fancytree-exp-edl span.fancytree-expander, .fancytree-exp-el span.fancytree-expander{ - background-position: -34px -94px; - } - span.fancytree-focused span.fancytree-title{ - outline: 0 !important; - } - .ui-fancytree{ - margin:0 !important; - } - &.ui-fancytree, .ui-fancytree ul{ - margin: 0 0 0 0.625rem !important; - } - .fancytree-exp-e span.fancytree-expander, .fancytree-exp-ed span.fancytree-expander{ - background-position: -32px -68px !important; - } - .fancytree-exp-edl span.fancytree-expander, .fancytree-exp-el span.fancytree-expander{ - background-position: -34px -94px !important; - } - .fancytree-treefocus span.fancytree-active span.fancytree-title,.fancytree-treefocus span.fancytree-selected span.fancytree-title{ - color:inherit; - } + .ui-fancytree:before, .ui-fancytree ul:before{ + content: none !important; } - .sb-loader { - position: fixed; - top: 0%; - left: 23%; - transform: translate(-50%, -50%); - &:after { - content: ''; - width: 32px; - height: 32px; - border-radius: 50%; - border: 2px solid; - border-color: #ccc #ccc transparent; - animation: loader 0.5s infinite; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - } - &.dimmer { - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.8); - z-index: 9999; - } + .ui-fancytree li:before, .ui-fancytree ul li:before{ + content: none !important; } - @keyframes loader { - 0% { - transform: rotate(0deg); - } - 100% { - transform: rotate(360deg); - } + .ui-fancytree li .fancytree-custom-icon::before { + color: var(--primary-color)!important; + margin-left: 5px; } - .sb-success-loader { - position: absolute !important; - top: 46% !important; - left: -12% !important; - transform: translate(-46%, -50%) !important; - &:after { - width: 1.2rem !important; - height: 1.2rem !important; - } + .ui-fancytree .fancytree-folder .fancytree-title { + color: var(--primary-color)!important; + font-size: .9286rem!important; + font-weight: 700!important; + padding-left: 5px; + width: inherit!important; } - .pos-relative { - position: relative; + .ui-fancytree .fa-caret-right, .ui-fancytree .fa-caret-down, .ui-fancytree ul .fa-caret-right, .ui-fancytree ul .fa-caret-down{ + display: block !important; } - .sb-circle-ul { - list-style-type: disc; - padding: 0; - font-size: 0.785rem; - li { - margin: 0 !important; - line-height: 1.4; - } + ul.fancytree-container{ + font-size: inherit !important; + font-family: inherit !important; + border: none !important; } - .sb-bg-color-success-0 { - background: #e1ffdf; + ul.fancytree-connectors.fancytree-container li{ + background-image: none !important; } - .flex-ai-center { - align-self: center !important; + span.fancytree-node{ + width: inherit !important; } - .sb-br-primary { - border: 1px dashed #aedbfd !important; + span.fancytree-active span.fancytree-title, span.fancytree-selected span.fancytree-title{ + background: none !important; } - - .sb-min-h-250 { - min-height: 250px; + .fancytree-treefocus span.fancytree-active span.fancytree-title, .fancytree-treefocus span.fancytree-selected span.fancytree-title{ + background: none !important; } - .z-index-9 { - .menu { - z-index: 99999 !important; - } + .fancytree-exp-edl span.fancytree-expander, .fancytree-exp-el span.fancytree-expander{ + background-position: -34px -94px; } - .p-50 { - padding: 10px 0 10px 50px; + span.fancytree-focused span.fancytree-title{ + outline: 0 !important; } - .h-1 { - height: 1.1em !important; + .ui-fancytree{ + margin:0 !important; } - .mn-15 { - margin: -15px !important; + &.ui-fancytree, .ui-fancytree ul{ + margin: 0 0 0 0.625rem !important; } - .upload-input-button { - position: relative; + .fancytree-exp-e span.fancytree-expander, .fancytree-exp-ed span.fancytree-expander{ + background-position: -32px -68px !important; } - .upload-input-button input { + .fancytree-exp-edl span.fancytree-expander, .fancytree-exp-el span.fancytree-expander{ + background-position: -34px -94px !important; + } + .fancytree-treefocus span.fancytree-active span.fancytree-title,.fancytree-treefocus span.fancytree-selected span.fancytree-title{ + color:inherit; + } +} +.sb-loader { + position: fixed; + top: 0%; + left: 23%; + transform: translate(-50%, -50%); + &:after { + content: ''; + width: 32px; + height: 32px; + border-radius: 50%; + border: 2px solid; + border-color: #ccc #ccc transparent; + animation: loader 0.5s infinite; position: absolute; - opacity: 0; - left: 0; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } - .bg-none { - background: none; + &.dimmer { + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.8); + z-index: 9999; } - .label-disable { - opacity: 0.3 !important; - font-weight: 500 !important; +} +@keyframes loader { + 0% { + transform: rotate(0deg); } - .sb-folder-menu { - position: absolute; - /*top: 131px;*/ - left: 35px; - display: flex; - justify-content: space-between; - width: 24%; - margin-top: 5px; - } - .sb-disable-icon{color:#ccc !important;} - .sb-w-240px{width:240px} - .showCollaborator{ - .ui.dimmer{ - overflow-y: unset !important; - } - .ui.segment{ - max-height: calc(80vh - 8em) !important; - overflow-y: auto !important; - } - .sb-modal-content{ - .flex-align-item-center{ - border-bottom: solid 1px #ccc; - margin: 0px -16px; - padding: 0 20px; - } - } - .ui.pointing{ - margin: 0 -15px !important; - .item{ - &.active{ - font-weight: 600 !important; - } + 100% { + transform: rotate(360deg); + } +} +.sb-success-loader { + position: absolute !important; + top: 46% !important; + left: -12% !important; + transform: translate(-46%, -50%) !important; + &:after { + width: 1.2rem !important; + height: 1.2rem !important; + } +} +.pos-relative { + position: relative; +} + +.sb-circle-ul { + list-style-type: disc; + padding: 0; + font-size: 0.785rem; + li { + margin: 0 !important; + line-height: 1.4; + } +} +.sb-bg-color-success-0 { + background: #e1ffdf; +} +.flex-ai-center { + align-self: center !important; +} +.sb-br-primary { + border: 1px dashed #aedbfd !important; +} + +.sb-min-h-250 { + min-height: 250px; +} +.z-index-9 { + .menu { + z-index: 99999 !important; + } +} +.p-50 { + padding: 10px 0 10px 50px; +} +.h-1 { + height: 1.1em !important; +} +.mn-15 { + margin: -15px !important; +} +.upload-input-button { + position: relative; +} +.upload-input-button input { + position: absolute; + opacity: 0; + left: 0; +} +.bg-none { + background: none; +} +.label-disable { + opacity: 0.3 !important; + font-weight: 500 !important; +} +.sb-folder-menu { + position: absolute; + /*top: 131px;*/ + left: 35px; + display: flex; + justify-content: space-between; + width: 24%; + margin-top: 5px; +} +.sb-disable-icon{color:#ccc !important;} +.sb-w-240px{width:240px} +.showCollaborator{ + .ui.dimmer{ + overflow-y: unset !important; + } + .ui.segment{ + max-height: calc(80vh - 8em) !important; + overflow-y: auto !important; + } + .sb-modal-content{ + .flex-align-item-center{ + border-bottom: solid 1px #ccc; + margin: 0px -16px; + padding: 0 20px; + } + } + .ui.pointing{ + margin: 0 -15px !important; + .item{ + &.active{ + font-weight: 600 !important; } } } - .publish-checklist{ - label { +} +.publish-checklist{ + label { font-size: 13px !important; padding: 0 1.5rem !important; - } } - .sb-keywords{ - input{ - width: 100%; - } - input::placeholder{ - display: block !important; - width: 100%; - } - .ng2-tags-container{ - width: inherit !important; - display: block !important; - tag{ - display: inline-flex !important; - } +} +.sb-keywords{ + input{ + width: 100%; + } + input::placeholder{ + display: block !important; + width: 100%; + } + .ng2-tags-container{ + width: inherit !important; + display: block !important; + tag{ + display: inline-flex !important; } } - .sb-dialcode { - border-bottom: 0.5px solid #333333; - padding: 8px 5px !important; +} +.sb-dialcode { + border-bottom: 0.5px solid #333333; + padding: 8px 5px !important; + border-radius: 0 !important; + &:focus-visible{ + border-bottom: 0.5px solid #333333 !important; border-radius: 0 !important; + outline: 0 !important; + } +} +sb-dynamic-timer{ + .sb-timer-input{ + width: 10rem; + font-size: .785rem!important; + border: 1px solid rgba(34,36,38,.15)!important; + border-radius: .28571429rem; + padding: 12px 10px; + margin-right: 5px; + height: 44px; &:focus-visible{ - border-bottom: 0.5px solid #333333 !important; - border-radius: 0 !important; - outline: 0 !important; + border: 1px solid rgba(34,36,38,.15)!important; } } - sb-dynamic-timer{ - .sb-timer-input{ - width: 10rem; - font-size: .785rem!important; - border: 1px solid rgba(34,36,38,.15)!important; - border-radius: .28571429rem; - padding: 12px 10px; - margin-right: 5px; - height: 44px; - &:focus-visible{ - border: 1px solid rgba(34,36,38,.15)!important; - } - } - .sb-btn-normal{ - height: 42px !important; - } + .sb-btn-normal{ + height: 42px !important; } -} +} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/editor/editor.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/editor/editor.component.spec.data.ts index 8f44058fe..f77560af8 100644 --- a/projects/collection-editor-library/src/lib/components/editor/editor.component.spec.data.ts +++ b/projects/collection-editor-library/src/lib/components/editor/editor.component.spec.data.ts @@ -1,334 +1,136 @@ -import { IEditorConfig } from "collection-editor-library/lib/interfaces/editor"; +import { IEditorConfig } from 'collection-editor-library/lib/interfaces/editor'; export let editorConfig: IEditorConfig | undefined; -export let editorConfig_question: IEditorConfig | undefined; - editorConfig = { context: { - framework: "test", + framework: 'test', user: { - id: "5a587cc1-e018-4859-a0a8-e842650b9d64", - name: "Vaibhav", - orgIds: ["01309282781705830427"], + id: '5a587cc1-e018-4859-a0a8-e842650b9d64', + name: 'Vaibhav', + orgIds: [ + '01309282781705830427' + ] }, - identifier: "do_113274017771085824116", - unitIdentifier: "do_113274017771085824119", - collectionObjectType: "", - channel: "01307938306521497658", - authToken: " ", - sid: "iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV", - did: "7e85b4967aebd6704ba1f604f20056b6", - uid: "bf020396-0d7b-436f-ae9f-869c6780fc45", + identifier: 'do_113274017771085824116', + channel: '01307938306521497658', + authToken: ' ', + sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', + did: '7e85b4967aebd6704ba1f604f20056b6', + uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', additionalCategories: [ { - value: "Textbook", - label: "Textbook", + value: 'Textbook', + label: 'Textbook' }, { - value: "Lesson Plan", - label: "Lesson Plan", - }, + value: 'Lesson Plan', + label: 'Lesson Plan' + } ], pdata: { - id: "dev.dock.portal", - ver: "2.8.0", - pid: "creation-portal", + id: 'dev.dock.portal', + ver: '2.8.0', + pid: 'creation-portal' }, contextRollup: { - l1: "01307938306521497658", + l1: '01307938306521497658' }, - tags: ["01307938306521497658"], + tags: [ + '01307938306521497658' + ], cdata: [ { - id: "01307938306521497658", - type: "sourcing_organization", + id: '01307938306521497658', + type: 'sourcing_organization' }, { - type: "project", - id: "ec5cc850-3f71-11eb-aae1-fb99d9fb6737", + type: 'project', + id: 'ec5cc850-3f71-11eb-aae1-fb99d9fb6737' }, { - type: "linked_collection", - id: "do_113140468925825024117", - }, + type: 'linked_collection', + id: 'do_113140468925825024117' + } ], timeDiff: 5, objectRollup: { - l1: "do_113140468925825024117", - l2: "do_113140468926914560125", + l1: 'do_113140468925825024117', + l2: 'do_113140468926914560125' }, - host: "", - defaultLicense: "CC BY 4.0", - endpoint: "/data/v3/telemetry", - env: "question_set", + host: '', + defaultLicense: 'CC BY 4.0', + endpoint: '/data/v3/telemetry', + env: 'question_set', cloudStorageUrls: [ - "https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/", - "https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/", - "https://dockstorage.blob.core.windows.net/sunbird-content-dock/", + 'https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/', + 'https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/', + 'https://dockstorage.blob.core.windows.net/sunbird-content-dock/' ], - mode: "edit", + mode: 'edit', }, config: { - mode: "edit", + mode: 'edit', maxDepth: 2, - objectType: "Collection", - primaryCategory: "Course", - isReadOnlyMode: false, + objectType: 'Collection', + primaryCategory: 'Course', isRoot: true, dialcodeMinLength: 2, dialcodeMaxLength: 250, - iconClass: "fa fa-book", + iconClass: 'fa fa-book', children: {}, - renderTaxonomy:false, hierarchy: { level1: { - name: "Module", - type: "Unit", - mimeType: "application/vnd.ekstep.content-collection", - contentType: "CourseUnit", - primaryCategory: "Course Unit", - iconClass: "fa fa-folder-o", - children: {}, + name: 'Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'CourseUnit', + primaryCategory: 'Course Unit', + iconClass: 'fa fa-folder-o', + children: {} }, level2: { - name: "Sub-Module", - type: "Unit", - mimeType: "application/vnd.ekstep.content-collection", - contentType: "CourseUnit", - primaryCategory: "Course Unit", - iconClass: "fa fa-folder-o", + name: 'Sub-Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'CourseUnit', + primaryCategory: 'Course Unit', + iconClass: 'fa fa-folder-o', children: { Content: [ - "Explanation Content", - "Learning Resource", - "eTextbook", - "Teacher Resource", - "Course Assessment", - ], - }, + 'Explanation Content', + 'Learning Resource', + 'eTextbook', + 'Teacher Resource', + 'Course Assessment' + ] + } }, level3: { - name: "Sub-Sub-Module", - type: "Unit", - mimeType: "application/vnd.ekstep.content-collection", - contentType: "CourseUnit", - primaryCategory: "Course Unit", - iconClass: "fa fa-folder-o", + name: 'Sub-Sub-Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'CourseUnit', + primaryCategory: 'Course Unit', + iconClass: 'fa fa-folder-o', children: { Content: [ - "Explanation Content", - "Learning Resource", - "eTextbook", - "Teacher Resource", - "Course Assessment", - ], - }, - }, + 'Explanation Content', + 'Learning Resource', + 'eTextbook', + 'Teacher Resource', + 'Course Assessment' + ] + } + } }, collection: { - maxContentsLimit: 10, - }, - questionSet: { - maxQuestionsLimit: 10, - }, - contentPolicyUrl: "/term-of-use.html", - }, -}; - -editorConfig_question = { - context: { - channel: "01309282781705830427", - authToken: "", - sid: "c4hzzUJYlbfLPoN2meEF6QfF3V_9o5Us", - did: "6539921a5736199d5e1ff5b923776c23", - uid: "ae94b68c-a535-4dce-8e7a-fb9662b0ad68", - programId: "f09a30f0-5e34-11ec-874d-3de2a8c29d94", - contributionOrgId: "e7328d77-42a7-44c8-84f4-8cfea235f07d", - pdata: { - id: "local.sunbird.portal", - ver: "2.8.0", - pid: "sunbird-portal", - }, - actor: { - id: "ae94b68c-a535-4dce-8e7a-fb9662b0ad68", - type: "User", + maxContentsLimit: 10 }, - contextRollup: { - l1: "01309282781705830427", - }, - tags: ["01309282781705830427", "01309282781705830427"], - timeDiff: -0.877, - endpoint: "/data/v3/telemetry", - env: "question_editor", - user: { - id: "ae94b68c-a535-4dce-8e7a-fb9662b0ad68", - orgIds: ["01309282781705830427"], - organisations: { - "01309282781705830427": "NIT", - }, - fullName: "N150", - firstName: "N150", - lastName: "", - isRootOrgAdmin: false, - }, - targetFWIds: ["nit_k-12"], - channelData: { - code: "01309282781705830427", - frameworks: [], - channel: "in.ekstep", - description: "Preprod Kayal Org", - createdOn: "2020-08-24T05:00:51.381+0000", - objectType: "Channel", - collectionPrimaryCategories: [ - "Content Playlist", - "Course", - "Digital Textbook", - "Question paper", - ], - appId: "@ignore@", - primaryCategories: [], - additionalCategories: [ - "DigitalCourse", - "DigitalCourse1", - "DigitalCourse2", - "Exam Question Set", - "LearningPath1", - "Observation", - "Survey", - "Text Asset", - "Video transcript", - ], - lastUpdatedOn: "2021-04-09T13:43:13.465+0000", - collectionAdditionalCategories: ["Textbook", "Lesson Plan"], - contentAdditionalCategories: [ - "Classroom Teaching Video", - "Concept Map", - "Curiosity Question Set", - "Experiential Resource", - "Explanation Video", - "Focus Spot", - "Learning Outcome Definition", - "Lesson Plan", - "Marking Scheme Rubric", - "Pedagogy Flow", - "Previous Board Exam Papers", - "TV Lesson", - "Textbook", - ], - apoc_num: 1, - identifier: "01309282781705830427", - lastStatusChangedOn: "2020-08-24T05:00:51.381+0000", - consumerId: "7411b6bd-89f3-40ec-98d1-229dc64ce77d", - assetAdditionalCategories: [], - languageCode: [], - versionKey: "1617975793465", - contentPrimaryCategories: [ - "Course Assessment", - "eTextbook", - "Explanation Content", - "Learning Resource", - "Practice Question Set", - "Teacher Resource", - "Exam Question", - ], - name: "NIT123", - defaultCourseFramework: "TPD", - assetPrimaryCategories: ["Asset", "CertAsset", "Certificate Template"], - status: "Live", - defaultFramework: "ekstep_ncert_k-12", - }, - labels: { - submit_collection_btn_label: "Submit for review", - publish_collection_btn_label: "Submit for Approval", - sourcing_approve_collection_btn_label: "Publish", - reject_collection_btn_label: "Request changes", - }, - framework: "ekstep_ncert_k-12", - correctionComments: "", - sourcingResourceStatus: "Draft", - sourcingResourceStatusClass: "sb-color-gray-300", - collectionIdentifier: "do_113431883451195392169", - unitIdentifier: "do_113431884671442944170", - collectionObjectType: "QuestionSet", - collectionPrimaryCategory: "Exam Question Set", - }, - config: { - primaryCategory: "Subjective Question", - objectType: "Question", - mode: "edit", - setDefaultCopyRight: false, - showOriginPreviewUrl: false, - showSourcingStatus: false, - showCorrectionComments: false, - enableBulkUpload: false, - publicStorageAccount: "https://dockstorage.blob.core.windows.net/", - hideSubmitForReviewBtn: false, questionSet: { - maxQuestionsLimit: 500, - }, - collection: { - maxContentsLimit: 1200, + maxQuestionsLimit: 10 }, - editableFields: { - orgreview: ["name", "learningOutcome"], - sourcingreview: ["name", "learningOutcome"], - }, - mimeType: "application/vnd.sunbird.question", - isReadOnlyMode: false, - interactionType: "default", - questionCategory: "VSA", - }, -}; - -export const toolbarConfig_question = { - preview_collection_btn_label: "Preview", - preview_collection_btn_icon: "icon eye", - save_collection_btn_label: "Save as Draft", - save_collection_btn_icon: "", - submit_collection_btn_label: "Submit for review", - submit_collection_btn_icon: "", - reject_collection_btn_label: "Request changes", - reject_collection_btn_icon: "", - publish_collection_btn_label: "Submit for Approval", - publish_collection_btn_icon: "", - edit_question_btn_label: "Edit", - edit_question_btn_icon: "icon edit", - preview_question_btn_label: "Preview", - preview_question_btn_icon: "icon eye", - cancel_question_btn_label: "Cancel", - cancel_question_btn_icon: "", - save_question_btn_label: "Save", - save_question_btn_icon: "", - send_back_for_correction_collection_btn_label: "Send Back For Corrections", - send_back_for_correction_collection_btn_icon: "", - sourcing_approve_collection_btn_label: "Publish", - sourcing_approve_collection_btn_icon: "", - sourcing_reject_collection_btn_label: "Reject", - sourcing_reject_collection_btn_icon: "", - upload_use_btn_label: "Upload and Use", - cancel_btn_label: "Cancel", - back_btn_label: "Back", - search_btn_label: "Search", - add_btn_label: "Add", - upload_from_computer_btn_label: "Upload from Computer", - request_btn_label: "Request", - no_btn_label: "No", - yes_btn_label: "Yes", - close_btn_label: "Close", - submit_btn_label: "Submit", - add_sibling_btn_label: "Add Sibling", - add_child_btn_label: "Add Child", - create_new_btn_label: "Create New", - add_from_library_btn_label: " Add from library", - submit_review_btn_label: "Submit Review", - apply_btn_label: "Apply", - reset_btn_label: "Reset", - delete_btn_label: "Delete", - next_btn_label: "Next", - remove_btn_label: "Remove", - done_btn_label: "Done", - showDialcode: "no", - showBulkUploadBtn: false, -}; + contentPolicyUrl: '/term-of-use.html' + } +} export const nativeElement = `
-
+
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.scss b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.scss index 30203dc0c..1acb52b92 100644 --- a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.scss +++ b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.scss @@ -7,13 +7,13 @@ &:before { background: none !important; } - + ul { &::before { background: none !important; } } - + .fancytree-folder { .fancytree-title { color: var(--primary-color) !important; @@ -22,23 +22,18 @@ padding-left: 5px; width: inherit !important; } - .fancytree-title.highlightNode { + .highlightNode { color: red !important; &::before { color: red !important; } } } - + li { padding: 0; margin: 0 0 1px 0; - - .highlightNode { - color: red !important; - } - .fancytree { &-ico-c{ padding-left: 5px !important; @@ -61,16 +56,16 @@ border-top: none; } } - + &:last-child { &:after { display: none; } } - + ul { padding-top: 1px; - + li { list-style-type: none;; .fancytree-custom-icon { @@ -82,26 +77,19 @@ margin-left: 6px; font-size: 16px; } - + &:last-child { &:after { display: none; } } } - - - .fancytree-custom-icon.highlightNode { - &::before { - color: red !important; - } - } .fancytree-node { padding: 6px 6px 8px 5px; margin-left: 45px; border: 1px solid transparent; - + &.fancytree-active, &.fancytree-focused, &:hover { @@ -109,22 +97,18 @@ background-color: var(--primary-0); border-right: 0; } - - &.dependent { - margin-left: 65px; - } } } } - + &::before { background: none !important; } - + .sb-fancyTree-icon { color: var(--gray-300) !important; } - + .fancytree-custom-icon { &::before { // content: url("/assets/images/question_collection.svg"); @@ -133,14 +117,14 @@ } } } - + .fa-caret-down { margin-top: 6px; display: block; width: 10px; padding-left: 2px; } - + .fa-caret-right { margin-top: 6px; display: block; @@ -148,7 +132,7 @@ padding-left: 6px; } } - + .ui-fancytree { padding-right: 0.785rem; // height: calc(100vh - 126px); diff --git a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.data.ts index 014246910..a05619147 100644 --- a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.data.ts +++ b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.data.ts @@ -1,245 +1,234 @@ -export const mockData = { - config: { +export const mockData = { + config: { mode: 'edit', maxDepth: 2, objectType: 'Collection', primaryCategory: 'Course', isRoot: true, iconClass: 'fa fa-book', - children: [ - 'do_123' - ], - enableQuestionCreation: false, + children: {}, hierarchy: { - level1: { - name: 'Module', - type: 'Unit', - mimeType: 'application/vnd.ekstep.content-collection', - contentType: 'Course Unit', - iconClass: 'fa fa-folder-o', - children: { - Content: [ - 'Explanation Content', - 'Learning Resource', - 'eTextbook', - 'Teacher Resource', - 'Course Assessment' - ] - } - }, - level2: { - name: 'Sub-Module', - type: 'Unit', - mimeType: 'application/vnd.ekstep.content-collection', - contentType: 'Course Unit', - iconClass: 'fa fa-folder-o', - children: { - Content: [ - 'Explanation Content', - 'Learning Resource', - 'eTextbook', - 'Teacher Resource', - 'Course Assessment' - ] + level1: { + name: 'Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'Course Unit', + iconClass: 'fa fa-folder-o', + children: {} + }, + level2: { + name: 'Sub-Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'Course Unit', + iconClass: 'fa fa-folder-o', + children: { + Content: [ + 'Explanation Content', + 'Learning Resource', + 'eTextbook', + 'Teacher Resource', + 'Course Assessment' + ] + } } - } } } }; export const config = { - 'labelConfig': { - 'messages': { - 'error': { - '007': "Test" + 'labelConfig': { + 'messages': { + 'error': { + '007': "Test" + } } } } -} export const treeData = { - "ownershipType": [ - "createdBy" - ], - "parent": "do_113274019351052288119", - "code": "8e6af9b3-5d1e-af9c-8546-4fd6b4e3dcd3", - "credentials": { - "enabled": "No" - }, - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.ekstep.content-collection", - "idealScreenSize": "normal", - "createdOn": "2021-05-11T12:30:17.357+0000", - "objectType": "Content", - "primaryCategory": "Course Unit", - "children": [ - { - "ownershipType": [ - "createdBy" - ], - "parent": "do_113277071092588544112", - "unitIdentifiers": [ - "do_11328844424763801613560" - ], - "copyright": "vaidehi_Instituations", - "previewUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", - "keywords": [ - "1.2" - ], - "subject": [ - "Hindi" - ], - "channel": "01309282781705830427", - "downloadUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/ecar_files/do_113289107070615552146/1.2_1622205456360_do_113289107070615552146_1.0.ecar", - "language": [ - "English" - ], - "source": "https://dock.sunbirded.org/api/content/v1/read/do_11328844752160358413583", - "mimeType": "video/webm", - "variants": { - "spine": { - "ecarUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/ecar_files/do_113289107070615552146/1.2_1622205457383_do_113289107070615552146_1.0_spine.ecar", - "size": 7399 - } - }, - "objectType": "Content", - "se_mediums": [ - "English" - ], - "gradeLevel": [ - "Class 10" - ], - "appIcon": "https://dockstorage.blob.core.windows.net/sunbird-content-dock/content/do_11328844752160358413583/artifact/book.thumb.jpg", - "primaryCategory": "Explanation Content", - "appId": "dev.dock.portal", - "contentEncoding": "identity", - "artifactUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", - "sYS_INTERNAL_LAST_UPDATED_ON": "2021-05-28T12:40:03.827+0000", - "contentType": "ClassroomTeachingVideo", - "se_gradeLevels": [ - "Class 10" - ], - "trackable": { - "enabled": "No", - "autoBatch": "No" - }, - "identifier": "do_113289107070615552146", - "audience": [ - "Student" - ], - "visibility": "Default", - "discussionForum": { - "enabled": "Yes" - }, - "index": 26, - "mediaType": "content", - "osId": "org.ekstep.quiz.app", - "languageCode": [ - "en" - ], - "lastPublishedBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "version": 2, - "se_subjects": [ - "Hindi" - ], - "license": "CC BY 4.0", - "prevState": "Review", - "size": 2621252, - "lastPublishedOn": "2021-05-28T12:37:36.360+0000", - "name": "1.2", - "attributions": [ - "kayal" - ], - "status": "Live", - "code": "28f75944-ab47-2c12-e097-e44349ae50d9", - "credentials": { - "enabled": "No" - }, - "prevStatus": "Processing", - "origin": "do_11328844752160358413583", - "description": "", - "streamingUrl": "https://sunbirdspikemedia-inct.streaming.media.azure.net/92eb3b32-c03c-4a62-a97a-5c88e5ac516a/do_113289107070615552146_1622205.ism/manifest(format=m3u8-aapl-v3)", - "medium": [ - "English" - ], - "posterImage": "https://drive.google.com/uc?export=download&id=1-dFzAeSNmx1ZRn77CEntyQA-VcBE0PKg", - "idealScreenSize": "normal", - "createdOn": "2021-05-28T12:37:32.959+0000", - "se_boards": [ - "CBSE" - ], - "processId": "cb69d06d-1114-4a5c-8b44-28e106781eb8", - "contentDisposition": "inline", - "lastUpdatedOn": "2021-05-28T12:37:36.252+0000", - "originData": { - "identifier": "do_11328844752160358413583", - "repository": "https://dock.sunbirded.org/api/content/v1/read/do_11328844752160358413583" - }, - "collectionId": "do_11328844424709734413553", - "dialcodeRequired": "No", - "lastStatusChangedOn": "2021-05-28T12:37:37.734+0000", - "creator": "n123", - "os": [ - "All" - ], - "cloudStorageKey": "content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", - "se_FWIds": [ - "ekstep_ncert_k-12" - ], - "pkgVersion": 1, - "versionKey": "1622205456252", - "idealScreenDensity": "hdpi", - "framework": "ekstep_ncert_k-12", - "depth": 3, - "s3Key": "ecar_files/do_113289107070615552146/1.2_1622205456360_do_113289107070615552146_1.0.ecar", - "lastSubmittedOn": "2021-05-28T12:37:35.110+0000", - "createdBy": "0ce5b67e-b48e-489b-a818-e938e8bfc14b", - "compatibilityLevel": 1, - "board": "CBSE", - "programId": "00b79bb0-bef5-11eb-84a1-d1e625ff89be" - } - ], - "contentDisposition": "inline", - "lastUpdatedOn": "2021-06-18T06:17:01.752+0000", - "contentEncoding": "gzip", - "contentType": "CourseUnit", - "dialcodeRequired": "No", - "trackable": { - "enabled": "No", - "autoBatch": "No" - }, - "identifier": "do_113277071092588544112", - "lastStatusChangedOn": "2021-05-11T12:30:17.357+0000", - "audience": [ - "Student" - ], - "os": [ - "All" - ], - "visibility": "Parent", - "discussionForum": { - "enabled": "Yes" - }, - "index": 1, - "mediaType": "content", - "osId": "org.ekstep.launcher", - "languageCode": [ - "en" - ], - "version": 2, - "versionKey": "1620736217357", - "license": "CC BY 4.0", - "idealScreenDensity": "hdpi", - "depth": 2, - "compatibilityLevel": 1, - "name": "Sub-Module", - "timeLimits": {}, - "status": "Draft", - "level": 3 -}; + "ownershipType": [ + "createdBy" + ], + "parent": "do_113274019351052288119", + "code": "8e6af9b3-5d1e-af9c-8546-4fd6b4e3dcd3", + "credentials": { + "enabled": "No" + }, + "channel": "01309282781705830427", + "language": [ + "English" + ], + "mimeType": "application/vnd.ekstep.content-collection", + "idealScreenSize": "normal", + "createdOn": "2021-05-11T12:30:17.357+0000", + "objectType": "Content", + "primaryCategory": "Course Unit", + "children": [ + { + "ownershipType": [ + "createdBy" + ], + "parent": "do_113277071092588544112", + "unitIdentifiers": [ + "do_11328844424763801613560" + ], + "copyright": "vaidehi_Instituations", + "previewUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", + "keywords": [ + "1.2" + ], + "subject": [ + "Hindi" + ], + "channel": "01309282781705830427", + "downloadUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/ecar_files/do_113289107070615552146/1.2_1622205456360_do_113289107070615552146_1.0.ecar", + "language": [ + "English" + ], + "source": "https://dock.sunbirded.org/api/content/v1/read/do_11328844752160358413583", + "mimeType": "video/webm", + "variants": { + "spine": { + "ecarUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/ecar_files/do_113289107070615552146/1.2_1622205457383_do_113289107070615552146_1.0_spine.ecar", + "size": 7399 + } + }, + "objectType": "Content", + "se_mediums": [ + "English" + ], + "gradeLevel": [ + "Class 10" + ], + "appIcon": "https://dockstorage.blob.core.windows.net/sunbird-content-dock/content/do_11328844752160358413583/artifact/book.thumb.jpg", + "primaryCategory": "Explanation Content", + "appId": "dev.dock.portal", + "contentEncoding": "identity", + "artifactUrl": "https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", + "sYS_INTERNAL_LAST_UPDATED_ON": "2021-05-28T12:40:03.827+0000", + "contentType": "ClassroomTeachingVideo", + "se_gradeLevels": [ + "Class 10" + ], + "trackable": { + "enabled": "No", + "autoBatch": "No" + }, + "identifier": "do_113289107070615552146", + "audience": [ + "Student" + ], + "visibility": "Default", + "discussionForum": { + "enabled": "Yes" + }, + "index": 26, + "mediaType": "content", + "osId": "org.ekstep.quiz.app", + "languageCode": [ + "en" + ], + "lastPublishedBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", + "version": 2, + "se_subjects": [ + "Hindi" + ], + "license": "CC BY 4.0", + "prevState": "Review", + "size": 2621252, + "lastPublishedOn": "2021-05-28T12:37:36.360+0000", + "name": "1.2", + "attributions": [ + "kayal" + ], + "status": "Live", + "code": "28f75944-ab47-2c12-e097-e44349ae50d9", + "credentials": { + "enabled": "No" + }, + "prevStatus": "Processing", + "origin": "do_11328844752160358413583", + "description": "", + "streamingUrl": "https://sunbirdspikemedia-inct.streaming.media.azure.net/92eb3b32-c03c-4a62-a97a-5c88e5ac516a/do_113289107070615552146_1622205.ism/manifest(format=m3u8-aapl-v3)", + "medium": [ + "English" + ], + "posterImage": "https://drive.google.com/uc?export=download&id=1-dFzAeSNmx1ZRn77CEntyQA-VcBE0PKg", + "idealScreenSize": "normal", + "createdOn": "2021-05-28T12:37:32.959+0000", + "se_boards": [ + "CBSE" + ], + "processId": "cb69d06d-1114-4a5c-8b44-28e106781eb8", + "contentDisposition": "inline", + "lastUpdatedOn": "2021-05-28T12:37:36.252+0000", + "originData": { + "identifier": "do_11328844752160358413583", + "repository": "https://dock.sunbirded.org/api/content/v1/read/do_11328844752160358413583" + }, + "collectionId": "do_11328844424709734413553", + "dialcodeRequired": "No", + "lastStatusChangedOn": "2021-05-28T12:37:37.734+0000", + "creator": "n123", + "os": [ + "All" + ], + "cloudStorageKey": "content/do_113289107070615552146/artifact/do_113289107070615552146_1622205453434_do_11328844752160358413583_1622124964912_webm1-copy1.webm", + "se_FWIds": [ + "ekstep_ncert_k-12" + ], + "pkgVersion": 1, + "versionKey": "1622205456252", + "idealScreenDensity": "hdpi", + "framework": "ekstep_ncert_k-12", + "depth": 3, + "s3Key": "ecar_files/do_113289107070615552146/1.2_1622205456360_do_113289107070615552146_1.0.ecar", + "lastSubmittedOn": "2021-05-28T12:37:35.110+0000", + "createdBy": "0ce5b67e-b48e-489b-a818-e938e8bfc14b", + "compatibilityLevel": 1, + "board": "CBSE", + "programId": "00b79bb0-bef5-11eb-84a1-d1e625ff89be" + } + ], + "contentDisposition": "inline", + "lastUpdatedOn": "2021-06-18T06:17:01.752+0000", + "contentEncoding": "gzip", + "contentType": "CourseUnit", + "dialcodeRequired": "No", + "trackable": { + "enabled": "No", + "autoBatch": "No" + }, + "identifier": "do_113277071092588544112", + "lastStatusChangedOn": "2021-05-11T12:30:17.357+0000", + "audience": [ + "Student" + ], + "os": [ + "All" + ], + "visibility": "Parent", + "discussionForum": { + "enabled": "Yes" + }, + "index": 1, + "mediaType": "content", + "osId": "org.ekstep.launcher", + "languageCode": [ + "en" + ], + "version": 2, + "versionKey": "1620736217357", + "license": "CC BY 4.0", + "idealScreenDensity": "hdpi", + "depth": 2, + "compatibilityLevel": 1, + "name": "Sub-Module", + "timeLimits": {}, + "status": "Draft", + "level": 3 + }; export const tree = [ { @@ -518,1330 +507,76 @@ export const tree = [ }] export const editorConfig = { - config: { - "rejectCommentsMaxLength": 500, - "setDefaultCopyRight": true, - "showOriginPreviewUrl": false, - "showSourcingStatus": false, - "showCorrectionComments": false, - "assetConfig": { - "image": { - "size": "1", - "accepted": "png, jpeg" - }, - "video": { - "size": "50", - "accepted": "mp4, webm" - } - }, - "mode": "edit", - "maxDepth": 2, - "objectType": "Collection", - "primaryCategory": "Course", - "isRoot": true, - "dialcodeMinLength": 2, - "dialcodeMaxLength": 250, - "iconClass": "fa fa-book", - "children": {}, - "hierarchy": { - "level1": { - "name": "Module", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": {} - }, - "level2": { - "name": "Sub-Module", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [ - "Explanation Content", - "Learning Resource", - "eTextbook", - "Teacher Resource", - "Course Assessment" - ] - } - }, - "level3": { - "name": "Sub-Sub-Module", - "type": "Unit", - "mimeType": "application/vnd.ekstep.content-collection", - "contentType": "CourseUnit", - "primaryCategory": "Course Unit", - "iconClass": "fa fa-folder-o", - "children": { - "Content": [ - "Explanation Content", - "Learning Resource", - "eTextbook", - "Teacher Resource", - "Course Assessment" - ] - } - } - }, - "contentPolicyUrl": "/term-of-use.html" - } -} - -export const TargetNodeMockData = { - data: { - id: "do_1134460323604971521236", - primaryCategory: "Date", - objectType: "Question", - metadata: { - parent: "do_1134347209749299201119", - code: "6ce6f7de-c4e6-89a1-1ddc-3889140601cd", - subject: ["Mathematics"], - channel: "01309282781705830427", - language: ["English"], - branchingLogic: { - "do_113449672558780416163": { - "target": [ - "do_113449775832088576181", - "do_113449787008081920183", - "do_113449808985628672185", - "do_11345671149997260811" - ], - "preCondition": {}, - "source": [] - }, - "do_113449775832088576181": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 - ] - ] - } - ] + config: { + "rejectCommentsMaxLength": 500, + "setDefaultCopyRight": true, + "showOriginPreviewUrl": false, + "showSourcingStatus": false, + "showCorrectionComments": false, + "assetConfig": { + "image": { + "size": "1", + "accepted": "png, jpeg" + }, + "video": { + "size": "50", + "accepted": "mp4, webm" } - }, - "do_113449787008081920183": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "ne": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 1 + }, + "mode": "edit", + "maxDepth": 2, + "objectType": "Collection", + "primaryCategory": "Course", + "isRoot": true, + "dialcodeMinLength": 2, + "dialcodeMaxLength": 250, + "iconClass": "fa fa-book", + "children": {}, + "hierarchy": { + "level1": { + "name": "Module", + "type": "Unit", + "mimeType": "application/vnd.ekstep.content-collection", + "contentType": "CourseUnit", + "primaryCategory": "Course Unit", + "iconClass": "fa fa-folder-o", + "children": {} + }, + "level2": { + "name": "Sub-Module", + "type": "Unit", + "mimeType": "application/vnd.ekstep.content-collection", + "contentType": "CourseUnit", + "primaryCategory": "Course Unit", + "iconClass": "fa fa-folder-o", + "children": { + "Content": [ + "Explanation Content", + "Learning Resource", + "eTextbook", + "Teacher Resource", + "Course Assessment" ] - ] } - ] - } - }, - "do_113449808985628672185": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 - ] - ] - } - ] - } - }, - "do_11345671149997260811": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 + }, + "level3": { + "name": "Sub-Sub-Module", + "type": "Unit", + "mimeType": "application/vnd.ekstep.content-collection", + "contentType": "CourseUnit", + "primaryCategory": "Course Unit", + "iconClass": "fa fa-folder-o", + "children": { + "Content": [ + "Explanation Content", + "Learning Resource", + "eTextbook", + "Teacher Resource", + "Course Assessment" ] - ] } - ] } - } - }, - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - createdOn: "2021-12-21T10:31:41.865+0000", - objectType: "Question", - gradeLevel: ["Class 4"], - primaryCategory: "Date", - contentDisposition: "inline", - lastUpdatedOn: "2021-12-21T10:35:09.785+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134355574936780801170", - lastStatusChangedOn: "2021-12-21T10:31:41.865+0000", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 4, - languageCode: ["en"], - version: 1, - versionKey: "1640082909792", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["date"], - framework: "ekstep_ncert_k-12", - depth: 2, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "Dep Date 3", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - }, - root: false, - }, - folder: false, - parent: { - data: { - id: "do_1134347209749299201119", - primaryCategory: "Observation", - objectType: "QuestionSet", - metadata: { - parent: "do_1133610108714352641210", - code: "2c902f1b-6338-ba1e-d64f-3117f6d88493", - allowScoring: "No", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - branchingLogic: { - do_1134355569264885761166: { - target: ["do_1134355571590184961168", "do_1134355574936780801170"], - preCondition: {}, - source: [], - }, - do_1134355571590184961168: { - target: [], - source: ["do_1134355569264885761166"], - preCondition: { - and: [ - { - ne: [ - { - var: "do_1134355569264885761166.response1.value", - type: "responseDeclaration", - }, - [0], - ], - }, - ], - }, - }, - do_1134355574936780801170: { - target: [], - source: ["do_1134355569264885761166"], - preCondition: { - and: [ - { - eq: [ - { - var: "do_1134355569264885761166.response1.value", - type: "responseDeclaration", - }, - [1], - ], - }, - ], - }, - }, - }, - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2021-12-20T06:09:47.760+0000", - objectType: "QuestionSet", - allowMultipleInstances: "No", - primaryCategory: "Observation", - contentDisposition: "inline", - lastUpdatedOn: "2021-12-21T11:36:53.490+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134347209749299201119", - lastStatusChangedOn: "2021-12-20T06:09:47.760+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1639980587760", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Mid-day Meals", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - instances: null, - }, - }, - }, - root: false, - getLevel: () => 3, -}; - -export const CurrentNodeMockData = { - hitMode: "after", - otherNode: { - data: { - id: "do_113449672558780416163", - primaryCategory: "Multiselect Multiple Choice Question", - objectType: "Question", - metadata: { - parent: "do_1134355577791283201172", - code: "77e21fd6-9d5c-f351-d9da-7fc922bc1739", - subject: ["Mathematics"], - showRemarks: "No", - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - templateId: "mcq-vertical", - createdOn: "2021-12-20T06:14:56.100+0000", - objectType: "Question", - gradeLevel: ["Class 4"], - primaryCategory: "Multiselect Multiple Choice Question", - contentDisposition: "inline", - lastUpdatedOn: "2021-12-21T10:28:47.124+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134347235008512001125", - lastStatusChangedOn: "2021-12-20T06:14:56.100+0000", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 1, - qType: "MCQ", - languageCode: ["en"], - version: 1, - versionKey: "1640082527132", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["choice"], - framework: "ekstep_ncert_k-12", - depth: 2, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "MCQ Question 2", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - showEvidence: "No", - }, - }, - parent: { - data: { - id: "do_1134355577791283201172", - primaryCategory: "Observation", - objectType: "QuestionSet", - metadata: { - parent: "do_1133610108714352641210", - code: "4505fec1-8a2c-8e85-f340-7245734aaa35", - allowScoring: "No", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - branchingLogic: {}, - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2021-12-21T10:32:16.710+0000", - objectType: "QuestionSet", - allowMultipleInstances: "No", - primaryCategory: "Observation", - contentDisposition: "inline", - lastUpdatedOn: "2021-12-21T10:58:24.169+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134355577791283201172", - lastStatusChangedOn: "2021-12-21T10:32:16.710+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1640082736710", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "School Transport", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - instances: null, - }, - root: false, - }, - }, - }, - root: false, -}; - -export const mockTreeService = { - getChildren: () => { - return ["do_11330103476396851218", "do_233"]; - }, - getFirstChild: () => { - return { - data: { - metadata: {} - } - } - }, - getActiveNode: () => { - return { - data: { - id: "do_11330103476396851218", - }, - getParent: () => { - return { - getChildren: () => { - return [ - { - data: { - id: "do_11330103476396851218", - }, - }, - ]; - }, - }; }, - }; - }, - getNodeById: () => { - return { - moveTo: null - } - }, - clearTreeCache: () => { - }, - updateNode: () => { - - }, - updateTreeNodeMetadata: () => { - return {} - } -}; - - -export const observationWithRubricsMockData = -{ - data: { - children: - [ - { - "parent": "do_1134357224765685761203", - "code": "a51c0d9f-4696-3354-062f-b2078048656c", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.118+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "children": [ - { - "parent": "do_1134460323603906561218", - "code": "b4c3e613-5c3f-9c8b-d61f-417f4c5d8df2", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "branchingLogic": { - "do_113449775832088576181": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 - ] - ] - } - ] - } - }, - "do_113449787008081920183": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "ne": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 1 - ] - ] - } - ] - } - }, - "do_11345671149997260811": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 - ] - ] - } - ] - } - }, - "do_113449808985628672185": { - "target": [], - "source": [ - "do_113449672558780416163" - ], - "preCondition": { - "and": [ - { - "eq": [ - { - "var": "do_113449672558780416163.response1.value", - "type": "responseDeclaration" - }, - [ - 0 - ] - ] - } - ] - } - }, - "do_113449672558780416163": { - "target": [ - "do_113449775832088576181", - "do_113449787008081920183", - "do_113449808985628672185", - "do_11345671149997260811" - ], - "preCondition": {}, - "source": [] - } - }, - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.106+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "children": [ - { - "parent": "do_1134460323602841601200", - "code": "d0ab14ae-9f67-41cf-dcfa-80c8432bf424", - "evidence": { - "required": "No", - "mimeType": [ - "audio" - ], - "minCount": 1, - "maxCount": 1, - "sizeLimit": "20480" - }, - "subject": [ - "English" - ], - "showRemarks": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "medium": [ - "English" - ], - "mimeType": "application/vnd.sunbird.question", - "templateId": "mcq-vertical", - "createdOn": "2022-01-10T09:08:52.273+0000", - "objectType": "Question", - "gradeLevel": [ - "Grade 1" - ], - "primaryCategory": "Multiselect Multiple Choice Question", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-20T07:49:01.518+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_113449672558780416163", - "lastStatusChangedOn": "2022-01-10T09:08:52.273+0000", - "visibility": "Parent", - "showTimer": "No", - "author": "check1@yopmail.com", - "index": 1, - "qType": "MCQ", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1642664941814", - "showFeedback": "No", - "license": "CC BY 4.0", - "interactionTypes": [ - "choice" - ], - "framework": "tpd", - "depth": 3, - "createdBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "compatibilityLevel": 4, - "name": "Parent Question MCQ", - "topic": [ - "Forest" - ], - "board": "CBSE", - "status": "Draft", - "showEvidence": "Yes" - }, - { - "parent": "do_1134460323602841601200", - "code": "c03eddbf-8194-ce67-3f49-08c4b5b33e55", - "subject": [ - "English" - ], - "showRemarks": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "medium": [ - "English" - ], - "mimeType": "application/vnd.sunbird.question", - "createdOn": "2022-01-20T07:49:38.034+0000", - "objectType": "Question", - "gradeLevel": [ - "Grade 1" - ], - "primaryCategory": "Text", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-20T07:49:38.023+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_11345671149997260811", - "lastStatusChangedOn": "2022-01-20T07:49:38.034+0000", - "creator": "Vaibahv Bhuva", - "visibility": "Parent", - "showTimer": "No", - "author": "check1@yopmail.com", - "index": 2, - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1642664978234", - "showFeedback": "No", - "license": "CC BY 4.0", - "interactionTypes": [ - "text" - ], - "framework": "tpd", - "depth": 3, - "createdBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "compatibilityLevel": 4, - "name": "child Text Question", - "topic": [ - "Forest" - ], - "board": "CBSE", - "status": "Draft", - "showEvidence": "No" - }, - { - "parent": "do_1134460323602841601200", - "code": "10cf6d1b-ba3d-2925-1d13-032aa3d2d317", - "subject": [ - "English" - ], - "channel": "01309282781705830427", - "language": [ - "English" - ], - "medium": [ - "English" - ], - "mimeType": "application/vnd.sunbird.question", - "createdOn": "2022-01-10T13:46:25.941+0000", - "objectType": "Question", - "gradeLevel": [ - "Grade 1" - ], - "primaryCategory": "Date", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-10T13:46:25.941+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_113449808985628672185", - "lastStatusChangedOn": "2022-01-10T13:46:25.941+0000", - "creator": "Vaibahv Bhuva", - "visibility": "Parent", - "showTimer": "No", - "author": "check1@yopmail.com", - "index": 3, - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641822385942", - "showFeedback": "No", - "license": "CC BY 4.0", - "interactionTypes": [ - "date" - ], - "framework": "tpd", - "depth": 3, - "createdBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "compatibilityLevel": 4, - "name": "Child Date 1", - "topic": [ - "Forest" - ], - "board": "CBSE", - "status": "Draft" - }, - { - "parent": "do_1134460323602841601200", - "code": "5403efd9-064e-89af-8f44-a9b10c80291c", - "subject": [ - "English" - ], - "showRemarks": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "medium": [ - "English" - ], - "mimeType": "application/vnd.sunbird.question", - "createdOn": "2022-01-10T12:38:58.878+0000", - "objectType": "Question", - "gradeLevel": [ - "Grade 1" - ], - "primaryCategory": "Slider", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-10T12:38:58.878+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_113449775832088576181", - "lastStatusChangedOn": "2022-01-10T12:38:58.878+0000", - "creator": "Vaibahv Bhuva", - "visibility": "Parent", - "showTimer": "No", - "author": "check1@yopmail.com", - "index": 4, - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641818338879", - "showFeedback": "No", - "license": "CC BY 4.0", - "interactionTypes": [ - "slider" - ], - "framework": "tpd", - "depth": 3, - "createdBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "compatibilityLevel": 4, - "name": "test slider 2", - "topic": [ - "Forest" - ], - "board": "CBSE", - "status": "Draft", - "showEvidence": "No" - }, - { - "parent": "do_1134460323602841601200", - "code": "4395c049-8ba7-c611-6334-8bee3f02fa27", - "subject": [ - "English" - ], - "showRemarks": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "medium": [ - "English" - ], - "mimeType": "application/vnd.sunbird.question", - "createdOn": "2022-01-10T13:01:43.135+0000", - "objectType": "Question", - "gradeLevel": [ - "Grade 1" - ], - "primaryCategory": "Slider", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-10T13:01:43.135+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_113449787008081920183", - "lastStatusChangedOn": "2022-01-10T13:01:43.135+0000", - "creator": "Vaibahv Bhuva", - "visibility": "Parent", - "showTimer": "No", - "author": "check1@yopmail.com", - "index": 5, - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641819703136", - "showFeedback": "No", - "license": "CC BY 4.0", - "interactionTypes": [ - "slider" - ], - "framework": "tpd", - "depth": 3, - "createdBy": "5a587cc1-e018-4859-a0a8-e842650b9d64", - "compatibilityLevel": 4, - "name": "test slider 4", - "topic": [ - "Forest" - ], - "board": "CBSE", - "status": "Draft", - "showEvidence": "No" - } - ], - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-20T07:49:38.234+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323602841601200", - "lastStatusChangedOn": "2022-01-05T05:42:52.106+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 1, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372106", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Chemistry", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323603906561218", - "code": "bfdac63e-4cd1-c9fe-00a0-be98f73e13d8", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "branchingLogic": {}, - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.131+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-10T13:09:04.092+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323604971521236", - "lastStatusChangedOn": "2022-01-05T05:42:52.131+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 2, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372131", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Biology", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323603906561218", - "code": "9916f5fc-4f37-3f8e-5151-b32ce65217da", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.114+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.114+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323603578881212", - "lastStatusChangedOn": "2022-01-05T05:42:52.114+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 3, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372114", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "General Science", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - } - ], - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-12T08:37:51.019+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323603906561218", - "lastStatusChangedOn": "2022-01-05T05:42:52.118+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 1, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372118", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 1, - "compatibilityLevel": 5, - "name": "Science", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134357224765685761203", - "code": "36b6e0bd-ef9e-9fd1-5092-257c8e6af0a9", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.190+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "children": [ - { - "parent": "do_1134460323609804801240", - "code": "fd63a953-d9c1-cb14-df75-5918afb4b4b0", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.110+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-12T08:37:51.018+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323603251201206", - "lastStatusChangedOn": "2022-01-05T05:42:52.110+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 1, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372110", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "History", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323609804801240", - "code": "de1454cf-bfa9-faa5-8a71-cf7954e9f95b", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.100+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.100+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323602432001194", - "lastStatusChangedOn": "2022-01-05T05:42:52.100+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 2, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372100", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Political Science", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323609804801240", - "code": "916893b4-816f-9613-1456-bea7da40c4ef", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.195+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.195+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323610214401248", - "lastStatusChangedOn": "2022-01-05T05:42:52.195+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 3, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372195", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Geography", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323609804801240", - "code": "0c34d378-77e9-db88-589a-7695edcf1d70", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.094+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.094+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323601940481186", - "lastStatusChangedOn": "2022-01-05T05:42:52.094+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 4, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372094", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Sociology", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323609804801240", - "code": "cca8fe66-b7e9-c3cb-a226-b5f96e10dfe9", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.126+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.126+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323604561921228", - "lastStatusChangedOn": "2022-01-05T05:42:52.126+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 5, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372126", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Social Studies", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - }, - { - "parent": "do_1134460323609804801240", - "code": "cedcdd78-2950-e8d7-fa17-f57e67a349b9", - "allowScoring": "Yes", - "allowSkip": "Yes", - "containsUserData": "No", - "channel": "01309282781705830427", - "language": [ - "English" - ], - "mimeType": "application/vnd.sunbird.questionset", - "showHints": "No", - "createdOn": "2022-01-05T05:42:52.128+0000", - "objectType": "QuestionSet", - "primaryCategory": "Observation With Rubrics", - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-05T05:42:52.128+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323604725761232", - "lastStatusChangedOn": "2022-01-05T05:42:52.128+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 6, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372128", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 2, - "compatibilityLevel": 5, - "name": "Environmental Studies", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - } - ], - "contentDisposition": "inline", - "lastUpdatedOn": "2022-01-12T08:37:51.019+0000", - "contentEncoding": "gzip", - "showSolutions": "No", - "allowAnonymousAccess": "Yes", - "identifier": "do_1134460323609804801240", - "lastStatusChangedOn": "2022-01-05T05:42:52.190+0000", - "requiresSubmit": "No", - "visibility": "Parent", - "showTimer": "No", - "index": 2, - "setType": "materialised", - "languageCode": [ - "en" - ], - "version": 1, - "versionKey": "1641361372190", - "showFeedback": "No", - "license": "CC BY 4.0", - "depth": 1, - "compatibilityLevel": 5, - "name": "Social Science", - "navigationMode": "non-linear", - "allowBranching": "Yes", - "shuffle": true, - "attributions": [], - "status": "Draft" - } - ] + "contentPolicyUrl": "/term-of-use.html" } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.ts b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.ts index 47ea119b1..e1a832905 100755 --- a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.spec.ts @@ -2,34 +2,28 @@ import { EditorService } from './../../services/editor/editor.service'; import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing'; import { FancyTreeComponent } from './fancy-tree.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { NO_ERRORS_SCHEMA, ChangeDetectorRef } from '@angular/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TelemetryInteractDirective } from '../../directives/telemetry-interact/telemetry-interact.directive'; import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; -import { config, treeData, tree, editorConfig, TargetNodeMockData, - CurrentNodeMockData, mockTreeService, mockData, observationWithRubricsMockData } from './fancy-tree.component.spec.data'; +import { config, treeData, tree, editorConfig } from './fancy-tree.component.spec.data'; import { Router } from '@angular/router'; import { TreeService } from '../../services/tree/tree.service'; import { ToasterService } from '../../services/toaster/toaster.service'; import { ConfigService } from '../../services/config/config.service'; import { SuiModule } from 'ng2-semantic-ui-v9'; -import { HelperService } from 'collection-editor-library/lib/services/helper/helper.service'; -import { BranchingLogic } from '../question/question.component.spec.data'; describe('FancyTreeComponent', () => { let component: FancyTreeComponent; let fixture: ComponentFixture; - let editorService,helperService; + class RouterStub { navigate = jasmine.createSpy('navigate'); } beforeEach(async(() => { TestBed.configureTestingModule({ - providers: [EditorTelemetryService, EditorService, + providers: [EditorTelemetryService, TreeService, EditorService, { provide: Router, useClass: RouterStub }, ToasterService, - { provide: ConfigService, useValue: config }, - { provide: TreeService, useValue: mockTreeService }, - { provide: ChangeDetectorRef, useValue: { detectChanges: () => {} } } - ], + { provide: ConfigService, useValue: config }], imports: [HttpClientTestingModule, SuiModule], declarations: [ FancyTreeComponent, TelemetryInteractDirective ], schemas: [NO_ERRORS_SCHEMA] @@ -39,7 +33,6 @@ describe('FancyTreeComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(FancyTreeComponent); - editorService = TestBed.get(EditorService); component = fixture.componentInstance; // fixture.detectChanges(); }); @@ -48,28 +41,17 @@ describe('FancyTreeComponent', () => { expect(component).toBeTruthy(); }); - it('#ngOnInit() should call #initialize()', () => { + it('#ngOnInit() should call #buildTree()', () => { const editorService = TestBed.get(EditorService); component.nodes = { data: treeData }; spyOnProperty(editorService, 'editorConfig', 'get').and.returnValue(editorConfig); - spyOn(component, 'initialize'); - component.ngOnInit(); - expect(component.initialize).toHaveBeenCalled(); - }); - - it('#initialize() should call #buildTree()', () => { - component.nodes = { - data: treeData - }; spyOn(component, 'buildTree'); - component.initialize(); + component.ngOnInit(); expect(component.buildTree).toHaveBeenCalled(); }); - - it('#addFromLibrary() should call #emitshowLibraryPageEvent()', () => { const editorService: EditorService = TestBed.get(EditorService); spyOn(editorService, 'emitshowLibraryPageEvent').and.returnValue('showLibraryPage'); @@ -85,68 +67,6 @@ describe('FancyTreeComponent', () => { expect(component.renderTree).toHaveBeenCalled(); }); - it('call #eachNodeActionButton() to verify #visibility for root node', () => { - spyOn(component,'eachNodeActionButton').and.callThrough(); - component.config = mockData.config; - const rootNode = { - getLevel: () => 1, - folder: true, - data: { root: true }, - }; - component.eachNodeActionButton(rootNode); - expect(component.visibility.addFromLibrary).toBeFalsy(); - expect(component.visibility.createNew).toBeFalsy(); - expect(component.visibility.addChild).toBeTruthy(); - expect(component.visibility.addSibling).toBeFalsy(); - expect(component.eachNodeActionButton).toHaveBeenCalled(); - }); - - it('call #eachNodeActionButton() to verify #visibility for child node', () => { - component.config = mockData.config; - const node = { - getLevel: () => 2, - folder: true, - data: { root: false }, - }; - component.eachNodeActionButton(node); - expect(component.visibility.addChild).toBeTruthy(); - expect(component.visibility.addSibling).toBeTruthy(); - expect(component.visibility.addFromLibrary).toBeFalsy(); - expect(component.visibility.createNew).toBeFalsy(); - }); - - it('call #eachNodeActionButton() to verify #visibility for leaf node', () => { - component.config = mockData.config; - const node = { - getLevel: () => 3, - folder: true, - data: { root: false }, - }; - component.eachNodeActionButton(node); - expect(component.visibility.addChild).toBeFalsy(); - expect(component.visibility.addSibling).toBeTruthy(); - expect(component.visibility.addFromLibrary).toBeFalsy(); - expect(component.visibility.createNew).toBeFalsy(); - }); - - it('call #eachNodeActionButton() to verify #visibility when #bulkUploadProcessingStatus is true', () => { - component.config = mockData.config; - component.bulkUploadProcessingStatus = true; - const node = { - getLevel: () => 2, - folder: true, - data: { root: false }, - }; - component.eachNodeActionButton(node); - expect(component.visibility).toEqual({ - addChild: false, - addSibling: false, - addFromLibrary: false, - addQuestionFromLibrary: false, - createNew: false - }); - }); - it('#addFromLibrary() should call #emitshowLibraryPageEvent()', () => { const editorService: EditorService = TestBed.get(EditorService); spyOn(editorService, 'emitshowLibraryPageEvent'); @@ -297,9 +217,6 @@ describe('FancyTreeComponent', () => { spyOn(component, 'dropNode').and.callFake(() => { return true; }); - spyOn(editorService,'getDependentNodes').and.callFake(()=>{ - return {}; - }) const node = {}; component.dragDrop(node, data); expect(component.dropNode).toHaveBeenCalled(); @@ -365,71 +282,10 @@ describe('FancyTreeComponent', () => { it ('#dropNode() should drop node', () => { component.config = editorConfig.config; - spyOn(component, 'dropNode').and.callFake(() => { - return true; - }); const targetNode = { folder: false, getLevel: () => 2 }; - const contentNode: any = { hitMode: 'after', otherNode: { data:{id:"do_11330103476396851218"},getLevel: () => 1, moveTo: () => true }, node: { data: { root: false } }}; - component.dropNode(targetNode, contentNode); - const result = component.dragDrop(targetNode, contentNode); - - spyOn(editorService, 'getDependentNodes').and.returnValue({ - "source": [], - "target": [ - "do_1134347722012835841130", - "do_1134355563320688641163" - ] - }); + const contentNode: any = { hitMode: 'before', otherNode: { getLevel: () => 1, moveTo: () => true }, node: { data: { root: false } }}; + const result = component.dropNode(targetNode, contentNode); expect(result).toBeTruthy(); }); - it("#rearrangeBranchingLogic on the node drag and drop on tree structure",()=>{ - const currentSectionId='do_1134355577791283201172'; - const nodeId ='do_1134347235008512001125'; - const targetSectionId='do_1134347209749299201119'; - const dependentNodeIDs ={ - "source": [], - "target": [ - "do_1134347722012835841130", - "do_1134355563320688641163" - ] - }; - const movingNodeIds= ['do_1134347722012835841130', 'do_1134355563320688641163', 'do_1134347235008512001125']; - spyOn(component,"rearrangeBranchingLogic").and.callThrough(); - component.rearrangeBranchingLogic(nodeId, currentSectionId, targetSectionId, dependentNodeIDs, movingNodeIds); - expect(component.rearrangeBranchingLogic).toHaveBeenCalled(); - - }) - - it("#moveDependentNodes on the node drag and drop on tree structure",()=>{ - spyOn(component,'moveDependentNodes').and.callThrough(); - component.moveDependentNodes(TargetNodeMockData,CurrentNodeMockData); - expect(component.moveDependentNodes).toHaveBeenCalled(); - }); - - it('#rearrangeBranchingLogic() should call when drag and drop with branchingLogic is there ', () => { - const nodeId = "do_113449672558780416163"; - const currentSectionId = "do_1134460323602841601200"; - const targetSectionId = "do_1134460323604971521236"; - const movingNodeIds=[ - "do_113449672558780416163", - "do_113449775832088576181", - "do_113449787008081920183", - "do_113449808985628672185", - "do_11345671149997260811" - ]; - const dependentNodeIDs = { - source: [], - target: [ - "do_113449775832088576181", - "do_113449787008081920183", - "do_113449808985628672185", - "do_11345671149997260811" - ] - } - spyOn(component,'rearrangeBranchingLogic').and.callThrough(); - component.rearrangeBranchingLogic(nodeId,currentSectionId,targetSectionId,dependentNodeIDs,movingNodeIds); - expect(component.rearrangeBranchingLogic).toHaveBeenCalled(); - }); - -}); \ No newline at end of file +}); diff --git a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.ts b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.ts index 8043495f8..ceee8f66d 100755 --- a/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.ts +++ b/projects/collection-editor-library/src/lib/components/fancy-tree/fancy-tree.component.ts @@ -36,11 +36,6 @@ export class FancyTreeComponent implements OnInit, AfterViewInit, OnDestroy { public showAddSiblingButton: boolean; public rootNode: any; public showLibraryButton = false; - public unsubscribe$ = new Subject(); - public bulkUploadProcessingStatus = false; - public nodeParentDependentMap = {}; - public treeData: any = []; - public branchingObject = {}; public rootMenuTemplate = `
@@ -187,6 +144,7 @@ +
@@ -205,6 +163,6 @@ - - + \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/header/header.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/header/header.component.spec.data.ts deleted file mode 100644 index 8b1378917..000000000 --- a/projects/collection-editor-library/src/lib/components/header/header.component.spec.data.ts +++ /dev/null @@ -1 +0,0 @@ - diff --git a/projects/collection-editor-library/src/lib/components/header/header.component.spec.ts b/projects/collection-editor-library/src/lib/components/header/header.component.spec.ts index aafca3d14..102543a93 100755 --- a/projects/collection-editor-library/src/lib/components/header/header.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/header/header.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HeaderComponent } from './header.component'; -import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TelemetryInteractDirective } from '../../directives/telemetry-interact/telemetry-interact.directive'; @@ -97,11 +97,4 @@ describe('HeaderComponent', () => { expect(component.showPublishCollectionPopup).toBeTruthy(); expect(component.actionType).toBeDefined(); }); - it('#bulkUploadListener() should call #bulkUploadEmitter.emit()', () => { - const data = { status: true, type: 'updateHierarchy' }; - component.bulkUploadEmitter = new EventEmitter(); - spyOn(component.bulkUploadEmitter, 'emit'); - component.bulkUploadListener(data); - expect(component.bulkUploadEmitter.emit).toHaveBeenCalledWith(data) - }); }); diff --git a/projects/collection-editor-library/src/lib/components/header/header.component.ts b/projects/collection-editor-library/src/lib/components/header/header.component.ts index ab56c0a55..e4528bb83 100755 --- a/projects/collection-editor-library/src/lib/components/header/header.component.ts +++ b/projects/collection-editor-library/src/lib/components/header/header.component.ts @@ -4,8 +4,6 @@ import { EditorTelemetryService } from '../../services/telemetry/telemetry.servi import { ConfigService } from '../../services/config/config.service'; import * as _ from 'lodash-es'; import { NgForm } from '@angular/forms'; -import { Subject } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'lib-header', @@ -20,7 +18,6 @@ export class HeaderComponent implements OnDestroy, OnInit { @Input() showComment: any; @Input() publishchecklist: any; @Output() toolbarEmitter = new EventEmitter(); - @Output() bulkUploadEmitter = new EventEmitter(); @ViewChild('FormControl') FormControl: NgForm; @ViewChild('modal') public modal; public visibility: any; @@ -29,34 +26,22 @@ export class HeaderComponent implements OnDestroy, OnInit { public showPublishCollectionPopup: boolean; public rejectComment: string; public actionType: string; - public objectType: string; public sourcingStatusText: string; public sourcingStatusClass: string; public originPreviewUrl: string; public correctionComments: string; - public unsubscribe$ = new Subject(); - public bulkUploadStatus = false; constructor(private editorService: EditorService, public telemetryService: EditorTelemetryService, public configService: ConfigService) { } async ngOnInit() { - this.editorService.bulkUploadStatus$.pipe(takeUntil(this.unsubscribe$)).subscribe((status) => { - if (status === 'processing') { - this.bulkUploadStatus = true; - } else { - this.bulkUploadStatus = false; - } - }); - this.objectType = _.get(this.editorService, 'editorConfig.config.objectType'); - await this.handleActionButtons(); - this.getSourcingData(); + await this.handleActionButtons() + this.getSourcingData() } async handleActionButtons() { this.visibility = {}; - this.visibility.editContent = this.editorService.editorMode === 'edit'; this.visibility.saveContent = this.editorService.editorMode === 'edit'; this.visibility.submitContent = this.editorService.editorMode === 'edit'; this.visibility.rejectContent = this.editorService.editorMode === 'review' || this.editorService.editorMode === 'orgreview'; @@ -66,11 +51,9 @@ export class HeaderComponent implements OnDestroy, OnInit { this.visibility.sourcingRejectContent = this.editorService.editorMode === 'sourcingreview'; this.visibility.previewContent = _.get(this.editorService, 'editorConfig.config.objectType') === 'QuestionSet'; this.visibility.dialcode = this.editorService.editorMode === 'edit'; - // tslint:disable-next-line:max-line-length - this.visibility.bulkUpload = _.get(this.editorService, 'editorConfig.config.objectType') === 'QuestionSet' && this.editorService.editorMode === 'edit'; this.visibility.showOriginPreviewUrl = _.get(this.editorService, 'editorConfig.config.showOriginPreviewUrl'); this.visibility.showSourcingStatus = _.get(this.editorService, 'editorConfig.config.showSourcingStatus'); - this.visibility.showCorrectionComments = _.get(this.editorService, 'editorConfig.config.showCorrectionComments'); + //this.visibility.showCorrectionComments = _.get(this.editorService, 'editorConfig.config.showCorrectionComments'); this.visibility.hideSubmitForReviewBtn = _.get(this.editorService, 'editorConfig.config.hideSubmitForReviewBtn') || false; this.visibility.addCollaborator = _.get(this.editorService, 'editorConfig.config.showAddCollaborator'); } @@ -96,20 +79,13 @@ export class HeaderComponent implements OnDestroy, OnInit { } publishEmitter(event) { this.showPublishCollectionPopup = false; - if (event.button === 'publishContent' || event.button === 'publishQuestion' || event.button === 'sourcingApprove' || event.button === 'sourcingApproveQuestion') { + if (event.button === 'publishContent' || event.button === 'sourcingApprove') { this.toolbarEmitter.emit(event) } } - - bulkUploadListener(event) { - this.bulkUploadEmitter.emit(event); - } - ngOnDestroy() { if (this.modal && this.modal.deny) { this.modal.deny(); } - this.unsubscribe$.next(); - this.unsubscribe$.complete(); } } diff --git a/projects/collection-editor-library/src/lib/components/library-list/library-list.component.html b/projects/collection-editor-library/src/lib/components/library-list/library-list.component.html index b9c236327..bc814662b 100644 --- a/projects/collection-editor-library/src/lib/components/library-list/library-list.component.html +++ b/projects/collection-editor-library/src/lib/components/library-list/library-list.component.html @@ -22,7 +22,7 @@
@@ -38,7 +38,7 @@

{{contentListDetails?.name}}
-
By {{contentListDetails?.board}} +
By {{contentListDetails?.board}} {{contentListDetails?.me_averageRating}}
diff --git a/projects/collection-editor-library/src/lib/components/library-player/library-player.component.ts b/projects/collection-editor-library/src/lib/components/library-player/library-player.component.ts index 0e56f3ddb..23962a19b 100644 --- a/projects/collection-editor-library/src/lib/components/library-player/library-player.component.ts +++ b/projects/collection-editor-library/src/lib/components/library-player/library-player.component.ts @@ -16,7 +16,7 @@ export class LibraryPlayerComponent implements OnInit { ngOnInit() { } addToLibrary() { - if (this.editorService.checkIfContentsCanbeAdded('add')) { + if (this.editorService.checkIfContentsCanbeAdded()) { this.moveEvent.emit({ action: 'openHierarchyPopup' }); diff --git a/projects/collection-editor-library/src/lib/components/library/library.component.ts b/projects/collection-editor-library/src/lib/components/library/library.component.ts index e27ba3969..a5d8289cc 100644 --- a/projects/collection-editor-library/src/lib/components/library/library.component.ts +++ b/projects/collection-editor-library/src/lib/components/library/library.component.ts @@ -9,7 +9,7 @@ import { Router } from '@angular/router'; import { HelperService } from '../../services/helper/helper.service'; @Component({ - selector: 'lib-content-library', + selector: 'lib-library', templateUrl: './library.component.html', styleUrls: ['./library.component.scss'], encapsulation: ViewEncapsulation.None, @@ -128,8 +128,7 @@ export class LibraryComponent implements OnInit, AfterViewInit, OnDestroy { if (!(_.get(response, 'result.count'))) { this.contentList = []; } else { - this.contentList = _.filter(_.compact(_.concat(_.get(response.result, 'content'), _.get(response.result, 'QuestionSet'))), - (item: any) => item.identifier !== this.collectionId); + this.contentList = _.compact(_.concat(_.get(response.result, 'content'), _.get(response.result, 'QuestionSet'))); this.filterContentList(); } }); diff --git a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.scss b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.scss index c7c5a0ae4..7b70a689a 100644 --- a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.scss +++ b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.scss @@ -43,6 +43,7 @@ } } .multi-select-section-app { + margin: 0.7rem 0 !important; label { margin-bottom: 0.3rem !important; z-index: inherit; @@ -140,12 +141,10 @@ label { padding: 0 !important; } } -/* .sb-checkbox { padding: 1.5rem 0; margin-top: 2rem; } -*/ sb-icon-dropdown { top: 10px !important; right: 6px !important; @@ -168,17 +167,6 @@ sb-icon-dropdown { } } } - sb-dynamic-checkbox{ - label{ - padding-left: 1.5rem !important; - &:after - { - color:#fff !important; - width:1rem!important; - height:1rem !important; - } - } - } } .sb-textbox[disabled="true"]{ opacity: 0.3 !important; @@ -209,22 +197,3 @@ lib-meta-form{ .fs-28 { font-size: 1.75rem; } .fs-30 { font-size: 1.875rem; } .fs-36 { font-size: 2.25rem; } - -[data-title]:hover::before { - content: attr(data-title); - position: absolute; - left: 0; - top: 20px !important; - bottom: initial !important; - display: inline-block; - padding: 3px 6px; - border-radius: 2px; - background: #fff; - color: #000; - font-size: 12px; - font-family: sans-serif; - white-space: normal !important; - border: solid 1px #ccc !important; - height: auto !important; - font-weight: 600 !important; -} diff --git a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.data.ts index 8b119ac93..7a03e5d76 100644 --- a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.data.ts +++ b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.data.ts @@ -16,54 +16,6 @@ export const mockData = { "required": true, "visible": true }, - { - "code": "allowMultipleInstances", - "dataType": "text", - "description": "Enable multiple instances/submissions of questions in this section?", - "editable": true, - "index": 5, - "inputType": "radio", - "label": "Enable multiple instances/submissions of questions in this section?", - "name": "allowMultipleInstances", - "placeholder": "QR code required", - "renderingHints": { - "class": "sb-g-col-lg-2" - }, - "range": [ - "Yes", - "No" - ], - "required": true, - "visible": true - }, - { - "code": "instances", - "depends": [ - "allowMultipleInstances" - ], - "dataType": "text", - "description": "This label will show up on a button to record multiple solutions of questions in this section", - "editable": true, - "inputType": "text", - "label": "Add label", - "name": "instanceName", - "placeholder": "Enter label here", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": true, - "visible": true, - "validations": [ - { - "type": "minLength", - "value": "2" - }, - { - "type": "maxLength", - "value": "20" - } - ] - }, { "code": "name", "dataType": "text", @@ -127,212 +79,6 @@ export const mockData = { "placeholder": "Enter Keywords", "required": false, "validations": [] - }, - { - "code": "audience", - "dataType": "list", - "description": "Suggested User Type", - "editable": true, - "inputType": "nestedselect", - "label": "Suggested User Type", - "name": "userTypes", - "placeholder": "Suggested User Type", - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "required": false, - "visible": true, - "range": [ - "Education Official", - "School leaders (HMs)", - "Teachers", - "Students", - "Parents", - "Parent", - "Others" - ] - }, - { - "code": "description", - "name": "Description", - "label": "Description", - "placeholder": "Enter Description", - "description": "Description of the Question Set", - "dataType": "text", - "inputType": "textarea", - "editable": true, - "required": false, - "visible": true, - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "startDate", - "name": "startDate", - "label": "Start Date", - "placeholder": "Start Date", - "description": "Choose Start Date", - "dataType": "date", - "inputType": "date", - "editable": true, - "required": false, - "visible": true, - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "validations": [ - { - "type": "dateFormat", - "value": "YYYY-MM-DD[T]HH:mm:ss.SSS[Z]", - "message": "Date format not matched" - } - ] - }, - { - 'code': 'author', - 'dataType': 'text', - 'description': 'Author of the content', - 'editable': true, - 'inputType': 'text', - 'label': 'Author', - 'name': 'Author', - 'placeholder': 'Author', - 'renderingHints': { - 'class': 'sb-g-col-lg-1' - }, - 'required': false, - 'visible': true - }, - { - 'code': 'license', - 'dataType': 'text', - 'description': 'license', - 'editable': true, - 'inputType': 'select', - 'label': 'License', - 'name': 'license', - 'placeholder': 'Select License', - 'renderingHints': { - 'class': 'sb-g-col-lg-1 required' - }, - 'required': true, - 'visible': true, - 'defaultValue': 'CC BY 4.0', - 'validations': [ - { - 'type': 'required', - 'message': 'License is required' - } - ], - 'default': 'CC BY 4.0', - 'range': [ - '@+kp_ft_license_102876130', - '@+kp_ft_license_132244417', - '@+kp_ft_license_164164056', - ] - }, - { - "code": "setPeriod", - "name": "setPeriod", - "label": "Set Period", - "placeholder": "Set period", - "description": "Set Period", - "dataType": "text", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "endDate", - "name": "endDate", - "depends": [ - "setPeriod" - ], - "label": "End Date", - "placeholder": "End Date", - "description": "Choose End Date", - "dataType": "date", - "inputType": "date", - "editable": true, - "required": false, - "visible": true, - "renderingHints": { - "class": "sb-g-col-lg-1" - }, - "validations": [ - { - "type": "dateFormat", - "value": "YYYY-MM-DD[T]HH:mm:ss.SSS[Z]", - "message": "Date format not matched" - } - ] - }, - { - "code": "entityType", - "dataType": "text", - "description": "Select the entity i.e. district, block, cluster, schools for which the form is designed and is to be taken up. The users will be able to conduct observations for only the selected type of entities.", - "editable": true, - "inputType": "select", - "label": "Entity Type", - "name": "entityType", - "placeholder": "Entity Type", - "renderingHints": { - "class": "sb-g-col-lg-1 required" - }, - "required": true, - "visible": true, - "range": [ - "School", - "Block", - "Cluster", - "District" - ], - "validations": [ - { - "type": "required", - "message": "Name is required" - } - ] - }, - { - "code": "allowScoring", - "name": "allowScoring", - "label": "Enable Scoring", - "placeholder": "Enable Scoring", - "description": "Select to enable the option of scoring for questions in the form. Score can be added to questions only if this is selected", - "dataType": "text", - "inputType": "checkbox", - "editable": true, - "required": false, - "visible": true, - "renderingHints": { - "class": "sb-g-col-lg-1" - } - }, - { - "code": "license", - }, - /* - { - "code": "additionalCategories", - }, - { - "code": "copyright", - }, - { - "code": "maxQuestions", - }, - */ - { - "code": "author", - }, - { - "code": "showTimer", } ] } @@ -487,4 +233,4 @@ export const mockData = { } ] } -}; \ No newline at end of file +}; diff --git a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.ts b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.ts index 0e3b311f5..f92781a30 100644 --- a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.spec.ts @@ -3,8 +3,6 @@ import { MetaFormComponent } from './meta-form.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { mockData } from './meta-form.component.spec.data'; -import { TreeService } from '../../services/tree/tree.service'; -import { mockTreeService } from '../question/question.component.spec.data'; describe('MetaFormComponent', () => { let component: MetaFormComponent; let fixture: ComponentFixture; @@ -13,9 +11,6 @@ describe('MetaFormComponent', () => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], declarations: [MetaFormComponent], - providers:[ - { provide: TreeService, useValue: mockTreeService } - ], schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); @@ -24,31 +19,12 @@ describe('MetaFormComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(MetaFormComponent); component = fixture.componentInstance; - component.appIcon='https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png'; - component.showAppIcon=true; fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); - - it('#valueChanges() should call updateNode and emit toolbarEmitter with appIcon', () => { - spyOn(component,'valueChanges').and.callThrough(); - component.appIcon='https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png'; - component.showAppIcon=true; - const event={ - instances:"Add Student", - appIcon: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png', - } - spyOn(component.toolbarEmitter, 'emit'); - spyOn(component.treeService, 'updateNode'); - component.valueChanges(event); - expect(component.valueChanges).toHaveBeenCalledWith(event); - expect(component.toolbarEmitter.emit).toHaveBeenCalled(); - }); - - it('#ngOnChanges() should call setAppIconData', () => { spyOn(component, 'fetchFrameWorkDetails'); spyOn(component, 'setAppIconData'); @@ -64,41 +40,38 @@ describe('MetaFormComponent', () => { expect(component.toolbarEmitter.emit).toHaveBeenCalledWith(data); }); it('#appIconDataHandler() should call updateAppIcon method', () => { - spyOn(component,'appIconDataHandler').and.callThrough(); // tslint:disable-next-line:max-line-length - const event = { url: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png' }; - component.appIcon = event.url; + const data = { url: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png' }; + component.appIcon = data.url; spyOn(component.treeService, 'updateAppIcon'); - component.appIconDataHandler(event); - expect(component.treeService.updateAppIcon).toHaveBeenCalledWith(event.url); - expect(component.appIconDataHandler).toHaveBeenCalled(); + component.appIconDataHandler(data); + expect(component.treeService.updateAppIcon).toHaveBeenCalledWith(data.url); }); it('#setAppIconData() should set appIcon', () => { - spyOn(component,'setAppIconData').and.callThrough(); - const nodeMetadataMock = { + const data = { data: { // tslint:disable-next-line:max-line-length metadata: { appIcon: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png' } } }; - component.nodeMetadata = nodeMetadataMock; + component.nodeMetadata = data; component.appIconConfig = { - isAppIconEditable: true + isAppIconEditable: '' }; component.setAppIconData(); expect(component.appIcon).toBeDefined(); }); - - - it('call #ifFieldIsEditable() verify returning value', () => { - spyOn(component, 'isReviewMode').and.returnValue(false); - expect(component.ifFieldIsEditable('bloomsLevel', false)).toEqual(false); - }); - it('call #isReviewMode() verify returning value', () => { - expect(component.isReviewMode()).toEqual(false); + it('#valueChanges() should call updateNode and emit toolbarEmitter', () => { + const data = { + // tslint:disable-next-line:max-line-length + appIcon: 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/do_11320764935163904015/artifact/2020101299.png' + }; + spyOn(component.toolbarEmitter, 'emit'); + spyOn(component.treeService, 'updateNode'); + component.valueChanges(data); + expect(component.toolbarEmitter.emit).toHaveBeenCalledWith({ button: 'onFormValueChange', event: data }); + expect(component.treeService.updateNode).toHaveBeenCalledWith(data); }); - - it('#attachDefaultValues() should set formFieldProperties', () => { component.rootFormConfig = mockData.rootFormConfig; component.nodeMetadata = mockData.nodeMetaData; @@ -124,5 +97,4 @@ describe('MetaFormComponent', () => { component.fetchFrameWorkDetails(); expect(component.frameworkDetails).toBeDefined(); }); - }); diff --git a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.ts b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.ts index 40c465c2d..0c1df66a2 100644 --- a/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.ts +++ b/projects/collection-editor-library/src/lib/components/meta-form/meta-form.component.ts @@ -17,7 +17,7 @@ let framworkServiceTemp; styleUrls: ['./meta-form.component.scss'], encapsulation: ViewEncapsulation.None, }) -export class MetaFormComponent implements OnChanges, OnDestroy { +export class MetaFormComponent implements OnInit, OnChanges, OnDestroy { @Input() rootFormConfig: any; @Input() unitFormConfig: any; @Input() nodeMetadata: any; @@ -39,6 +39,8 @@ export class MetaFormComponent implements OnChanges, OnDestroy { this.setAppIconData(); } + ngOnInit() { + } setAppIconData() { const isRootNode = _.get(this.nodeMetadata, 'data.root'); @@ -85,6 +87,11 @@ export class MetaFormComponent implements OnChanges, OnDestroy { filter(data => _.get(data, `frameworkdata.${_.first(this.frameworkService.targetFrameworkIds)}`)) ).subscribe((frameworkDetails: any) => { if (frameworkDetails && !frameworkDetails.err) { + // const frameworkData = frameworkDetails.frameworkdata[this.frameworkService.targetFrameworkIds].categories; + // this.frameworkDetails.frameworkData = frameworkData; + // this.frameworkDetails.topicList = _.get(_.find(frameworkData, { + // code: 'topic' + // }), 'terms'); this.frameworkDetails.targetFrameworks = _.filter(frameworkDetails.frameworkdata, (value, key) => { return _.includes(this.frameworkService.targetFrameworkIds, key); }); @@ -97,12 +104,13 @@ export class MetaFormComponent implements OnChanges, OnDestroy { attachDefaultValues() { const metaDataFields = _.get(this.nodeMetadata, 'data.metadata'); - const isRootNode = _.get(this.nodeMetadata, 'data.root'); + // if (_.isEmpty(metaDataFields)) { return; } + const isRoot = _.get(metaDataFields, 'data.root'); const categoryMasterList = this.frameworkDetails.frameworkData || - !isRootNode && this.frameworkService.selectedOrganisationFramework && + !isRoot && this.frameworkService.selectedOrganisationFramework && _.get(this.frameworkService.selectedOrganisationFramework, 'framework.categories'); // tslint:disable-next-line:max-line-length - let formConfig: any = (_.get(metaDataFields, 'visibility') === 'Default') || isRootNode ? _.cloneDeep(this.rootFormConfig) : _.cloneDeep(this.unitFormConfig); + let formConfig: any = (_.get(metaDataFields, 'visibility') === 'Default') ? _.cloneDeep(this.rootFormConfig) : _.cloneDeep(this.unitFormConfig); formConfig = formConfig && _.has(_.first(formConfig), 'fields') ? formConfig : [{name: '', fields: formConfig}]; if (!_.isEmpty(this.frameworkDetails.targetFrameworks)) { _.forEach(this.frameworkDetails.targetFrameworks, (framework) => { @@ -131,7 +139,14 @@ export class MetaFormComponent implements OnChanges, OnDestroy { moment.utc(moment.duration(value, 'seconds').asMilliseconds()).format(this.helperService.getTimerFormat(field)) : ''; } } - + + // const frameworkCategory = _.find(categoryMasterList, category => { + // return (category.code === field.sourceCategory || category.code === field.code) && !_.includes(field.code, 'target'); + // // }); + // if (!_.isEmpty(frameworkCategory)) { + // field.terms = frameworkCategory.terms; + // } + if (field.code === 'framework') { field.range = this.frameworkService.frameworkValues; field.options = this.getFramework; @@ -190,13 +205,6 @@ export class MetaFormComponent implements OnChanges, OnDestroy { if (field.code === 'instructions') { field.default = _.get(metaDataFields, 'instructions.default') || '' ; } - if(field.code === 'setPeriod'){ - field.default = !_.isEmpty(metaDataFields, 'endDate') ? 'Yes' : 'No' ; - } - - if(field.code === 'instances'){ - field.default = !_.isEmpty(metaDataFields, 'instances') ? _.get(metaDataFields,'instances.label') : '' ; - } if ((_.isEmpty(field.range) || _.isEmpty(field.terms)) && !field.editable && !_.isEmpty(field.default)) { @@ -226,21 +234,21 @@ export class MetaFormComponent implements OnChanges, OnDestroy { }); } - const ifEditable = this.ifFieldIsEditable(field.code, field.editable); + const ifEditable = this.ifFieldIsEditable(field.code); _.set(field, 'editable', ifEditable); }); }); this.formFieldProperties = _.cloneDeep(formConfig); + console.log(this.formFieldProperties); } isReviewMode() { return _.includes([ 'review', 'read', 'sourcingreview', 'orgreview' ], this.editorService.editorMode); } - ifFieldIsEditable(fieldCode, primaryCategoryEditableConfig?) { + ifFieldIsEditable(fieldCode) { const ediorMode = this.editorService.editorMode; if (!this.isReviewMode()) { - if(primaryCategoryEditableConfig === false) return false; return true; } const editableFields = _.get(this.editorService.editorConfig.config, 'editableFields'); @@ -256,11 +264,7 @@ export class MetaFormComponent implements OnChanges, OnDestroy { } valueChanges(event: any) { - if (_.get(event, 'instances')) { - event.instances = { - "label": event.instances - } - } + console.log(event); if (!_.isEmpty(this.appIcon) && this.showAppIcon) { event.appIcon = this.appIcon; } diff --git a/projects/collection-editor-library/src/lib/components/options/options.component.html b/projects/collection-editor-library/src/lib/components/options/options.component.html index 0d5cef888..d792705f9 100644 --- a/projects/collection-editor-library/src/lib/components/options/options.component.html +++ b/projects/collection-editor-library/src/lib/components/options/options.component.html @@ -1,85 +1,48 @@ - -
- - - - - - - -
- -
-
-
- - - - - -
-
- - -
-
- -
- - -
-
-
-
- + + +
+ +
+
+
+ + + + +
-
- - - -
-
-
-
- -
-

-
-
- - -
-
-
-
-
+
+ +
- +
+ +
+
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/options/options.component.scss b/projects/collection-editor-library/src/lib/components/options/options.component.scss index e8556c9b7..ec4de88bd 100644 --- a/projects/collection-editor-library/src/lib/components/options/options.component.scss +++ b/projects/collection-editor-library/src/lib/components/options/options.component.scss @@ -127,11 +127,4 @@ .sb-field-group .sb-left-icon-btn.sb-btn-xs{ padding: 0 !important; margin-top: -10px; -} - -.optionLabel{ - font-size: 12px !important; - margin-bottom: 0.5rem !important; - color: #121213e0; - font-weight: 600; } \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/options/options.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/options/options.component.spec.data.ts index 106c4a8d3..fc69eef7c 100644 --- a/projects/collection-editor-library/src/lib/components/options/options.component.spec.data.ts +++ b/projects/collection-editor-library/src/lib/components/options/options.component.spec.data.ts @@ -95,34 +95,4 @@ export const mockOptionData = { qType: 'MCQ', primaryCategory: 'Multiple Choice Question', }, - subMenus : [ - [{ - id: 'addHint', - name: 'Add Hint', - value: 'test', - enabled: false, - type: 'input', - label: 'label', - show:true - }] - ] }; - -export const sourcingSettingsMock = { - enforceCorrectAnswer: false, - showSolution: false, - showAddHints: true, - showAddScore: false, - showAddTips: true, - showAddTranslation: true, - showAddSecondaryQuestion: false, -}; - - -export const nativeElement = `
`; - - \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/options/options.component.spec.ts b/projects/collection-editor-library/src/lib/components/options/options.component.spec.ts index 436ffd339..4bb618474 100644 --- a/projects/collection-editor-library/src/lib/components/options/options.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/options/options.component.spec.ts @@ -4,44 +4,18 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; import { OptionsComponent } from './options.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { mockOptionData, nativeElement, sourcingSettingsMock } from './options.component.spec.data'; +import { mockOptionData } from './options.component.spec.data'; import { ConfigService } from '../../services/config/config.service'; import { SuiModule } from 'ng2-semantic-ui-v9'; -import { TreeService } from '../../services/tree/tree.service'; -import { treeData } from './../fancy-tree/fancy-tree.component.spec.data'; -import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; -import { EditorService } from "../../services/editor/editor.service"; - -const mockEditorService = { - editorConfig: { - config: { - renderTaxonomy:true, - hierarchy: { - level1: { - name: "Module", - type: "Unit", - mimeType: "application/vnd.ekstep.content-collection", - contentType: "Course Unit", - iconClass: "fa fa-folder-o", - children: {}, - }, - }, - }, - }, - parentIdentifier: "" -}; - describe('OptionsComponent', () => { let component: OptionsComponent; let fixture: ComponentFixture; - let treeService,telemetryService; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ HttpClientTestingModule, FormsModule, SuiModule ], declarations: [ OptionsComponent, TelemetryInteractDirective ], - providers: [ConfigService,TreeService,EditorTelemetryService, - { provide: EditorService, useValue: mockEditorService },], + providers: [ConfigService], schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) .compileComponents(); @@ -49,18 +23,7 @@ describe('OptionsComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(OptionsComponent); - treeService = TestBed.get(TreeService); - telemetryService=TestBed.get(EditorTelemetryService); component = fixture.componentInstance; - component.sourcingSettings=sourcingSettingsMock; - spyOn(treeService, 'setTreeElement').and.callFake((el) => { - treeService.nativeElement = nativeElement; - }); - spyOn(treeService, 'getFirstChild').and.callFake(() => { - return { data: { metadata: treeData } }; - }); - component.editorState = mockOptionData.editorOptionData; - // fixture.detectChanges(); }); @@ -94,7 +57,6 @@ describe('OptionsComponent', () => { spyOn(component.editorDataOutput, 'emit').and.callThrough(); component.editorState = mockOptionData.editorOptionData; component.editorDataHandler(); - component.questionPrimaryCategory='Multiselect Multiple Choice Question'; expect(component.prepareMcqBody).toHaveBeenCalledWith(mockOptionData.editorOptionData); expect(component.editorDataOutput.emit).toHaveBeenCalled(); }); @@ -103,23 +65,19 @@ describe('OptionsComponent', () => { spyOn(component, 'getResponseDeclaration').and.callThrough(); spyOn(component, 'getInteractions').and.callThrough(); const result = component.prepareMcqBody(mockOptionData.editorOptionData); - // expect(mockOptionData.prepareMcqBody).toEqual(result); + expect(mockOptionData.prepareMcqBody).toEqual(result); expect(component.getResponseDeclaration).toHaveBeenCalledWith(mockOptionData.editorOptionData); expect(component.getInteractions).toHaveBeenCalledWith(mockOptionData.editorOptionData.options); }); it('#getResponseDeclaration() should return expected response declaration', () => { - spyOn(component,"getResponseDeclaration").and.callThrough(); - component.getResponseDeclaration(mockOptionData.editorOptionData); - expect(component.getResponseDeclaration).toHaveBeenCalled(); - // expect(mockOptionData.prepareMcqBody.responseDeclaration).toEqual(result); + const result = component.getResponseDeclaration(mockOptionData.editorOptionData); + expect(mockOptionData.prepareMcqBody.responseDeclaration).toEqual(result); }); it('#getInteractions() should return expected response declaration', () => { - spyOn(component,"getInteractions").and.callThrough(); - component.getInteractions(mockOptionData.editorOptionData.options); - expect(component.getInteractions).toHaveBeenCalled(); - // expect(mockOptionData.prepareMcqBody.interactions).toEqual(result); + const result = component.getInteractions(mockOptionData.editorOptionData.options); + expect(mockOptionData.prepareMcqBody.interactions).toEqual(result); }); it('#setTemplete() should set #templateType to "mcq-vertical-split" ', () => { @@ -131,31 +89,4 @@ describe('OptionsComponent', () => { expect(component.editorDataHandler).toHaveBeenCalled(); }); - it('#subMenuChange() should set the sub-menu value ', () => { - component.subMenus = mockOptionData.subMenus; - spyOn(component, 'subMenuChange').and.callThrough(); - component.subMenuChange({index:1,value:'test'},1) - expect(component.subMenus[0][0].value).toBe('test'); - }) - - it('#subMenuConfig() should set on initialize', () => { - spyOn(component,'subMenuConfig').and.callThrough(); - const options = [ - { - "body": "

true

" - } - ]; - component.subMenuConfig(options); - expect(component.subMenuConfig).toHaveBeenCalledWith(options) - }) - - it('#setScore() should call if score is entered', () => { - spyOn(component,'setScore').and.callThrough(); - const value = "20"; - const scoreIndex = 1; - component.setScore(value,scoreIndex); - component.editorDataHandler(); - expect(component.setScore).toHaveBeenCalled(); - }); - }); diff --git a/projects/collection-editor-library/src/lib/components/options/options.component.ts b/projects/collection-editor-library/src/lib/components/options/options.component.ts index 9507a5cbf..4b5d889d5 100644 --- a/projects/collection-editor-library/src/lib/components/options/options.component.ts +++ b/projects/collection-editor-library/src/lib/components/options/options.component.ts @@ -2,9 +2,6 @@ import { Component, OnInit, Input, EventEmitter, Output, ViewEncapsulation } fro import * as _ from 'lodash-es'; import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; import { ConfigService } from '../../services/config/config.service'; -import { SubMenu } from '../question-option-sub-menu/question-option-sub-menu.component'; -import { TreeService } from '../../services/tree/tree.service'; -import { EditorService } from '../../services/editor/editor.service'; @Component({ selector: 'lib-options', templateUrl: './options.component.html', @@ -14,35 +11,17 @@ import { EditorService } from '../../services/editor/editor.service'; export class OptionsComponent implements OnInit { @Input() editorState: any; @Input() showFormError; - @Input() sourcingSettings; - @Input() questionPrimaryCategory; - @Input() mapping = []; - @Input() isReadOnlyMode; @Output() editorDataOutput: EventEmitter = new EventEmitter(); public setCharacterLimit = 160; public setImageLimit = 1; public templateType = 'mcq-vertical'; - subMenus: SubMenu[][]; - hints = []; - showSubMenu:boolean=false; - parentMeta: any; - constructor( - public telemetryService: EditorTelemetryService, - public configService: ConfigService, - public treeService: TreeService, - private editorService: EditorService - ) {} + constructor(public telemetryService: EditorTelemetryService, public configService: ConfigService) { } ngOnInit() { if (!_.isUndefined(this.editorState.templateId)) { this.templateType = this.editorState.templateId; } this.editorDataHandler(); - this.mapping = _.get(this.editorState, 'responseDeclaration.response1.mapping') || []; - if(!_.isUndefined(this.editorService.editorConfig.config.renderTaxonomy)){ - this.parentMeta = this.treeService.getFirstChild().data.metadata; - this.showSubMenu=true; - } } editorDataHandler(event?) { @@ -64,15 +43,15 @@ export class OptionsComponent implements OnInit { }); metadata = { templateId: this.templateType, - name: this.questionPrimaryCategory || 'Multiple Choice Question', + name: 'Multiple Choice Question', responseDeclaration: this.getResponseDeclaration(editorState), interactionTypes: ['choice'], interactions: this.getInteractions(editorState.options), editorState: { - options, + options }, qType: 'MCQ', - primaryCategory: this.questionPrimaryCategory || 'Multiple Choice Question', + primaryCategory: 'Multiple Choice Question' }; return metadata; } @@ -85,10 +64,9 @@ export class OptionsComponent implements OnInit { type: 'integer', correctResponse: { value: editorState.answer, - outcomes: { SCORE: 1 }, - }, - mapping: this.mapping, - }, + outcomes: { SCORE: 1 } + } + } }; return responseDeclaration; } @@ -97,15 +75,13 @@ export class OptionsComponent implements OnInit { let index; const interactOptions = _.map(options, (opt, key) => { index = Number(key); - const hints = _.get(this.editorState, `interactions.response1.options[${index}].hints`) - return { label: opt.body, value: index, hints }; + return { label: opt.body, value: index }; }); - this.subMenuConfig(options); const interactions = { response1: { type: 'choice', - options: interactOptions, - }, + options: interactOptions + } }; return interactions; } @@ -115,36 +91,5 @@ export class OptionsComponent implements OnInit { this.editorDataHandler(); } - subMenuChange({ index, value }, optionIndex) { - _.set(this.editorState, `interactions.response1.options[${optionIndex}].hints.en`, value) - } - - subMenuConfig(options) { - this.subMenus = [] - options.map((opt, index) => { - const value = _.get(this.editorState, `interactions.response1.options[${index}].hints.en`) - this.subMenus[index] = [ - { - id: 'addHint', - name: 'Add Hint', - value, - label: 'Hint', - enabled: value ? true : false, - type: 'input', - show: _.get(this.sourcingSettings, 'showAddHints'), - }, - ]; - }); - } - - setScore(value, scoreIndex) { - const obj = { - respone: scoreIndex, - outcomes: { - score: value, - }, - }; - this.mapping[scoreIndex] = obj; - this.editorDataHandler(); - } } + diff --git a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.html b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.html index 6a5746915..5e69502c5 100644 --- a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.html +++ b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.html @@ -1,10 +1,10 @@
- {{ configService.labelConfig?.lbl?.publishCollection | interpolate: '${objectType}': objectType }} + {{configService.labelConfig?.lbl?.publishCollection}}
- {{configService.labelConfig?.lbl?.confirmPublishCollection | interpolate: '${objectType}': objectType}} + {{configService.labelConfig?.lbl?.confirmPublishCollection}}
{{configService.labelConfig?.lbl?.publishchecklistTitle}}
@@ -23,4 +23,4 @@ {{configService.labelConfig?.button_labels?.no_btn_label}}
- + \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.spec.ts b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.spec.ts index 21d5237e8..5237e565f 100644 --- a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.spec.ts @@ -7,8 +7,6 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TelemetryInteractDirective } from '../../directives/telemetry-interact/telemetry-interact.directive'; import { EditorService } from '../../services/editor/editor.service'; import {mockData} from './publish-checklist.component.spec.data'; -import {InterpolatePipe} from '../../pipes/interpolate.pipe'; - describe('PublishChecklistComponent', () => { let component: PublishChecklistComponent; let fixture: ComponentFixture; @@ -17,7 +15,7 @@ describe('PublishChecklistComponent', () => { TestBed.configureTestingModule({ imports: [FormsModule, ReactiveFormsModule, HttpClientTestingModule], providers: [EditorService], - declarations: [PublishChecklistComponent, TelemetryInteractDirective, InterpolatePipe], + declarations: [PublishChecklistComponent, TelemetryInteractDirective], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) .compileComponents(); @@ -88,4 +86,4 @@ describe('PublishChecklistComponent', () => { component.valueChanges(event); expect(component.fieldsAvailable).toBeDefined(); }); -}); +}); \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.ts b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.ts index 41c05e0d2..6f77e75c6 100644 --- a/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.ts +++ b/projects/collection-editor-library/src/lib/components/publish-checklist/publish-checklist.component.ts @@ -11,7 +11,6 @@ import * as _ from 'lodash-es'; export class PublishChecklistComponent implements OnInit { @Input() publishchecklist: any; @Input() actionType: any; - @Input() objectType: string; @Output() publishEmitter = new EventEmitter(); public isButtonEnable = false; public fieldsAvailable: any; @@ -56,4 +55,4 @@ export class PublishChecklistComponent implements OnInit { valueChanges(event: any) { this.fieldsAvailable = event; } -} +} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.css b/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.css deleted file mode 100644 index 1a9fcac86..000000000 --- a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.css +++ /dev/null @@ -1,6 +0,0 @@ -label { - font-size: 12px !important; - margin-bottom: 0.5rem !important; - color: #121213e0; - font-weight: 600; -} diff --git a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.html b/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.html deleted file mode 100644 index 681aadd93..000000000 --- a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
-
- -
-
-
-
-
- -
- - -
-
-
diff --git a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.spec.ts b/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.spec.ts deleted file mode 100644 index e246a5869..000000000 --- a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.spec.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { QuestionOptionSubMenuComponent } from './question-option-sub-menu.component'; -import { mockData } from './question-option-sub-menu.spec.data'; - -describe('QuestionOptionSubMenuComponent', () => { - let component: QuestionOptionSubMenuComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [QuestionOptionSubMenuComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(QuestionOptionSubMenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - it('#onMenuClick() should enable the submenu if type is input ', () => { - component.subMenus = mockData.subMenus; - spyOn(component, 'onMenuClick').and.callThrough(); - component.onMenuClick(1) - expect(component.subMenus[1].enabled).toBe(true); - }); - it('#onMenuClick() should push dependant question if input value is array ', () => { - component.subMenus = mockData.subMenus; - spyOn(component, 'onMenuClick').and.callThrough(); - component.onMenuClick(2) - expect(component.subMenus[2].value.length).toBe(0); - }); - it('#onValueChange() should emit the value if type is input ', () => { - component.subMenus = mockData.subMenus; - spyOn(component, 'onValueChange').and.callThrough(); - spyOn(component.onChange, 'emit') - - let ev = { - target:{value:'text'} - } - component.onValueChange(ev,1) - expect(component.onValueChange).toHaveBeenCalled(); - expect(component.onChange.emit).toHaveBeenCalled() - }); -}); diff --git a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.ts b/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.ts deleted file mode 100644 index 642867b42..000000000 --- a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -export class SubMenuEvent { - index: number; - value: any; -} -export interface SubMenu { - id: string; - name: string; - label: string; - value: string|any[]; - enabled: boolean; - type: string; - show: boolean; -} -@Component({ - selector: 'lib-question-option-sub-menu', - templateUrl: './question-option-sub-menu.component.html', - styleUrls: ['./question-option-sub-menu.component.css'], -}) -export class QuestionOptionSubMenuComponent { - @Input() subMenus: SubMenu[]; - @Output() public onChange: EventEmitter = new EventEmitter(); - - - onMenuClick(index) { - const selectedMenu = this.subMenus[index]; - selectedMenu.enabled = !selectedMenu.enabled; - if (selectedMenu.enabled && selectedMenu.type !== 'input' && Array.isArray(selectedMenu.value)) { - this.onChange.emit({index, value: undefined}); - } - } - - onValueChange(event, index) { - if (this.subMenus[index].type === 'input') { this.subMenus[index].value = event.target.value; } - this.onChange.emit({ index, value: event.target.value}); - } -} diff --git a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.spec.data.ts b/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.spec.data.ts deleted file mode 100644 index 4a8246034..000000000 --- a/projects/collection-editor-library/src/lib/components/question-option-sub-menu/question-option-sub-menu.spec.data.ts +++ /dev/null @@ -1,31 +0,0 @@ -export const mockData = { - subMenus: [ - { - id: 'addHint', - name: 'Add Hint', - value: '', - enabled: false, - type: 'input', - label: 'label', - show: true, - }, - { - id: 'addTip', - name: 'Add Tip', - value: '', - enabled: false, - type: 'input', - label: 'label', - show: true, - }, - { - id: 'addDependantQuestion', - name: 'Add Dependant Question', - value: [], - enabled: false, - type: '', - label: 'label', - show: true, - }, - ], -}; diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.html b/projects/collection-editor-library/src/lib/components/question/question.component.html index 0de1254c4..adc1dd1d7 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.html +++ b/projects/collection-editor-library/src/lib/components/question/question.component.html @@ -1,6 +1,3 @@ -
- -
@@ -10,173 +7,105 @@
- +
-
-
- - - - - - -
-
-
+
- +
-
+
- - -
-

-
-
- + (editorDataOutput)="editorDataHandler($event)"> + (editorDataOutput)="editorDataHandler($event)"> - - - -
- -
-
{{configService.labelConfig?.lbl?.chooseType}}
- -
-
- {{configService.labelConfig?.lbl?.textImage}} -
-
- {{configService.labelConfig?.lbl?.video}} -
+
+ +
+
{{configService.labelConfig?.lbl?.chooseType}}
+ +
+
+ {{configService.labelConfig?.lbl?.textImage}} +
+
+ {{configService.labelConfig?.lbl?.video}}
-
-
-
-
+
+
+
+ + +
+
+
+
+
+
+
+ -
-
-
-
-
-
-
- -
-
-
- -
-
-
- {{ videoSolutionName - }} - +
+
+
+
+ {{ videoSolutionName + }} + +
- - -
-
-
-
- -
-

-
-
-
-
-
-
-
- {{videoSolutionName}} -
-
-
-
-
-
-
- - -
- {{ questionSetHierarchy.children ? 'Q'+ (questionSetHierarchy.children.length+1):''}} {{'. '+ - (childindex+1)}} - -
-
+
{{configService.labelConfig?.lbl?.Questiondetails}}
-
- +
@@ -200,51 +129,4 @@ {{configService.labelConfig?.button_labels?.no_btn_label}}
- - - -
- {{configService.labelConfig?.lbl?.acceptTerms}} -
-
-
-
-
- -
-
-
-
-
- -
- - - -
- {{configService.labelConfig?.lbl?.reviewComments}} -
-
-
- - -
-
-
- -
- + \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.scss b/projects/collection-editor-library/src/lib/components/question/question.component.scss index 8c04033bf..7c7cc3c7e 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.scss +++ b/projects/collection-editor-library/src/lib/components/question/question.component.scss @@ -60,30 +60,12 @@ sui-select { position: relative; display: flow-root; } -.ckeditor-tool__solution, .ckeditor-tool__question-readonly, .ckeditor-tool__option-readonly { +.ckeditor-tool__solution{ border: 1px solid #c4c4c4; border-radius: 4px; margin-bottom: -4px; } -.ckeditor-tool__label { - background-color: #f3f8ff; - color: var(--primary-color)!important; - font-weight: 600; - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} - -.mcq-checkbox-answer { - background: #f2f2f2; - padding: 8px; - display: flex; - justify-content: center; - align-items: center; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} - .ckeditor-tool__solution .menu { .item { font-size: 0.785rem !important; @@ -170,7 +152,7 @@ sui-select { .sb-editor-container { position: relative; - z-index: 998 !important; + z-index: 999 !important; .sb-input:first-child{ margin: 1rem 0 !important; } @@ -284,30 +266,15 @@ sui-select { .h-100{ height: 100% !important; - } + } .sb-required { color:#ff4558; padding-left: 2px; - position: relative; + position: relative; top: -5px; } select[disabled]{ opacity: 0.8 !important; font-weight: 500 !important; - } - - .multiselect{ - position: relative; - top: -7px; - height: 48px; - left:7px; - font-size: 14px; - font-weight: 400; - } - -.treepicker-parent .list-border { - height: 38px!important; - padding: 1rem!important; - margin-top: 15px !important; -} + } \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/question/question.component.spec.data.ts index 95fe6a5f1..75d5b9cd9 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.spec.data.ts +++ b/projects/collection-editor-library/src/lib/components/question/question.component.spec.data.ts @@ -1,2944 +1,360 @@ export const mockData = { - childMetadata: { - templateName: "", - required: [], - properties: [ - { - code: "name", - dataType: "text", - description: "Name of the content", - editable: true, - inputType: "text", - label: "Title", - name: "Title", - placeholder: "Title", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - required: true, - visible: true, - validations: [ - { - type: "max", - value: "120", - message: "Input is Exceeded", - }, - { - type: "required", - message: "Title is required", - }, - ], - }, - { - code: "description", - dataType: "text", - description: "Description of the content", - editable: true, - inputType: "textarea", - label: "Description", - name: "Description", - placeholder: "Description", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - required: true, - visible: true, - validations: [ - { - type: "max", - value: "200", - message: "Input is Exceeded", - }, - { - type: "required", - message: "Title is required", - }, - ], - }, - { - code: "keywords", - visible: true, - editable: true, - dataType: "list", - name: "Keywords", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - description: "Keywords for the content", - inputType: "keywords", - label: "keywords", - placeholder: "Enter Keywords", - required: false, - validations: [ - { - type: "required", - message: "Keyword is required", - }, - ], - }, - ], - }, - mcqQuestionMetaData: { - id: "api.question.read", - ver: "3.0", - ts: "2022-01-31T04:38:30ZZ", - params: { - resmsgid: "327f9629-17b6-4b11-b15a-c60279285292", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - mimeType: "application/vnd.sunbird.question", - media: [ - { - id:'1', - type:'vedio' - } - ], - editorState: { - options: [ + childMetadata: { + templateName: '', + required: [], + properties: [ { - answer: false, - value: { - body: "

option 1

", - value: 0, - }, + code: 'name', + dataType: 'text', + description: 'Name of the content', + editable: true, + inputType: 'text', + label: 'Title', + name: 'Title', + placeholder: 'Title', + renderingHints: { + class: 'sb-g-col-lg-1 required' + }, + required: true, + visible: true, + validations: [ + { + type: 'max', + value: '120', + message: 'Input is Exceeded' + }, + { + type: 'required', + message: 'Title is required' + } + ] }, { - answer: false, - value: { - body: "

option 2

", - value: 1, - }, + code: 'description', + dataType: 'text', + description: 'Description of the content', + editable: true, + inputType: 'textarea', + label: 'Description', + name: 'Description', + placeholder: 'Description', + renderingHints: { + class: 'sb-g-col-lg-1 required' + }, + required: true, + visible: true, + validations: [ + { + type: 'max', + value: '200', + message: 'Input is Exceeded' + }, + { + type: 'required', + message: 'Title is required' + } + ] }, { - answer: false, - value: { - body: "

option 3

", - value: 2, - }, - }, - ], - question: "

MCQ Question

", - }, - templateId: "mcq-vertical", - solutions: [ - { - id:'1', - type:'vedio' - } - ], - interactions: { - response1: { - type: "choice", - options: [ - { - label: "

option 1

", - value: 0, - hints: { - en: "test hint 1", - }, - }, - { - label: "

option 2

", - value: 1, - hints: { - en: "test hint 2", + code: 'keywords', + visible: true, + editable: true, + dataType: 'list', + name: 'Keywords', + renderingHints: { + class: 'sb-g-col-lg-1 required' }, - }, - { - label: "

option 3

", - value: 2, - hints: { - en: "test hint 3", - }, - }, - ], - }, - }, - name: "MCQ Question", - responseDeclaration: { - response1: { - maxScore: 1, - cardinality: "single", - type: "integer", - correctResponse: { - outcomes: { - SCORE: 1, - }, - }, - mapping: [], - }, - }, - interactionTypes: ["choice"], - qType: "MCQ", - primaryCategory: "Multiselect Multiple Choice Question", - body: "

MCQ Question

", - creator: "Vaibahv Bhuva", - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - board: "CBSE", - medium: ["English"], - gradeLevel: ["Grade 1"], - subject: ["English"], - topic: ["Forest"], - author: "check1@yopmail.com", - channel: "01309282781705830427", - framework: "nit_k-12", - license: "CC BY 4.0", - }, - }, - }, - sliderQuestionMetaData: { - id: "api.question.read", - ver: "3.0", - ts: "2022-01-31T04:17:19ZZ", - params: { - resmsgid: "68a6ed45-a6eb-4fe3-930b-bbcefa7a4511", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - mimeType: "application/vnd.sunbird.question", - media: [], - editorState: { - question: "

Slider Question

", - }, - body: "

Slider Question

", - responseDeclaration: { - response1: { - type: "integer", - maxScore: 1, - }, - }, - solutions: [], - creator: "Vaibahv Bhuva", - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - board: "CBSE", - medium: ["English"], - gradeLevel: ["Grade 1"], - subject: ["English"], - topic: ["Forest"], - author: "check1@yopmail.com", - channel: "01309282781705830427", - framework: "nit_k-12", - license: "CC BY 4.0", - name: "Slider Question", - showEvidence: "Yes", - evidence: { - required: "No", - mimeType: ["audio"], - minCount: 1, - maxCount: 1, - sizeLimit: "20480", - }, - showRemarks: "Yes", - remarks: { - maxLength: "100", - required: "No", - }, - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - range: { - min: "0", - max: "10", - }, - }, - step: "1", - }, - }, - hints: { - en: [null], - }, - instructions: { - en: [null], - }, - interactionTypes: ["slider"], - primaryCategory: "Slider", - }, - }, - }, - dateQuestionMetaDate: { - id: "api.question.read", - ver: "3.0", - ts: "2022-01-31T04:21:32ZZ", - params: { - resmsgid: "10091336-fd86-49bd-8505-2d67e3ce9241", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - mimeType: "application/vnd.sunbird.question", - media: [], - editorState: { - question: "

Child Date Question

", - }, - body: "

Child Date Question

", - responseDeclaration: { - response1: { - type: "string", - }, - }, - solutions: [], - creator: "Vaibahv Bhuva", - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - board: "CBSE", - medium: ["English"], - gradeLevel: ["Grade 1"], - subject: ["English"], - topic: ["Forest"], - author: "check1@yopmail.com", - channel: "01309282781705830427", - framework: "nit_k-12", - license: "CC BY 4.0", - name: "Child Date Question", - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - pattern: "DD/MM/YYYY", - }, - autoCapture: "Yes", - }, - }, - hints: { - en: [null], - }, - instructions: { - en: [null], - }, - interactionTypes: ["date"], - primaryCategory: "Date", - }, - }, - }, - textQuestionNetaData: { - id: "api.question.read", - ver: "3.0", - ts: "2022-01-31T04:22:24ZZ", - params: { - resmsgid: "a536133f-822e-4533-a57c-5558ef65297d", - msgid: null, - err: null, - status: "successful", - errmsg: null, + description: 'Keywords for the content', + inputType: 'keywords', + label: 'keywords', + placeholder: 'Enter Keywords', + required: false, + validations: [ + { + type: 'required', + message: 'Keyword is required' + } + ] + } + ] }, - responseCode: "OK", - result: { - question: { - mimeType: "application/vnd.sunbird.question", - media: [], + questionMetaData: { + answer: '

adasd

', + body: '

asd

', + description: 'description', editorState: { - question: "

Text Question

", - }, - body: "

Text Question

", - responseDeclaration: { - response1: { - type: "string", - maxScore: 1, - }, - }, - solutions: [], - creator: "Vaibahv Bhuva", - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - board: "CBSE", - medium: ["English"], - gradeLevel: ["Grade 1"], - subject: ["English"], - topic: ["Forest"], - author: "check1@yopmail.com", - channel: "01309282781705830427", - framework: "nit_k-12", - license: "CC BY 4.0", - name: "Text Question", - showEvidence: "No", - showRemarks: "No", - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - limit: { - maxLength: "100", - }, - }, - type: { - number: "Yes", - }, - }, - }, - hints: { - en: [null], - }, - instructions: { - en: [null], - }, - interactionTypes: ["text"], - primaryCategory: "Text", - }, - }, - }, - defaultQuestionMetaData: { - id: "api.question.read", - ver: "3.0", - ts: "2022-01-31T04:22:24ZZ", - params: { - resmsgid: "a536133f-822e-4533-a57c-5558ef65297d", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - instructions: { - en: [null], - }, - responseDeclaration: { - response1: { - type: "string", - maxScore: 1, - }, - }, - mimeType: "application/vnd.sunbird.question", + answer: '

adasd

', + editorState: { answer: '

adasd

' }, + name: 'Subjective Question', + primaryCategory: 'Subjective Question', + qType: 'SA', + question: '

asd

', + }, + identifier: 'do_113219577241780224147', + keywords: ['keyword'], + languageCode: ['en'], media: [], - body: "

child Text Question

", - editorState: { - question: "

child Text Question

", - }, - interactions: { - validation: { - required: "Yes", - }, - response1: {}, - }, - primaryCategory: "Default", - showRemarks: "Yes", - remarksLimit: "20", - identifier: "do_11345671149997260811", - solutions: [], - hints: { - en: [null], - }, - languageCode: ["en"], - interactionTypes: "", - name: "child Text Question", - }, - }, - }, - childMetadataUpdated: { - templateName: "", - required: [], - properties: [ - { - code: "name", - dataType: "text", - description: "Name of the content", - editable: false, - inputType: "text", - label: "Title", - name: "Title", - placeholder: "Title", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - required: true, - visible: true, - validations: [ - { - type: "max", - value: "120", - message: "Input is Exceeded", - }, - { - type: "required", - message: "Title is required", - }, - ], - }, - { - code: "description", - dataType: "text", - description: "Description of the content", - editable: false, - inputType: "textarea", - label: "Description", - name: "Description", - placeholder: "Description", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - required: true, - visible: true, - validations: [ - { - type: "max", - value: "200", - message: "Input is Exceeded", - }, - { - type: "required", - message: "Title is required", - }, - ], - }, - { - code: "board", - default: "", - visible: true, - depends: [], - editable: true, - dataType: "text", - renderingHints: { - class: "sb-g-col-lg-1", - }, - description: "Board", - label: "Board/Syllabus", - required: false, - name: "Board/Syllabus", - inputType: "select", - placeholder: "Select Board/Syllabus", - }, - { - code: "keywords", - visible: true, - editable: false, - dataType: "list", - name: "Keywords", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - description: "Keywords for the content", - inputType: "keywords", - label: "keywords", - placeholder: "Enter Keywords", - required: false, - validations: [ - { - type: "required", - message: "Keyword is required", - }, - ], - }, - ], - }, - formData: { - numberOnly: "yes", - name: "description", - }, - frameWorkDetails: { - frameworkData: [ - { - identifier: "ekstep_ncert_k-12_board", - code: "board", - terms: [ - { - associations: [ - { - identifier: - "ekstep_ncert_k-12_learningoutcome_9686a2a712bdfdb43408555865cda57f2367699a", - code: "9686a2a712bdfdb43408555865cda57f2367699a", - translations: null, - name: "Inequalities in a triangle.", - description: "Inequalities in a triangle.", - index: 0, - category: "learningoutcome", - status: "Live", - }, - { - identifier: - "ekstep_ncert_k-12_topic_08859db5d07d93b99c12b3e5bceb975c582d31b7", - code: "08859db5d07d93b99c12b3e5bceb975c582d31b7", - translations: null, - name: "Nature around the kids", - description: "Nature around the kids", - index: 0, - category: "topic", - status: "Live", - }, - ], - identifier: "ekstep_ncert_k-12_board_cbse", - code: "cbse", - translations: null, - name: "CBSE", - description: "CBSE", - index: 10, - category: "board", - status: "Live", - }, - ], - translations: null, - name: "Board", - description: "Board", - index: 1, - status: "Live", - }, - ], - topicList: [ - { - identifier: - "ekstep_ncert_k-12_topic_08859db5d07d93b99c12b3e5bceb975c582d31b7", - code: "08859db5d07d93b99c12b3e5bceb975c582d31b7", - translations: null, - name: "Nature around the kids", - description: "Nature around the kids", - index: 10, - category: "topic", - status: "Live", - }, - ], - }, - editorState: { - body: { - answer: "

Yes

", - question: "

Hi how are you ?

", - editorState: { - answer: "

Yes

", - }, - name: "Subjective Question", - qType: "SA", - primaryCategory: "Subjective Question", - }, - mediaobj: {}, - }, - eventData: { - body: { answer: "

dad

" }, - editorState: { answer: "

dad

" }, - name: "Subjective Question", - qType: "SA", - primaryCategory: "Subjective Question", - mediaobj: undefined, - }, - subMenus: [ - { - id: "addHint", - name: "Add Hint", - value: "", - enabled: false, - type: "input", - label: "label", - show: true, - }, - { - id: "addTip", - name: "Add Tip", - value: "", - enabled: false, - type: "input", - label: "label", - show: true, - }, - { - id: "addDependantQuestion", - name: "Add Dependant Question", - value: [{ id: 1 }], - enabled: false, - type: "", - label: "label", - show: true, + mimeType: 'application/vnd.sunbird.question', + name: 'Mcq question ', + primaryCategory: 'Subjective Question', + qType: 'SA', + solutions: [] }, - ], -}; - -export const readQuestionMock = { - id: "api.question.read", - ver: "3.0", - ts: "2021-09-30T09:18:52ZZ", - params: { - resmsgid: "04f55276-8ddc-4a23-a52e-a188e2ef5c2c", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - instructions: { - en: [null], - }, - showRemarks: "No", - responseDeclaration: { - response1: { - maxScore: 1, - cardinality: "multiple", - type: "integer", - correctResponse: { - outcomes: { - SCORE: 1, - }, - }, - mapping: [], - }, - }, - mimeType: "application/vnd.sunbird.question", - media: [], - body: "

MCQ Question 3

", - editorState: { - options: [ - { - answer: false, - value: { - body: "

false

", - value: 0, - }, - }, - { - answer: false, - value: { - body: "

true

", - value: 1, - }, - }, - ], - question: "

MCQ Question 3

", - }, - templateId: "mcq-vertical", - interactions: { - response1: { - type: "choice", - options: [ - { - label: "

false

", - value: 0, - }, + childMetadataUpdated: { + templateName: '', + required: [], + properties: [ { - label: "

true

", - value: 1, - }, - ], - }, - validation: { - required: "Yes", - }, - }, - primaryCategory: "Multiselect Multiple Choice Question", - identifier: "do_1134355569264885761166", - solutions: [], - hints: { - en: [null], - }, - qType: "MCQ", - languageCode: ["en"], - interactionTypes: ["choice"], - name: "MCQ Question 3", - showEvidence: "No", - }, - }, -}; - -export const readQuestionMockSlider = { - id: "api.question.read", - ver: "3.0", - ts: "2021-09-30T09:18:52ZZ", - params: { - resmsgid: "04f55276-8ddc-4a23-a52e-a188e2ef5c2c", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - instructions: { - en: [null], - }, - showRemarks: "No", - mimeType: "application/vnd.sunbird.question", - media: [], - body: "

Dep Slider 3

", - editorState: { - question: "

Dep Slider 3

", - }, - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - range: { - min: "0", - max: "10", - }, - }, - step: "1", - }, - }, - primaryCategory: "Slider", - identifier: "do_1134355571590184961168", - solutions: [], - hints: { - en: [null], - }, - languageCode: ["en"], - interactionTypes: ["slider"], - name: "Dep Slider 3", - showEvidence: "No", - }, - }, -}; - -export const readQuestionMockDate = { - id: "api.question.read", - ver: "3.0", - ts: "2021-09-30T09:18:52ZZ", - params: { - resmsgid: "04f55276-8ddc-4a23-a52e-a188e2ef5c2c", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - instructions: { - en: [null], - }, - mimeType: "application/vnd.sunbird.question", - media: [], - body: "

Dep Date 3

", - editorState: { - question: "

Dep Date 3

", - }, - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - pattern: "DD/MM/YYYY", - }, - autoCapture: "Yes", - }, - }, - primaryCategory: "Date", - identifier: "do_1134355574936780801170", - solutions: [], - hints: { - en: [null], - }, - languageCode: ["en"], - interactionTypes: ["date"], - name: "Dep Date 3", - }, - }, -}; - -export const readQuestionMockText = { - id: "api.question.read", - ver: "3.0", - ts: "2021-09-30T09:18:52ZZ", - params: { - resmsgid: "04f55276-8ddc-4a23-a52e-a188e2ef5c2c", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - question: { - instructions: { - en: [null], - }, - showRemarks: "No", - mimeType: "application/vnd.sunbird.question", - media: [], - body: "

Dep Text 2

", - editorState: { - question: "

Dep Text 2

", - }, - interactions: { - validation: { - required: "Yes", - }, - response1: { - validation: { - limit: { - maxLength: "100", - }, - }, - type: { - number: "Yes", - }, - }, - }, - primaryCategory: "Text", - identifier: "do_1134347722012835841130", - solutions: [], - hints: { - en: [null], - }, - languageCode: ["en"], - interactionTypes: ["text"], - name: "Dep Text 2", - showEvidence: "No", - }, - }, -}; - -export const collectionHierarchyMock = { - id: "api.questionset.hierarchy.get", - params: { - resmsgid: "61a32bae-ba2f-4779-aa27-1428c6b70f8c", - msgid: null, - err: null, - status: "successful", - errmsg: null, - }, - responseCode: "OK", - result: { - questionSet: { - acceptedContributions: [ - "do_11326368076523929623", - "do_11326368076523929635", - ], - rejectedContributions: [ - "do_11326368076523929647", - "do_11326368076523929659", - ], - rejectedContributionComments: { - do_11326368076523929647: "test comment 1", - do_11326368076523929659: "test comment 2", - }, - organisationId: "937dd865-b256-4c1a-9830-a9b5b89f0913", - keywords: ["test"], - subject: ["English"], - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - ecm: [ - "Student interview", - "Teacher interview", - "Parent interview", - "HM/HT interview", - ], - objectType: "QuestionSet", - gradeLevel: ["Grade 1"], - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134357224765685761203", - code: "a51c0d9f-4696-3354-062f-b2078048656c", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.118+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323603906561218", - code: "b4c3e613-5c3f-9c8b-d61f-417f4c5d8df2", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - branchingLogic: { - do_113449775832088576181: { - target: [], - source: ["do_113449672558780416163"], - preCondition: { - and: [ - { - eq: [ - { - var: "do_113449672558780416163.response1.value", - type: "responseDeclaration", - }, - [0], - ], - }, - ], - }, - }, - do_113449787008081920183: { - target: [], - source: ["do_113449672558780416163"], - preCondition: { - and: [ - { - ne: [ - { - var: "do_113449672558780416163.response1.value", - type: "responseDeclaration", - }, - [1], - ], - }, - ], - }, - }, - do_11345671149997260811: { - target: [], - source: ["do_113449672558780416163"], - preCondition: { - and: [ - { - eq: [ - { - var: "do_113449672558780416163.response1.value", - type: "responseDeclaration", - }, - [0], - ], - }, - ], - }, - }, - do_113449808985628672185: { - target: [], - source: ["do_113449672558780416163"], - preCondition: { - and: [ - { - eq: [ - { - var: "do_113449672558780416163.response1.value", - type: "responseDeclaration", - }, - [0], - ], - }, - ], - }, - }, - do_113449672558780416163: { - target: [ - "do_113449775832088576181", - "do_113449787008081920183", - "do_113449808985628672185", - "do_11345671149997260811", - ], - preCondition: {}, - source: [], - }, - }, - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.106+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323602841601200", - code: "d0ab14ae-9f67-41cf-dcfa-80c8432bf424", - evidence: { - required: "No", - mimeType: ["audio"], - minCount: 1, - maxCount: 1, - sizeLimit: "20480", - }, - subject: ["English"], - showRemarks: "No", - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - templateId: "mcq-vertical", - createdOn: "2022-01-10T09:08:52.273+0000", - objectType: "Question", - gradeLevel: ["Grade 1"], - primaryCategory: "Multiselect Multiple Choice Question", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-20T07:49:01.518+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_113449672558780416163", - lastStatusChangedOn: "2022-01-10T09:08:52.273+0000", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 1, - qType: "MCQ", - languageCode: ["en"], - version: 1, - versionKey: "1642664941814", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["choice"], - framework: "tpd", - depth: 3, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "Parent Question MCQ", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - showEvidence: "Yes", - }, - { - parent: "do_1134460323602841601200", - code: "c03eddbf-8194-ce67-3f49-08c4b5b33e55", - subject: ["English"], - showRemarks: "No", - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - createdOn: "2022-01-20T07:49:38.034+0000", - objectType: "Question", - gradeLevel: ["Grade 1"], - primaryCategory: "Text", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-20T07:49:38.023+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_11345671149997260811", - lastStatusChangedOn: "2022-01-20T07:49:38.034+0000", - creator: "Vaibahv Bhuva", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 2, - languageCode: ["en"], - version: 1, - versionKey: "1642664978234", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["text"], - framework: "tpd", - depth: 3, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "child Text Question", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - showEvidence: "No", - }, - { - parent: "do_1134460323602841601200", - code: "10cf6d1b-ba3d-2925-1d13-032aa3d2d317", - subject: ["English"], - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - createdOn: "2022-01-10T13:46:25.941+0000", - objectType: "Question", - gradeLevel: ["Grade 1"], - primaryCategory: "Date", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-10T13:46:25.941+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_113449808985628672185", - lastStatusChangedOn: "2022-01-10T13:46:25.941+0000", - creator: "Vaibahv Bhuva", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 3, - languageCode: ["en"], - version: 1, - versionKey: "1641822385942", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["date"], - framework: "tpd", - depth: 3, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "Child Date 1", - topic: ["Forest"], - board: "CBSE", - status: "Draft", + code: 'name', + dataType: 'text', + description: 'Name of the content', + editable: false, + inputType: 'text', + label: 'Title', + name: 'Title', + placeholder: 'Title', + renderingHints: { + class: 'sb-g-col-lg-1 required' }, - { - parent: "do_1134460323602841601200", - code: "5403efd9-064e-89af-8f44-a9b10c80291c", - subject: ["English"], - showRemarks: "No", - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - createdOn: "2022-01-10T12:38:58.878+0000", - objectType: "Question", - gradeLevel: ["Grade 1"], - primaryCategory: "Slider", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-10T12:38:58.878+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_113449775832088576181", - lastStatusChangedOn: "2022-01-10T12:38:58.878+0000", - creator: "Vaibahv Bhuva", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 4, - languageCode: ["en"], - version: 1, - versionKey: "1641818338879", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["slider"], - framework: "tpd", - depth: 3, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "test slider 2", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - showEvidence: "No", - }, - { - parent: "do_1134460323602841601200", - code: "4395c049-8ba7-c611-6334-8bee3f02fa27", - subject: ["English"], - showRemarks: "No", - channel: "01309282781705830427", - language: ["English"], - medium: ["English"], - mimeType: "application/vnd.sunbird.question", - createdOn: "2022-01-10T13:01:43.135+0000", - objectType: "Question", - gradeLevel: ["Grade 1"], - primaryCategory: "Slider", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-10T13:01:43.135+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_113449787008081920183", - lastStatusChangedOn: "2022-01-10T13:01:43.135+0000", - creator: "Vaibahv Bhuva", - visibility: "Parent", - showTimer: "No", - author: "check1@yopmail.com", - index: 5, - languageCode: ["en"], - version: 1, - versionKey: "1641819703136", - showFeedback: "No", - license: "CC BY 4.0", - interactionTypes: ["slider"], - framework: "tpd", - depth: 3, - createdBy: "5a587cc1-e018-4859-a0a8-e842650b9d64", - compatibilityLevel: 4, - name: "test slider 4", - topic: ["Forest"], - board: "CBSE", - status: "Draft", - showEvidence: "No", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-20T07:49:38.234+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602841601200", - lastStatusChangedOn: "2022-01-05T05:42:52.106+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372106", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Chemistry", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603906561218", - code: "bfdac63e-4cd1-c9fe-00a0-be98f73e13d8", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - branchingLogic: {}, - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.131+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-10T13:09:04.092+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604971521236", - lastStatusChangedOn: "2022-01-05T05:42:52.131+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372131", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Biology", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603906561218", - code: "9916f5fc-4f37-3f8e-5151-b32ce65217da", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.114+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.114+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603578881212", - lastStatusChangedOn: "2022-01-05T05:42:52.114+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372114", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "General Science", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.019+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603906561218", - lastStatusChangedOn: "2022-01-05T05:42:52.118+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372118", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Science", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "36b6e0bd-ef9e-9fd1-5092-257c8e6af0a9", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.190+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323609804801240", - code: "fd63a953-d9c1-cb14-df75-5918afb4b4b0", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.110+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.018+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603251201206", - lastStatusChangedOn: "2022-01-05T05:42:52.110+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372110", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "History", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609804801240", - code: "de1454cf-bfa9-faa5-8a71-cf7954e9f95b", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.100+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.100+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602432001194", - lastStatusChangedOn: "2022-01-05T05:42:52.100+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372100", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Political Science", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", + required: true, + visible: true, + validations: [ + { + type: 'max', + value: '120', + message: 'Input is Exceeded' + }, + { + type: 'required', + message: 'Title is required' + } + ] }, { - parent: "do_1134460323609804801240", - code: "916893b4-816f-9613-1456-bea7da40c4ef", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.195+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.195+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323610214401248", - lastStatusChangedOn: "2022-01-05T05:42:52.195+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372195", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Geography", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609804801240", - code: "0c34d378-77e9-db88-589a-7695edcf1d70", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.094+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.094+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323601940481186", - lastStatusChangedOn: "2022-01-05T05:42:52.094+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 4, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372094", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Sociology", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609804801240", - code: "cca8fe66-b7e9-c3cb-a226-b5f96e10dfe9", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.126+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.126+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604561921228", - lastStatusChangedOn: "2022-01-05T05:42:52.126+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 5, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372126", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Social Studies", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609804801240", - code: "cedcdd78-2950-e8d7-fa17-f57e67a349b9", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.128+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.128+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604725761232", - lastStatusChangedOn: "2022-01-05T05:42:52.128+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 6, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372128", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Environmental Studies", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.019+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323609804801240", - lastStatusChangedOn: "2022-01-05T05:42:52.190+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372190", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Social Science", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "19589d40-f25d-5204-bfba-9a331c1d22f1", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.191+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323609886721242", - code: "4be73894-ace8-f9f8-9e22-206ae1854782", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.091+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.090+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323601612801182", - lastStatusChangedOn: "2022-01-05T05:42:52.091+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372091", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Telugu", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609886721242", - code: "35ee819a-8906-eace-1a62-9d296ba7b23a", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.192+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.192+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323609968641244", - lastStatusChangedOn: "2022-01-05T05:42:52.192+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372192", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "English", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609886721242", - code: "4bf42318-fb09-6384-fb3a-67a3b942126a", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.193+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.193+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323610050561246", - lastStatusChangedOn: "2022-01-05T05:42:52.193+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372193", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Assamese", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609886721242", - code: "77161a93-5be9-5548-cc95-9033fddc882b", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.120+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.120+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604070401220", - lastStatusChangedOn: "2022-01-05T05:42:52.120+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 4, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372120", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Sanskrit", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323609886721242", - code: "924bdaa8-25a5-286b-2dfd-ae3160754e0f", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.108+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.107+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603087361202", - lastStatusChangedOn: "2022-01-05T05:42:52.108+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 5, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372108", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Hindi", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.018+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323609886721242", - lastStatusChangedOn: "2022-01-05T05:42:52.191+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372191", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Language", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "a8c0c30c-71b9-1f28-0f28-78c92502b458", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.115+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323603660801214", - code: "8ab5c31d-52b7-cf4b-fc19-5ef5f972b482", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.092+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.092+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323601776641184", - lastStatusChangedOn: "2022-01-05T05:42:52.093+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372092", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Physical Education", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603660801214", - code: "fe79e53a-600a-347a-1627-1333edce33df", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.125+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.124+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604398081226", - lastStatusChangedOn: "2022-01-05T05:42:52.125+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372125", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Economics", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603660801214", - code: "3901dd2a-a60a-fc5b-8a4c-728cb67f78d3", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.122+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.121+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604234241222", - lastStatusChangedOn: "2022-01-05T05:42:52.122+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372122", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Mathematics", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.018+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603660801214", - lastStatusChangedOn: "2022-01-05T05:42:52.115+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 4, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372115", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Other Curriculum Subjects", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "de3bb487-8417-f8a4-04d3-802f3bab8e4c", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.113+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ - { - parent: "do_1134460323603496961210", - code: "4b99fa00-448d-9790-4ce9-c53215ad3ca9", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.123+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.123+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604316161224", - lastStatusChangedOn: "2022-01-05T05:42:52.123+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372123", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Pedagogy", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603496961210", - code: "7d84bdba-9856-63f5-26c6-c40d0ee05fc4", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.129+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.129+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604807681234", - lastStatusChangedOn: "2022-01-05T05:42:52.129+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 2, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372129", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Classroom Management", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134460323603496961210", - code: "65da6804-99b9-e7ee-80db-522b0256ed45", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.095+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.095+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602022401188", - lastStatusChangedOn: "2022-01-05T05:42:52.095+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 3, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372095", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Child Management", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", + code: 'description', + dataType: 'text', + description: 'Description of the content', + editable: false, + inputType: 'textarea', + label: 'Description', + name: 'Description', + placeholder: 'Description', + renderingHints: { + class: 'sb-g-col-lg-1 required' + }, + required: true, + visible: true, + validations: [ + { + type: 'max', + value: '200', + message: 'Input is Exceeded' + }, + { + type: 'required', + message: 'Title is required' + } + ] }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.018+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603496961210", - lastStatusChangedOn: "2022-01-05T05:42:52.113+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 5, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372113", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Teaching and Classroom Management", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "40153827-6fc2-694a-4785-15f1170b9ec8", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.112+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ { - parent: "do_1134460323603415041208", - code: "da305492-32e3-c498-4397-a9365d525171", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.127+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.127+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323604643841230", - lastStatusChangedOn: "2022-01-05T05:42:52.127+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372127", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "ICT", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", + "code": "board", + "default": "", + "visible": true, + "depends": [], + "editable": true, + "dataType": "text", + "renderingHints": { + "class": "sb-g-col-lg-1" + }, + "description": "Board", + "label": "Board/Syllabus", + "required": false, + "name": "Board/Syllabus", + "inputType": "select", + "placeholder": "Select Board/Syllabus" }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.018+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603415041208", - lastStatusChangedOn: "2022-01-05T05:42:52.112+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 6, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372112", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "ICT", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "318b9fb5-2020-e9ce-b1d7-99ba646c9dfc", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.132+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ { - parent: "do_1134460323605053441238", - code: "8b045060-400c-ff62-e88e-1567d300a912", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.109+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.109+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603169281204", - lastStatusChangedOn: "2022-01-05T05:42:52.109+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372109", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Leadership Management", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.019+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323605053441238", - lastStatusChangedOn: "2022-01-05T05:42:52.132+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 7, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372132", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Leadership Management", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "099a65b6-7456-621c-1cb3-a073e2b4ccc0", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.101+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ + code: 'keywords', + visible: true, + editable: false, + dataType: 'list', + name: 'Keywords', + renderingHints: { + class: 'sb-g-col-lg-1 required' + }, + description: 'Keywords for the content', + inputType: 'keywords', + label: 'keywords', + placeholder: 'Enter Keywords', + required: false, + validations: [ + { + type: 'required', + message: 'Keyword is required' + } + ] + } + ] + }, + formData: { + description: 'description', + keywords: ['keyword'], + name: '' + }, + frameWorkDetails: { + frameworkData: [ { - parent: "do_1134460323602513921196", - code: "b5ccdaed-a685-5d7e-2b5b-92ddd13b11bb", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.097+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.096+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602186241190", - lastStatusChangedOn: "2022-01-05T05:42:52.097+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372097", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Health Education", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.019+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602513921196", - lastStatusChangedOn: "2022-01-05T05:42:52.101+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 8, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372101", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Health Education", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "d1ea15c0-812b-b05d-74ef-57016243e081", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.098+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - children: [ + "identifier": "ekstep_ncert_k-12_board", + "code": "board", + "terms": [ + { + "associations": [ + { + "identifier": "ekstep_ncert_k-12_learningoutcome_9686a2a712bdfdb43408555865cda57f2367699a", + "code": "9686a2a712bdfdb43408555865cda57f2367699a", + "translations": null, + "name": "Inequalities in a triangle.", + "description": "Inequalities in a triangle.", + "index": 0, + "category": "learningoutcome", + "status": "Live" + }, + { + "identifier": "ekstep_ncert_k-12_topic_08859db5d07d93b99c12b3e5bceb975c582d31b7", + "code": "08859db5d07d93b99c12b3e5bceb975c582d31b7", + "translations": null, + "name": "Nature around the kids", + "description": "Nature around the kids", + "index": 0, + "category": "topic", + "status": "Live" + }], + "identifier": "ekstep_ncert_k-12_board_cbse", + "code": "cbse", + "translations": null, + "name": "CBSE", + "description": "CBSE", + "index": 10, + "category": "board", + "status": "Live" + } + ], + "translations": null, + "name": "Board", + "description": "Board", + "index": 1, + "status": "Live" + } + ], + topicList: [ { - parent: "do_1134460323602268161192", - code: "677a3586-36fe-17d7-be06-4972084bff07", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.103+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.103+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602677761198", - lastStatusChangedOn: "2022-01-05T05:42:52.103+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 1, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372103", - showFeedback: "No", - license: "CC BY 4.0", - depth: 2, - compatibilityLevel: 5, - name: "Personal Development", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentDisposition: "inline", - lastUpdatedOn: "2022-01-12T08:37:51.019+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323602268161192", - lastStatusChangedOn: "2022-01-05T05:42:52.098+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 9, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372098", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Personal Development", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - { - parent: "do_1134357224765685761203", - code: "19f41337-ac33-4028-095c-1f602da77698", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - channel: "01309282781705830427", - language: ["English"], - mimeType: "application/vnd.sunbird.questionset", - showHints: "No", - createdOn: "2022-01-05T05:42:52.117+0000", - objectType: "QuestionSet", - primaryCategory: "Observation With Rubrics", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-05T05:42:52.117+0000", - contentEncoding: "gzip", - showSolutions: "No", - allowAnonymousAccess: "Yes", - identifier: "do_1134460323603824641216", - lastStatusChangedOn: "2022-01-05T05:42:52.117+0000", - requiresSubmit: "No", - visibility: "Parent", - showTimer: "No", - index: 10, - setType: "materialised", - languageCode: ["en"], - version: 1, - versionKey: "1641361372117", - showFeedback: "No", - license: "CC BY 4.0", - depth: 1, - compatibilityLevel: 5, - name: "Physics", - navigationMode: "non-linear", - allowBranching: "Yes", - shuffle: true, - attributions: [], - status: "Draft", - }, - ], - contentEncoding: "gzip", - secondaryLanguage: ["English"], - showSolutions: "No", - identifier: "do_1134357224765685761203", - subjectIds: ["nit_k-12_subject_english"], - visibility: "Default", - showTimer: "No", - author: "check1@yopmail.com", - entityType: "Cluster", - consumerId: "fa13b438-8a3d-41b1-8278-33b0c50210e4", - childNodes: [ - "do_1134460323601776641184", - "do_1134460323603660801214", - "do_1134460323604398081226", - "do_1134460323604234241222", - "do_1134460323603251201206", - "do_1134460323609804801240", - "do_1134460323601940481186", - "do_1134460323602432001194", - "do_1134460323610214401248", - "do_1134460323604725761232", - "do_1134460323604561921228", - "do_1134460323610050561246", - "do_1134460323609886721242", - "do_1134460323601612801182", - "do_1134460323609968641244", - "do_1134460323604070401220", - "do_1134460323603087361202", - "do_1134460323602677761198", - "do_1134460323602268161192", - "do_1134460323602186241190", - "do_1134460323602513921196", - "do_1134460323604643841230", - "do_1134460323603415041208", - "do_1134460323603824641216", - "do_1134460323604316161224", - "do_1134460323603496961210", - "do_1134460323604807681234", - "do_1134460323602022401188", - "do_113449775832088576181", - "do_1134460323602841601200", - "do_1134460323603906561218", - "do_113449787008081920183", - "do_11345671149997260811", - "do_113449808985628672185", - "do_113449672558780416163", - "do_1134460323604971521236", - "do_1134460323603578881212", - "do_1134460323603169281204", - "do_1134460323605053441238", - ], - maxScore: 4, - languageCode: ["en"], - version: 1, - license: "CC BY 4.0", - name: "Observation", - allowBranching: "Yes", - mediumIds: ["nit_k-12_medium_english"], - status: "Draft", - code: "6510727b-91ac-0ec6-48cb-0ea74ee7300d", - allowScoring: "Yes", - allowSkip: "Yes", - containsUserData: "No", - description: "test", - medium: ["English"], - createdOn: "2021-12-21T16:07:21.382+0000", - contentDisposition: "inline", - lastUpdatedOn: "2022-01-20T07:49:38.722+0000", - allowAnonymousAccess: "Yes", - lastStatusChangedOn: "2021-12-21T16:07:21.382+0000", - creator: "check1@yopmail.com", - requiresSubmit: "No", - setType: "materialised", - versionKey: "1642664978722", - showFeedback: "No", - recordedBy: "External", - framework: "tpd", - depth: 0, - boardIds: ["nit_k-12_board_cbse"], - createdBy: "4e397c42-495e-4fdb-8558-f98176230916", - compatibilityLevel: 5, - navigationMode: "non-linear", - shuffle: true, - gradeLevelIds: ["nit_k-12_gradelevel_grade-1"], - board: "CBSE", - programId: "ab75b870-6274-11ec-874d-3de2a8c29d94", + "identifier": "ekstep_ncert_k-12_topic_08859db5d07d93b99c12b3e5bceb975c582d31b7", + "code": "08859db5d07d93b99c12b3e5bceb975c582d31b7", + "translations": null, + "name": "Nature around the kids", + "description": "Nature around the kids", + "index": 10, + "category": "topic", + "status": "Live" + } + ] }, - }, - ts: "2022-01-25T07:35:10ZZ", - ver: "3.0", + editorState: { + body: { + "answer": '

Yes

', + "question": "

Hi how are you ?

", + "editorState": { + "answer": '

Yes

' + }, + "name": "Subjective Question", + "qType": "SA", + "primaryCategory": "Subjective Question" + }, + mediaobj: {} + }, + eventData: { + body: { answer: "

dad

" }, + editorState: { answer: "

dad

" }, + name: "Subjective Question", + qType: "SA", + primaryCategory: "Subjective Question", + mediaobj: undefined + } }; -export const sourcingSettingsMock = { - enforceCorrectAnswer: false, - showSolution: false, - showAddHints: true, - showAddScore: false, - showAddTips: true, - showAddTranslation: true, - showAddSecondaryQuestion: false, +export const readQuestionMock = { + "responseCode": "OK", + "result": { + "question": { + "media": [], + "editorState": { + "answer": "

This is anwser

", + "question": "
adssa  
   
 dasd 
  dsadas
  • dasdasdasd
", + "solutions": [ + { + "id": "07c3e152-374c-5430-ddb0-e4001c84c573", + "type": "html", + "value": "

Solution for the subjectiove question

" + } + ] + }, + "primaryCategory": "Subjective Question", + "identifier": "do_11330103476396851218", + "solutions": [ + { + "id": "07c3e152-374c-5430-ddb0-e4001c84c573", + "type": "html", + "value": "

Solution for the subjectiove question

" + } + ], + "qType": "SA", + "answer": "

This is anwser

", + "name": "Subjective Question ", + } + } }; -export const leafFormConfigMock = [ - { - code: "name", - dataType: "text", - description: "Name of the content", - editable: true, - inputType: "text", - label: "Title", - name: "Title", - placeholder: "Title", - renderingHints: { - class: "sb-g-col-lg-1 required", - }, - required: true, - visible: true, - validations: [ - { - type: "max", - value: "100", - message: "Input is Exceeded", - }, - { - type: "required", - message: "Title is required", - }, - ], - default: "test", - }, - { - code: "allowMultiSelect", - dataType: "text", - description: "allowMultiSelect", - editable: true, - index: 5, - default: "Yes", - inputType: "checkbox", - label: "Allow Multi Select", - name: "allowMultiSelect", - placeholder: "allowMultiSelect", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - }, - { - code: "showEvidence", - dataType: "text", - description: "Allow Evidence", - editable: true, - index: 5, - default: "Yes", - inputType: "checkbox", - label: "Allow Evidence", - name: "showEvidence", - placeholder: "showEvidence", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - }, - { - code: "evidenceMimeType", - dataType: "list", - depends: ["showEvidence"], - description: "Evidence", - editable: true, - inputType: "multiselect", - label: "evidence", - name: "evidenceMimeType", - placeholder: "evidence", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - range: null, - }, - { - code: "showRemarks", - dataType: "text", - description: "Allow Remarks", - editable: false, - index: 5, - inputType: "checkbox", - label: "Allow Remarks", - name: "showRemarks", - placeholder: "showRemarks", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - }, - { - code: "remarksLimit", - dataType: "text", - description: "Remark limit", - depends: ["showRemarks"], - editable: false, - inputType: "text", - label: "Remark limit", - name: "remarksLimit", - placeholder: "Add limit", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - }, - { - code: "markAsNotMandatory", - dataType: "text", - description: "markAsNotMandatory", - editable: true, - index: 5, - inputType: "checkbox", - label: "Mark As Not Mandatory", - name: "markAsNotMandatory", - placeholder: "markAsNotMandatory", - renderingHints: { - class: "sb-g-col-lg-1", - }, - required: false, - visible: true, - default: "No", - }, -]; -export const creationContextMock: any = { - objectType: "question", - collectionObjectType: "QuestionSet", - isReadOnlyMode: true, - unitIdentifier: "do_11330102570702438417", - correctionComments: "", - mode: "sourcingreview", - editableFields: { - orgreview: ["name", "learningOutcome"], - sourcingreview: ["name", "learningOutcome"], - }, +export const collectionHierarchyMock = { + "responseCode": "OK", + "result": { + "questionSet": { + "copyright": "NIT123", + "primaryCategory": "Practice Question Set", + "children": [ + { + "parent": "do_11330102570702438417", + "copyright": "NIT123", + "code": "0b145869-f65e-0303-0994-c4b82560bdb6", + "prevStatus": "Review", + "objectType": "Question", + "primaryCategory": "Subjective Question", + "identifier": "do_11330103476396851218", + } + ] + } + } }; export const mockTreeService = { - getChildren: () => { - return ["do_11330103476396851218", "do_233"]; - }, - getFirstChild: () => { - return { - data: { - metadata: {}, - }, - }; - }, - getActiveNode: () => { - return { - data: { - id: "do_11330103476396851218", - }, - getParent: () => { + getChildren: () => { + return ['do_11330103476396851218', 'do_233']; + }, + getActiveNode: () => { return { - getChildren: () => { - return [ - { - data: { - id: "do_11330103476396851218", - }, - }, - ]; - }, + data: { + id : 'do_11330103476396851218' + }, + getParent: () => { + return { + getChildren: () => { + return [{ + data: { + id : 'do_11330103476396851218' + } + }]; + } + }; + } }; - }, - }; - }, - getNodeById: () => {}, - clearTreeCache: () => {}, - updateNode: () => {}, - updateAppIcon: () => {}, -}; - -export const mockEditorCursor = { - setQuestionMap: () => {}, - clearQuestionMap: () => {}, -}; - -export const childMetaData = { - allowMultiSelect: "Yes", - evidenceMimeType: ["audio"], - markAsNotMandatory: "No", - name: "MCQ Question", - remarksLimit: "100", - showEvidence: "Yes", - showRemarks: "Yes", - dateFormat: "dd/mm/yyyy", - autoCapture: "Yes", - numberOnly: "Yes", - characterLimit: "50", -}; - -export const HierarchyMockData = { - do_1133610108714352641210: { - name: "Observation", - children: ["do_1133850220538183681722", "do_1133850220538019841720"], - root: true, - }, - do_1133850220538183681722: { - name: "School InfraStructure", - children: [ - "do_1133850224897638401724", - "do_1133850228043038721726", - "do_1133867265349795841865", - "d07b76a3-56e0-7660-4b49-a556376ae813", - ], - root: false, - }, - do_1133850220538019841720: { - name: "Midday meal", - children: [], - root: false, - }, -}; - -export const BranchingLogic = { - do_1134355569264885761166: { - target: ["do_1134355571590184961168", "do_1134355574936780801170"], - preCondition: {}, - source: [], - }, - do_1134355571590184961168: { - target: [], - source: ["do_1134355569264885761166"], - preCondition: { - and: [ - { - ne: [ - { - var: "do_1134355569264885761166.response1.value", - type: "responseDeclaration", - }, - [0], - ], - }, - ], - }, - }, - do_1134355574936780801170: { - target: [], - source: ["do_1134355569264885761166"], - preCondition: { - and: [ - { - eq: [ - { - var: "do_1134355569264885761166.response1.value", - type: "responseDeclaration", - }, - [1], - ], - }, - ], - }, - }, + } }; diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.spec.ts b/projects/collection-editor-library/src/lib/components/question/question.component.spec.ts index edcdc2cef..e1eff85aa 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.spec.ts +++ b/projects/collection-editor-library/src/lib/components/question/question.component.spec.ts @@ -1,1673 +1,286 @@ -import { QuestionService } from "./../../services/question/question.service"; -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { HttpClientTestingModule } from "@angular/common/http/testing"; -import { QuestionComponent } from "./question.component"; -import { Router } from "@angular/router"; -import { PlayerService } from "../../services/player/player.service"; -import { EditorTelemetryService } from "../../services/telemetry/telemetry.service"; -import { EditorService } from "../../services/editor/editor.service"; -import { ToasterService } from "../../services/toaster/toaster.service"; -import { EditorCursor } from "../../collection-editor-cursor.service"; -import { TreeService } from "../../services/tree/tree.service"; -import { SuiModule } from "ng2-semantic-ui-v9"; -import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { TelemetryInteractDirective } from "../../directives/telemetry-interact/telemetry-interact.directive"; -import { - collectionHierarchyMock, - creationContextMock, - mockData, - readQuestionMock, - mockTreeService, - leafFormConfigMock, - sourcingSettingsMock, - childMetaData, - HierarchyMockData, - BranchingLogic, - mockEditorCursor, -} from "./question.component.spec.data"; -import { of, throwError } from "rxjs"; -import * as urlConfig from "../../services/config/url.config.json"; -import * as labelConfig from "../../services/config/label.config.json"; -import * as categoryConfig from "../../services/config/category.config.json"; -import { ConfigService } from "../../services/config/config.service"; -import { treeNodeData } from "../editor/editor.component.spec.data"; +import { QuestionService } from './../../services/question/question.service'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { QuestionComponent } from './question.component'; +import { Router } from '@angular/router'; +import { PlayerService } from '../../services/player/player.service'; +import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; +import { EditorService } from '../../services/editor/editor.service'; +import { ToasterService } from '../../services/toaster/toaster.service'; +import { EditorCursor } from '../../collection-editor-cursor.service'; +import { TreeService } from '../../services/tree/tree.service'; +import { SuiModule } from 'ng2-semantic-ui-v9'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { TelemetryInteractDirective } from '../../directives/telemetry-interact/telemetry-interact.directive'; +import { collectionHierarchyMock, mockData, readQuestionMock, mockTreeService } from './question.component.spec.data'; +import { of } from 'rxjs'; const mockEditorService = { editorConfig: { config: { hierarchy: { level1: { - name: "Module", - type: "Unit", - mimeType: "application/vnd.ekstep.content-collection", - contentType: "Course Unit", - iconClass: "fa fa-folder-o", - children: {}, - }, - }, - }, + name: 'Module', + type: 'Unit', + mimeType: 'application/vnd.ekstep.content-collection', + contentType: 'Course Unit', + iconClass: 'fa fa-folder-o', + children: {} + } + } + } }, - parentIdentifier: "", - optionsLength: 4, - selectedChildren: { - primaryCategory: "Multiselect Multiple Choice Question", - label: "Multiple Choice Question", - interactionType: "choice", - }, - getToolbarConfig: () => {}, - getHierarchyObj: () => {}, - fetchCollectionHierarchy: (questionSetId) => { - subscribe: (fn) => fn(collectionHierarchyMock); - }, - updateCollection: (questionSetId, event) => { - subscribe: (fn) => fn({}); - }, - addResourceToQuestionset: (questionSetId, unitId, questionId) => { - subscribe: (fn) => fn({}); - }, - apiErrorHandling: () => {}, + selectedChildren: {}, + getToolbarConfig: () => { }, + fetchCollectionHierarchy: (questionSetId) => { } }; -describe("QuestionComponent", () => { - const configStub = { - urlConFig: (urlConfig as any).default, - labelConfig: (labelConfig as any).default, - categoryConfig: (categoryConfig as any).default, - }; - +describe('QuestionComponent', () => { let component: QuestionComponent; let fixture: ComponentFixture; - let treeService, - editorService, - telemetryService, - questionService, - configService, - toasterService; class RouterStub { - navigate = jasmine.createSpy("navigate"); + navigate = jasmine.createSpy('navigate'); } beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [QuestionComponent, TelemetryInteractDirective], imports: [HttpClientTestingModule, SuiModule], - providers: [ - EditorTelemetryService, - QuestionService, - ToasterService, - PlayerService, - { provide: ConfigService, useValue: configStub }, - { provide: EditorService, useValue: mockEditorService }, - { provide: Router, useClass: RouterStub }, - EditorCursor, - { provide: TreeService, useValue: mockTreeService }, - { provide: EditorCursor, useValue: mockEditorCursor }, - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - }).compileComponents(); + providers: [EditorTelemetryService, QuestionService, ToasterService, + PlayerService, { provide: EditorService, useValue: mockEditorService }, { provide: Router, useClass: RouterStub }, EditorCursor, + { provide: TreeService, useValue: mockTreeService }], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(QuestionComponent); component = fixture.componentInstance; component.questionInput = { - questionSetId: "do_11330102570702438417", - questionId: "do_1134357224765685761203", - setChildQueston: undefined, - }; - component.questionId = "do_1134357224765685761203"; - component.questionInteractionType = "choice"; - editorService = TestBed.inject(EditorService); - configService = TestBed.inject(ConfigService); - telemetryService = TestBed.inject(EditorTelemetryService); - treeService = TestBed.get(TreeService); - questionService = TestBed.get(QuestionService); - toasterService = TestBed.get(ToasterService); - spyOn(telemetryService, "impression").and.callFake(() => {}); - editorService.selectedChildren.label = "Slider"; - component.toolbarConfig.showPreview = false; - component.creationContext = creationContextMock; - editorService.optionsLength = 4; - editorService.selectedChildren.label = "MCQ"; - component.questionInput = { - questionSetId: "do_11330102570702438417", - questionId: "do_11330103476396851218", - type: undefined, - category: "MTF", - config: {}, - creationContext: creationContextMock, - setChildQueston: undefined, + "questionSetId": "do_11330102570702438417", + "questionId": "do_11330103476396851218" }; - component.showTranslation = false; - spyOn(treeService, "getNodeById").and.callFake(()=>{ - return treeNodeData; - }) - - // fixture.detectChanges(); - }); - - it("should create", () => { - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "true", - }); + let editorService: EditorService = TestBed.inject(EditorService); + let telemetryService: EditorTelemetryService = TestBed.inject(EditorTelemetryService); + spyOn(telemetryService, 'impression').and.callFake(() => { }); + spyOn(component, 'initialize').and.callThrough(); + spyOn(editorService, 'getToolbarConfig').and.returnValue({ title: 'abcd', showDialcode: 'No', showPreview: '' }); + spyOn(editorService, 'fetchCollectionHierarchy').and.returnValue(of(collectionHierarchyMock)); + let questionService: QuestionService = TestBed.inject(QuestionService); + spyOn(questionService, 'readQuestion').and.returnValue(of(readQuestionMock)); + fixture.detectChanges(); + }); + + it('should create', () => { expect(component).toBeTruthy(); }); - it("#saveQuestions call on click save button", () => { - spyOn(component, "saveQuestions"); - const metaData = mockData.textQuestionNetaData.result.question; - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveQuestions(metaData, "create"); - expect(component.saveQuestion); - }); - it("Unit test for #ngOnInit()", () => { - component.toolbarConfig = editorService.toolbarConfig; - component.questionFormConfig = leafFormConfigMock; - component.questionInput = { - questionSetId: "do_11330102570702438417", - questionId: "do_11330103476396851218", - type: 'choice', - category: "MTF", - config: {}, - creationContext: creationContextMock, - setChildQueston: undefined, - }; - component.creationContext.objectType = "question"; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "", - }); - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.mcqQuestionMetaData) - ); - component.ngOnInit(); - expect(component.questionInteractionType).toEqual("choice"); - expect(component.questionCategory).toEqual("MTF"); - expect(component.questionId).toEqual("do_11330103476396851218"); - expect(component.questionSetId).toEqual("do_11330102570702438417"); - expect(component.creationContext).toEqual(creationContextMock); - expect(component.unitId).toEqual(creationContextMock.unitIdentifier); - expect(component.isReadOnlyMode).toEqual( - creationContextMock.isReadOnlyMode - ); - expect(component.toolbarConfig).toBeDefined(); - expect(component.toolbarConfig.showPreview).toBeFalsy(); - expect(component.questionInput.setChildQueston).toBeFalsy(); - }); - - it("Unit test for #ngOnInit() fetchCollectionHierarchy api fail case", () => { - spyOn(component, "ngOnInit").and.callThrough(); - component.toolbarConfig = editorService.toolbarConfig; - component.questionFormConfig = leafFormConfigMock; - component.questionInput = { - questionSetId: "do_11330102570702438417", - questionId: "do_11330103476396851218", - type: "default", - category: "MTF", - config: {}, - creationContext: creationContextMock, - setChildQueston: true, - }; - component.creationContext.objectType = "question"; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "", - }); - spyOn(editorService, "fetchCollectionHierarchy").and.returnValue( - throwError("error") - ); - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.mcqQuestionMetaData) - ); - component.ngOnInit(); - expect(component.ngOnInit).toHaveBeenCalled(); - expect(component.questionInput.setChildQueston).toBeTruthy(); - }); - - it("#initialize should call when question page for question mcq", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - component.questionPrimaryCategory = undefined; - component.initialLeafFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionId = "do_123"; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.mcqQuestionMetaData) - ); - component.questionMetaData = mockData.mcqQuestionMetaData.result.question; - component.questionInteractionType = "choice"; - component.scoreMapping = - mockData.mcqQuestionMetaData.result.question.responseDeclaration.response1.mapping; - component.sourcingSettings = sourcingSettingsMock; - component.questionInput.setChildQuestion = false; - component.editorState.solutions=[{ - id:'1', - type:'vedio' - }] - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); - }); - - it("#initialize should call when question page for question mcq api fail", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return throwError("error"); - }); - component.questionId = "do_123"; - spyOn(editorService, "apiErrorHandling").and.callFake(() => {}); - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); - }); - - it("#initialize should call when question page for question slider", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionId = "do_11330103476396851218"; - component.questionInteractionType = "slider"; - editorService.parentIdentifier = undefined; - component.questionPrimaryCategory = "Slider"; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - component.questionId = "do_1234"; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.sliderQuestionMetaData) - ); - component.questionMetaData = - mockData.sliderQuestionMetaData.result.question; - component.editorState = - mockData.sliderQuestionMetaData.result.question.editorState; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); - }); - - it("#initialize should call when question page for question text", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionInteractionType = "text"; - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - component.questionId = "do_1235"; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.textQuestionNetaData) - ); - component.questionMetaData = mockData.textQuestionNetaData.result.question; - component.editorState = - mockData.textQuestionNetaData.result.question.editorState; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + xit('should call populateFormData ', () => { + component.leafFormConfig = mockData.childMetadata; + component.questionMetaData = mockData.questionMetaData; + component.populateFormData(); + expect(component.questionMetaData).toBe(mockData.questionMetaData); + expect(component.leafFormConfig).toBe(mockData.childMetadata); }); - - it("#initialize should call when question page for question date", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionInteractionType = "date"; - component.questionId = "do_11330103476396851218"; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - editorService.parentIdentifier = undefined; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionId = "do_126"; - component.questionPrimaryCategory = undefined; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.dateQuestionMetaDate) - ); - component.questionMetaData = mockData.dateQuestionMetaDate.result.question; - component.editorState = - mockData.dateQuestionMetaDate.result.question.editorState; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('should call previewFormData ', () => { + component.leafFormConfig = mockData.childMetadata; + component.previewFormData(true); + expect(component.leafFormConfig).toEqual(mockData.childMetadata); }); - - it("#initialize should call when question page for question default", () => { - spyOn(component, "initialize").and.callThrough(); - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.defaultQuestionMetaData) - ); - component.questionMetaData = - mockData.defaultQuestionMetaData.result.question; - component.questionInteractionType = "default"; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('should call valueChanges', () => { + component.valueChanges(mockData.formData); + expect(component.childFormData).toEqual(mockData.formData); }); - - it("#initialize should call when question page for question mcq", () => { - spyOn(component, "initialize").and.callThrough(); - component.initialLeafFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - component.questionFormConfig = leafFormConfigMock; - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionId = undefined; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.mcqQuestionMetaData) - ); - component.questionMetaData = mockData.mcqQuestionMetaData.result.question; - component.editorState = - mockData.mcqQuestionMetaData.result.question.editorState; - spyOn(editorService, "apiErrorHandling").and.callFake(() => {}); - component.questionMetaData = mockData.mcqQuestionMetaData; - component.questionInteractionType = "choice"; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('should call validateFormFields', () => { + component.leafFormConfig = mockData.childMetadata; + component.childFormData = mockData.formData; + const toasterService = TestBed.get(ToasterService); + spyOn(toasterService, 'error').and.callThrough(); + component.validateFormFields(); + expect(component.showFormError).toBeFalsy(); }); - - it("#initialize should call when question page for question slider", () => { - spyOn(component, "initialize").and.callThrough(); - component.initialLeafFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionId = undefined; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.sliderQuestionMetaData) - ); - component.questionMetaData = mockData.sliderQuestionMetaData; - component.questionInteractionType = "slider"; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('#populateFrameworkData() should call populateFrameworkData and set leafFormConfig values ', () => { + component.frameworkDetails.frameworkData = mockData.frameWorkDetails.frameworkData; + component.leafFormConfig = mockData.formData; + component.populateFrameworkData(); + expect(component.leafFormConfig).toBeDefined(); }); - - it("#initialize should call when question page for question text", () => { - spyOn(component, "initialize").and.callThrough(); - component.initialLeafFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - component.questionFormConfig = leafFormConfigMock; - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionId = undefined; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.textQuestionNetaData) - ); - component.questionMetaData = mockData.textQuestionNetaData; - component.questionInteractionType = "text"; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('#outputData() should call outputData', () => { + spyOn(component, 'output'); + component.output(''); + expect(component.output).toHaveBeenCalled(); }); - - it("#initialize should call when question page for question date", () => { - spyOn(component, "initialize").and.callThrough(); - component.initialLeafFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - component.questionFormConfig = leafFormConfigMock; - component.questionId = "do_11330103476396851218"; - editorService.parentIdentifier = undefined; - spyOn(editorService, "getToolbarConfig").and.returnValue({ - title: "abcd", - showDialcode: "No", - showPreview: "false", - }); - component.toolbarConfig.showPreview = false; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - spyOn(questionService, "readQuestion").and.returnValue( - of(mockData.dateQuestionMetaDate) - ); - component.questionInteractionType = "date"; - component.initialize(); - expect(component.initialize).toHaveBeenCalled(); + it('#onStatusChanges() should call onStatusChanges', () => { + spyOn(component, 'onStatusChanges'); + component.onStatusChanges(''); + expect(component.onStatusChanges).toHaveBeenCalled(); }); - - it("#toolbarEventListener() should call toolbarEventListener for saveContent", () => { - const event = { button: "saveContent" }; - component.actionType = event.button; - spyOn(component, "saveContent"); - component.toolbarEventListener(event); - expect(component.toolbarEventListener).toHaveBeenCalledWith; + xit('#ngAfterViewInit() should call ngAfterViewInit and emit telemetry impression event', () => { + const data = { type: 'edit', pageid: undefined, uri: undefined, duration: 0 }; + spyOn(component.telemetryService, 'impression'); + component.ngAfterViewInit(); + expect(component.telemetryService.impression).toHaveBeenCalled(); }); - - it("#toolbarEventListener() should call toolbarEventListener for showTranslation", () => { - spyOn(component, "toolbarEventListener").and.callThrough(); - const event = { button: "showTranslation" }; - component.actionType = event.button; - component.toolbarEventListener(event); - expect(component.toolbarEventListener).toHaveBeenCalledWith(event); - expect(component.showTranslation).toBe(true); + it('#toolbarEventListener() should call toolbarEventListener for saveContent', () => { + const data = { button: 'saveContent' }; + spyOn(component, 'saveContent'); + component.toolbarEventListener(data); + expect(component.saveContent).toHaveBeenCalled(); }); - - it("#toolbarEventListener() should call toolbarEventListener for cancelContent", () => { - const data = { button: "cancelContent" }; - spyOn(component, "handleRedirectToQuestionset"); + it('#toolbarEventListener() should call toolbarEventListener for cancelContent', () => { + const data = { button: 'cancelContent' }; + spyOn(component, 'handleRedirectToQuestionset'); component.toolbarEventListener(data); expect(component.handleRedirectToQuestionset).toHaveBeenCalled(); }); - it("#toolbarEventListener() should call toolbarEventListener for backContent", () => { - const data = { button: "backContent" }; - spyOn(component, "handleRedirectToQuestionset"); + it('#toolbarEventListener() should call toolbarEventListener for backContent', () => { + const data = { button: 'backContent' }; + spyOn(component, 'handleRedirectToQuestionset'); component.toolbarEventListener(data); expect(component.handleRedirectToQuestionset).toHaveBeenCalled(); }); - it("#toolbarEventListener() should call toolbarEventListener for previewContent", () => { - const data = { button: "previewContent" }; - spyOn(component, "previewContent"); + it('#toolbarEventListener() should call toolbarEventListener for previewContent', () => { + const data = { button: 'previewContent' }; + spyOn(component, 'previewContent'); component.toolbarEventListener(data); expect(component.previewContent).toHaveBeenCalled(); }); - it("#toolbarEventListener() should call toolbarEventListener for editContent", () => { - const data = { button: "editContent" }; - spyOn(component, "previewFormData"); + it('#toolbarEventListener() should call toolbarEventListener for editContent', () => { + const data = { button: 'editContent' }; + spyOn(component, 'previewFormData'); component.toolbarEventListener(data); expect(component.previewFormData).toHaveBeenCalledWith(true); expect(component.showPreview).toBeFalsy(); expect(component.toolbarConfig.showPreview).toBeFalsy(); }); - it("#toolbarEventListener() should call toolbarEventListener for submitQuestion", () => { - const data = { button: "submitQuestion" }; - spyOn(component, "submitHandler"); - component.toolbarEventListener(data); - expect(component.submitHandler).toHaveBeenCalledWith(); - }); - it("#toolbarEventListener() should call toolbarEventListener for rejectQuestion", () => { - const data = { button: "rejectQuestion", comment: "test comment" }; - spyOn(component, "rejectQuestion"); - component.toolbarEventListener(data); - expect(component.rejectQuestion).toHaveBeenCalledWith(data.comment); - }); - it("#toolbarEventListener() should call toolbarEventListener for publishQuestion", () => { - const data = { button: "publishQuestion" }; - spyOn(component, "publishQuestion"); - component.toolbarEventListener(data); - expect(component.publishQuestion).toHaveBeenCalledWith(data); - }); - it("#toolbarEventListener() should call toolbarEventListener for sourcingApproveQuestion", () => { - const data = { button: "sourcingApproveQuestion" }; - spyOn(component, "sourcingUpdate"); - component.toolbarEventListener(data); - expect(component.sourcingUpdate).toHaveBeenCalledWith(data); - }); - it("#toolbarEventListener() should call toolbarEventListener for sourcingRejectQuestion", () => { - const data = { button: "sourcingRejectQuestion" }; - spyOn(component, "sourcingUpdate"); - component.toolbarEventListener(data); - expect(component.sourcingUpdate).toHaveBeenCalledWith(data); - }); - it("#toolbarEventListener() should call toolbarEventListener for showReviewcomments", () => { - const data = { button: "showReviewcomments" }; - component.showReviewModal = true; - component.toolbarEventListener(data); - expect(component.showReviewModal).toBeFalsy(); - }); - it("#toolbarEventListener() should call toolbarEventListener for sendForCorrectionsQuestion", () => { - const data = { button: "sendForCorrectionsQuestion" }; - spyOn(component, "sendBackQuestion"); - component.toolbarEventListener(data); - expect(component.sendBackQuestion).toHaveBeenCalledWith(data); - }); - it("#toolbarEventListener() should call toolbarEventListener for default case", () => { - const data = { button: "" }; - spyOn(component, "toolbarEventListener"); + it('#toolbarEventListener() should call toolbarEventListener for default case', () => { + const data = { button: '' }; + spyOn(component, 'toolbarEventListener'); component.toolbarEventListener(data); expect(component.toolbarEventListener).toHaveBeenCalledWith(data); }); - - it("Unit test for #populateFormData ", () => { - component.childFormData = {}; - component.questionMetaData=mockData.mcqQuestionMetaData.result.question; - component.leafFormConfig = leafFormConfigMock; - component.initialLeafFormConfig = leafFormConfigMock; - component.questionFormConfig = leafFormConfigMock; - component.questionId = "do_123"; - component.questionSetHierarchy = collectionHierarchyMock.result.questionSet; - component.populateFormData(); - }); - it("should call previewFormData ", () => { - spyOn(component, "previewFormData").and.callThrough(); - component.initialLeafFormConfig = mockData.childMetadata.properties; - component.childFormData = childMetaData; - component.questionFormConfig = mockData.childMetadata.properties; - component.leafFormConfig = mockData.childMetadata.properties; - component.previewFormData(true); - expect(component.leafFormConfig).toEqual(mockData.childMetadata.properties); - expect(component.previewFormData).toHaveBeenCalled(); - }); - it("should call valueChanges", () => { - component.valueChanges(childMetaData); - expect(component.childFormData).toEqual(childMetaData); - }); - it("should call validateFormFields", () => { - component.leafFormConfig = mockData.childMetadata; - component.childFormData = childMetaData; - const toasterService = TestBed.get(ToasterService); - spyOn(toasterService, "error").and.callThrough(); - component.validateFormFields(); - expect(component.showFormError).toBeFalsy(); - }); - - it("#populateFrameworkData() should call populateFrameworkData and set leafFormConfig values ", () => { - component.frameworkDetails.frameworkData = - mockData.frameWorkDetails.frameworkData; - component.questionFormConfig = leafFormConfigMock; - component.leafFormConfig = leafFormConfigMock; - component.populateFrameworkData(); - expect(component.leafFormConfig).toBeDefined(); - }); - it("#outputData() should call outputData", () => { - spyOn(component, "output").and.callThrough(); - component.output({}); - expect(component.output).toHaveBeenCalled(); - }); - it("#onStatusChanges() should call onStatusChanges", () => { - spyOn(component, "onStatusChanges"); - component.onStatusChanges(""); - expect(component.onStatusChanges).toHaveBeenCalled(); - }); - - it("call #getMcqQuestionHtmlBody() to verify questionBody", () => { - const question = '
{question}
'; - const templateId = "mcq-vertical"; - component.getMcqQuestionHtmlBody(question, templateId); - }); - - it("Unit test for #sendForReview", () => { - spyOn(component, "upsertQuestion"); - component.sendForReview(); - expect(component.upsertQuestion).toHaveBeenCalled(); - }); - - it("Unit test for #setQuestionId", () => { - spyOn(component, "setQuestionTitle"); - component.setQuestionId("do_11330103476396851218"); - expect(component.questionId).toEqual("do_11330103476396851218"); - expect(component.setQuestionTitle); - }); - - it("#submitHandler() should call #validateQuestionData and #validateFormFields", () => { - spyOn(component, "validateQuestionData"); - spyOn(component, "validateFormFields"); - component.showFormError = false; - component.submitHandler(); - expect(component.validateQuestionData).toHaveBeenCalledWith(); - expect(component.validateFormFields).toHaveBeenCalledWith(); - }); - it("#rejectQuestion() should call #requestForChanges", () => { - const comment = "test comment"; - spyOn(component, "requestForChanges"); - component.showFormError = false; - component.rejectQuestion(comment); - expect(component.requestForChanges).toHaveBeenCalledWith(comment); - }); - it("#handleRedirectToQuestionset() should call handleRedirectToQuestionset and redirectToQuestionset to be called ", () => { - component.questionId = "do_11326368076523929611"; - spyOn(component, "redirectToQuestionset"); + it('#handleRedirectToQuestionset() should call handleRedirectToQuestionset and redirectToQuestionset to be called ', () => { + component.questionId = 'do_11326368076523929611'; + spyOn(component, 'redirectToQuestionset'); component.handleRedirectToQuestionset(); expect(component.showConfirmPopup).toBeFalsy(); expect(component.redirectToQuestionset).toHaveBeenCalled(); }); - it("redirectToQuestionset should call handleRedirectToQuestionset and set showConfirmPopup", () => { + it('redirectToQuestionset should call handleRedirectToQuestionset and set showConfirmPopup', () => { component.questionId = undefined; - spyOn(component, "redirectToQuestionset"); + spyOn(component, 'redirectToQuestionset'); component.handleRedirectToQuestionset(); expect(component.showConfirmPopup).toBeTruthy(); }); - it("Unit test for #showHideSpinnerLoader", () => { - component.showHideSpinnerLoader(true, "review"); - expect(component.buttonLoaders.saveButtonLoader).toEqual(true); - expect(component.buttonLoaders.review).toEqual(true); - }); - it("Unit test for #isEditable without queston id", () => { - component.creationContext = creationContextMock; - component.questionId=undefined; - expect(component.isEditable("bloomsLevel")).toBeTruthy(); - }); - it("Unit test for #isEditable with queston id", () => { - component.creationContext = creationContextMock; - expect(component.isEditable("bloomsLevel")).toBeFalsy(); - }); - it("Unit test for #prepareQuestionBody", () => { - spyOn(component, "prepareQuestionBody").and.callThrough(); - component.prepareQuestionBody(); - expect(component.prepareQuestionBody).toHaveBeenCalled(); - }); - it("#saveContent() should call saveContent and set showFormError ", () => { - spyOn(component, "validateQuestionData"); - spyOn(component, "validateFormFields"); - spyOn(component, "saveQuestion"); + it('#saveContent() should call saveContent and set showFormError ', () => { + spyOn(component, 'validateQuestionData'); + spyOn(component, 'validateFormFields'); + spyOn(component, 'saveQuestion'); component.showFormError = false; component.saveContent(); expect(component.showFormError).toBeFalsy(); expect(component.saveQuestion).toHaveBeenCalled(); }); - it("#redirectToQuestionset() should call redirectToQuestionset and set showConfirmPopup", () => { - spyOn(component.questionEmitter, "emit"); + it('#redirectToQuestionset() should call redirectToQuestionset and set showConfirmPopup', () => { + spyOn(component.questionEmitter, 'emit'); component.redirectToQuestionset(); expect(component.showConfirmPopup).toBeFalsy(); }); - it("#editorDataHandler() should call editorDataHandler for not any type", () => { + it('#editorDataHandler() should call editorDataHandler for not any type', () => { component.editorState = mockData.editorState; component.editorDataHandler(mockData.eventData); expect(component.editorState).toBeDefined(); }); - it("#editorDataHandler() should call editorDataHandler for question", () => { + it('#editorDataHandler() should call editorDataHandler for question', () => { component.editorState = mockData.editorState; - component.editorDataHandler(mockData.eventData, "question"); + component.editorDataHandler(mockData.eventData, 'question'); expect(component.editorState).toBeDefined(); }); - it("#editorDataHandler() should call editorDataHandler for solution", () => { + it('#editorDataHandler() should call editorDataHandler for solution', () => { component.editorState = mockData.editorState; - component.editorDataHandler(mockData.eventData, "solution"); + component.editorDataHandler(mockData.eventData, 'solution'); expect(component.editorState).toBeDefined(); }); - it("#editorDataHandler() should call editorDataHandler for media", () => { + it('#editorDataHandler() should call editorDataHandler for media', () => { component.editorState = mockData.editorState; - mockData.eventData.mediaobj = { id: "1234" }; - spyOn(component, "setMedia"); + mockData.eventData.mediaobj = { id: '1234' }; + spyOn(component, 'setMedia'); component.editorDataHandler(mockData.eventData); expect(component.editorState).toBeDefined(); - expect(component.setMedia).toHaveBeenCalledWith( - mockData.eventData.mediaobj - ); + expect(component.setMedia).toHaveBeenCalledWith(mockData.eventData.mediaobj); }); - it("#setMedia should call setMedia and set media arry", () => { + it('#setMedia should call setMedia and set media arry', () => { component.editorState = mockData.editorState; - component.mediaArr = [{ id: "6789" }]; - component.setMedia({ id: "1234" }); + component.mediaArr = [{ id: '6789' }]; + component.setMedia({ id: '1234' }); expect(component.mediaArr).toBeDefined(); }); - it("#saveQuestion() should call saveQuestion for updateQuestion throw error", () => { - component.editorState = mockData.editorState; - component.questionId = undefined; - spyOn(treeService, "getFirstChild").and.callFake(() => { - return { data: { metadata: { identifier: "0123" } } }; - }); - spyOn(treeService, "getActiveNode").and.callFake(() => { - return { data: { root: true } }; - }); - component.creationContext = creationContextMock; - spyOn(questionService, "upsertQuestion").and.returnValue( - of({ - result: { - identifiers: { - "1234": "do_123", - }, - }, - }) - ); - spyOn(questionService, "updateHierarchyQuestionUpdate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - const metaData = mockData.textQuestionNetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.selectedSolutionType='12345'; - component.questionInteractionType = "text"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - component.prepareQuestionBody(); - component.updateQuestion(); - component.saveQuestion(); - }); - - it('#getQuestionMetadata shpuld call when queston body is prepared',()=>{ - spyOn(component,'getQuestionMetadata').and.callThrough(); - component.editorState=mockData.sliderQuestionMetaData.result.question; - component.selectedSolutionType="2432432" - component.questionInteractionType='slider'; - component.getResponseDeclaration('slider') - component.getQuestionMetadata(); - expect(component.getQuestionMetadata).toHaveBeenCalled(); - }) - - it("#saveQuestion() should call saveQuestion for updateQuestion objectType not a question", () => { - component.editorState = mockData.editorState; - component.questionId = "do_11326368076523929611"; - spyOn(component, "updateQuestion"); - creationContextMock.objectType = "questionSet"; - component.creationContext = creationContextMock; - spyOn(treeService, "getFirstChild").and.callFake(() => { - return { data: { metadata: { identifier: "0123" } } }; - }); - spyOn(treeService, "getActiveNode").and.callFake(() => { - return { data: { root: true } }; - }); - spyOn(questionService, "upsertQuestion").and.returnValue( - of({ - result: { - identifiers: { - "1234": "do_123", - }, - }, - }) - ); - component.saveQuestion(); - expect(component.updateQuestion); - }); - - it("#saveQuestion() should call saveQuestion for updateQuestion api error when there is question id", () => { + it('#saveQuestion() should call saveQuestion for updateQuestion', () => { component.editorState = mockData.editorState; - component.questionId = "do_11326368076523929611"; - spyOn(component, "updateQuestion"); - creationContextMock.objectType = "QuestionSet"; - component.creationContext = creationContextMock; - spyOn(questionService, "upsertQuestion").and.returnValue( - throwError("error") - ); - component.saveQuestion(); - expect(component.updateQuestion); - }); - it("#saveQuestion() should call saveQuestion for updateQuestion api error when new question", () => { - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.questionId = undefined; - spyOn(component, "updateQuestion"); - creationContextMock.objectType = "QuestionSet"; - component.creationContext = creationContextMock; - component.childFormData = childMetaData; - component.setQuestionTypeValues( - mockData.mcqQuestionMetaData.result.question - ); - spyOn(questionService, "updateHierarchyQuestionCreate").and.returnValue( - throwError("error") - ); + component.questionId = 'do_11326368076523929611'; + spyOn(component, 'updateQuestion'); component.saveQuestion(); - expect(component.updateQuestion); - }); - - it("#saveQuestion() should call saveQuestion for updateQuestion save successfully", () => { - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.questionId = undefined; - spyOn(component, "updateQuestion"); - creationContextMock.objectType = "QuestionSet"; - component.creationContext = creationContextMock; - component.childFormData = childMetaData; - component.setQuestionTypeValues( - mockData.mcqQuestionMetaData.result.question - ); - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveQuestion(); - expect(component.updateQuestion); - }); - - it("#createQuestion() should call when child question", () => { - spyOn(component, "createQuestion"); - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.questionId = "do_11326368076523929611"; - component.showOptions = true; - component.questionId = "do_1134355571590184961168"; - component.selectedSectionId = "do_1134347209749299201119"; - component.showFormError = false; - component.showOptions = true; - component.isChildQuestion = true; - component.condition = "eq"; - component.selectedOptions = 1; - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveContent(); - component.updateQuestion(); - component.buildCondition("create"); - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - component.createQuestion(); - expect(component.createQuestion); - }); - - - it("#createQuestion() should call when child question", () => { - component.questionId = "do_11326368076523929611"; - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.showOptions = false; - spyOn(questionService, "updateHierarchyQuestionCreate").and.returnValue( - throwError("error") - ); - component.createQuestion(); - }); - - it("#createQuestion() should call when child question api success", () => { - component.questionId = "1234"; - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.showOptions = false; - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.createQuestion(); + expect(component.updateQuestion).toHaveBeenCalled(); }); - - it("#deleteSolution() should call deleteSolution and set showSolutionDropDown value", () => { + it('#deleteSolution() should call deleteSolution and set showSolutionDropDown value', () => { component.editorState = mockData.editorState; component.deleteSolution(); expect(component.showSolutionDropDown).toBeTruthy(); }); - it("#deleteSolution() should call deleteSolution and define mediaArr for video type", () => { + it('#deleteSolution() should call deleteSolution and define mediaArr for video type', () => { component.editorState = mockData.editorState; - component.selectedSolutionType = "video"; + component.selectedSolutionType = 'video'; component.deleteSolution(); expect(component.mediaArr).toBeDefined(); }); - it("#validateQuestionData() should call validateQuestionData and question is undefined", () => { + it('#validateQuestionData() should call validateQuestionData and question is undefined', () => { component.editorState = mockData.editorState; component.editorState.question = undefined; component.validateQuestionData(); expect(component.showFormError).toBeTruthy(); }); - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is default", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.defaultQuestionMetaData.result.question; - component.editorState.question = "

Hi how are you

"; - component.questionInteractionType = "default"; - component.editorState.answer = "0"; + it('#validateQuestionData() should call validateQuestionData and questionInteractionType is default', () => { + component.editorState = mockData.editorState; + component.editorState.question = '

Hi how are you

'; + component.questionInteractionType = 'default'; component.validateQuestionData(); expect(component.showFormError).toBeFalsy(); }); - - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is default", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.defaultQuestionMetaData.result.question; - component.questionInteractionType = "default"; - component.editorState.question = "

Hi how are you

"; - component.editorState.answer = ""; + it('#validateQuestionData() should call validateQuestionData and questionInteractionType is default', () => { + component.editorState = mockData.editorState; + component.editorState.question = '

Hi how are you

'; + component.editorState.answer = ''; + component.questionInteractionType = 'default'; component.validateQuestionData(); expect(component.showFormError).toBeTruthy(); }); - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is mcq", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.editorState.question = "

Hi how are you

"; - component.editorState.answer = ""; - component.questionInteractionType = "choice"; - component.validateQuestionData(); - expect(component.showFormError).toBeFalsy(); - }); - - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is text", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.textQuestionNetaData.result.question; - component.editorState.question = "

Hi how are you

"; - component.questionInteractionType = "text"; - component.validateQuestionData(); - expect(component.showFormError).toBeFalsy(); - }); - - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is date", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.dateQuestionMetaDate.result.question; - component.editorState.question = "

Hi how are you

"; - component.questionInteractionType = "date"; - component.validateQuestionData(); - expect(component.showFormError).toBeFalsy(); - }); - - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is slider", () => { - component.sourcingSettings = sourcingSettingsMock; - component.editorState = mockData.sliderQuestionMetaData.result.question; - component.editorState.question = "

Hi how are you

"; - component.questionInteractionType = "slider"; - component.sliderDatas = - mockData.sliderQuestionMetaData.result.question.interactions.response1; - component.validateQuestionData(); - expect(component.showFormError).toBeFalsy(); - }); - - it("#validateQuestionData() should call validateQuestionData and questionInteractionType is slider empty data", () => { - component.sourcingSettings = sourcingSettingsMock; + it('#validateQuestionData() should call validateQuestionData and questionInteractionType is default', () => { component.editorState = mockData.editorState; - component.editorState.question = "

Hi how are you

"; - component.questionInteractionType = "slider"; - component.sliderDatas = {}; - component.configService = configService; + component.editorState.question = '

Hi how are you

'; + component.editorState.answer = ''; + component.questionInteractionType = 'choice'; component.validateQuestionData(); expect(component.showFormError).toBeTruthy(); }); - - it("call #sourcingUpdate() for sourcingRejectQuestion to verify inputs for #editorService.updateCollection", () => { - component.creationContext = creationContextMock; - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - spyOn(editorService, "updateCollection").and.returnValue(of({})); - const questionSet = collectionHierarchyMock.result["questionSet"]; - component.questionId = "do_11326368076523929611"; - component.actionType = "sourcingRejectQuestion"; - const data = { - button: "sourcingRejectQuestion", - comment: "test comment for rejection", - }; - const requestBody = { - request: { - questionset: { - rejectedContributions: [ - ...questionSet.rejectedContributions, - component.questionId, - ], - rejectedContributionComments: { - ...questionSet.rejectedContributionComments, - do_11326368076523929611: data.comment, - }, - }, - }, - }; - const toasterService = TestBed.get(ToasterService); - spyOn(toasterService, 'success').and.callFake(() => { }); - component.sourcingUpdate(data); - }); - - it("call #sourcingUpdate() for sourcingApproveQuestion to verify inputs for #editorService.updateCollection", () => { - component.creationContext = creationContextMock; - spyOn(editorService, "fetchCollectionHierarchy").and.returnValue(of()); - spyOn(questionService, "readQuestion").and.returnValue( - of(readQuestionMock) - ); - spyOn(editorService, "updateCollection").and.returnValue(of({})); - const questionSet = collectionHierarchyMock.result["questionSet"]; - component.questionId = "do_11326368076523929611"; - component.actionType = "sourcingApproveQuestion"; - const data = { button: "sourcingApproveQuestion" }; - const requestBody = { - request: { - questionset: { - acceptedContributions: [ - ...questionSet.acceptedContributions, - component.questionId, - ], - }, - }, - }; - const toasterService = TestBed.get(ToasterService); - spyOn(toasterService, 'success').and.callFake(() => { }); - component.sourcingUpdate(data); - // expect(editorService.updateCollection).toHaveBeenCalledWith('do_11330102570702438417', { ...data, requestBody }); - }); - it("#sourcingUpdate() should call #redirectToChapterList() for sourcingApproveQuestion", () => { - spyOn(component, "redirectToChapterList"); - spyOn(editorService, "fetchCollectionHierarchy").and.returnValue(of()); - spyOn(questionService, "readQuestion").and.returnValue( - of(readQuestionMock) - ); - spyOn(editorService, "updateCollection").and.returnValue(of({})); - component.creationContext = creationContextMock; - component.questionId = "do_11326368076523929611"; - component.actionType = "sourcingApproveQuestion"; - const data = { button: "sourcingApproveQuestion" }; - const toasterService = TestBed.get(ToasterService); - spyOn(toasterService, 'success').and.callFake(() => { }); - component.sourcingUpdate(data); - expect(component.redirectToChapterList); - }); - it("#sourcingUpdate() should call #redirectToChapterList() for sourcingRejectQuestion api error", () => { - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - spyOn(editorService, "updateCollection").and.returnValue(of({})); - component.creationContext = creationContextMock; - component.questionId = "do_11326368076523929611"; - component.actionType = "sourcingRejectQuestion"; - const data = { - button: "sourcingRejectQuestion", - comment: "test comment for rejection", - }; - spyOn(editorService, "addResourceToQuestionset").and.returnValue( - throwError({}) - ); - component.sourcingUpdate(data); - component.addResourceToQuestionset(); - }); - - it("#sourcingUpdate() should call #redirectToChapterList() for sourcingRejectQuestion", () => { - spyOn(editorService, "fetchCollectionHierarchy").and.callFake(() => { - return of(collectionHierarchyMock); - }); - spyOn(editorService, "updateCollection").and.returnValue(of({})); - component.creationContext = creationContextMock; - component.questionId = "do_11326368076523929611"; - component.actionType = "sourcingRejectQuestion"; - const data = { - button: "sourcingRejectQuestion", - comment: "test comment for rejection", - }; - spyOn(editorService, "addResourceToQuestionset").and.returnValue(of({})); - component.sourcingUpdate(data); - component.addResourceToQuestionset(); - }); - - it("#videoDataOutput() should call videoDataOutput and event data is empty", () => { - const event = ""; - spyOn(component, "deleteSolution"); + it('#videoDataOutput() should call videoDataOutput and event data is empty', () => { + const event = ''; + spyOn(component, 'deleteSolution'); component.videoDataOutput(event); expect(component.deleteSolution).toHaveBeenCalled(); }); - it("#videoDataOutput() should call videoDataOutput and event data is not empty", () => { - const event = { name: "event name", identifier: "1234" }; + it('#videoDataOutput() should call videoDataOutput and event data is not empty', () => { + const event = { name: 'event name', identifier: '1234' }; component.videoDataOutput(event); expect(component.videoSolutionData).toBeDefined(); }); - it("#videoDataOutput() should call videoDataOutput for thumbnail", () => { - const event = { - name: "event name", - identifier: "1234", - thumbnail: "sample data", - }; + it('#videoDataOutput() should call videoDataOutput for thumbnail', () => { + const event = { name: 'event name', identifier: '1234', thumbnail: 'sample data' }; component.videoDataOutput(event); expect(component.videoSolutionData).toBeDefined(); }); - it("#videoDataOutput() should call videoDataOutput for thumbnail", () => { - const event = { - name: "event name", - identifier: "1234", - thumbnail: "sample data", - }; + it('#videoDataOutput() should call videoDataOutput for thumbnail', () => { + const event = { name: 'event name', identifier: '1234', thumbnail: 'sample data' }; component.videoDataOutput(event); expect(component.videoSolutionData).toBeDefined(); }); - it("#subMenuChange() should set the sub-menu value ", () => { - component.subMenus = mockData.subMenus; - component.subMenuChange({ index: 1, value: "test" }); - expect(component.subMenus[1].value).toBe("test"); - }); - it("#subMenuChange() should set the sub-menu value for dependent question forerror is true ", () => { - component.subMenus = mockData.subMenus; - component.showFormError=false; - spyOn(component, "validateQuestionData"); - spyOn(component, "validateFormFields"); - spyOn(component, "saveQuestion"); - spyOn(component, "updateQuestion"); - spyOn(component, "buildCondition"); - component.questionId = "do_1134355571590184961168"; - component.selectedSectionId = "do_1134347209749299201119"; - component.showFormError = false; - component.showOptions = true; - component.isChildQuestion = true; - component.condition = "eq"; - component.selectedOptions = 1; - component.saveContent(); - component.updateQuestion(); - component.buildCondition("update"); - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - expect(component.saveQuestion).toHaveBeenCalled(); - expect(component.updateQuestion).toHaveBeenCalled(); - expect(component.buildCondition).toHaveBeenCalled(); - component.subMenuChange({ index: 2, value: [{ id: 1 }] }); - expect(component.subMenus[2].value).toEqual([{ id: 1 }]); - expect(component.showAddSecondaryQuestionCat).toBeTruthy(); - }); - - it("#dependentQuestions() should return dependentQuestions ", () => { - spyOn(component, "dependentQuestions"); - component.subMenus = mockData.subMenus; - component.subMenuChange({ index: 2, value: "test" }); - expect(component.dependentQuestions.length).toBe(1); - expect(component.dependentQuestions); - }); - - it("#saveContent() should call saveContent when questionId exits ", () => { - spyOn(component, "validateQuestionData"); - spyOn(component, "validateFormFields"); - spyOn(component, "saveQuestion"); - spyOn(component, "updateQuestion"); - spyOn(component, "buildCondition"); - component.creationContext.objectType='questionSet'; - component.creationContext.mode='submit' - component.questionId = "do_1134355571590184961168"; - component.selectedSectionId = "do_1134347209749299201119"; - component.showFormError = false; - component.showOptions = true; - component.isChildQuestion = true; - component.condition = "eq"; - component.selectedOptions = 1; - component.updateQuestion(); - component.buildCondition("update"); - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - component.saveContent(); - expect(component.saveQuestion).toHaveBeenCalled(); - expect(component.updateQuestion).toHaveBeenCalled(); - expect(component.buildCondition).toHaveBeenCalled(); - }); - - it("#buildCondition() should call when it is a child question save", () => { - spyOn(component, "buildCondition"); - component.questionId = "do_1134355571590184961168"; - component.selectedSectionId = "do_1134347209749299201119"; - component.condition = "eq"; - component.selectedOptions = 1; - component.branchingLogic = BranchingLogic; - component.showAddSecondaryQuestionCat = true; - spyOn(component, "saveQuestions").and.callThrough(); - component.buildCondition("update"); - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - expect(component.buildCondition).toHaveBeenCalled(); - }); - - it("#saveQuestions call on click save button", () => { - spyOn(component, "saveQuestions"); - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveQuestions( - mockData.mcqQuestionMetaData.result.question, - "create" - ); - expect(component.saveQuestion); - }); - - it("#saveQuestions call on click save button for update api success", () => { - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveQuestions( - mockData.mcqQuestionMetaData.result.question, - "update" - ); - }); - - it("#saveQuestions call on click save button for update api success", () => { - spyOn(questionService, "updateHierarchyQuestionCreate").and.returnValue( - throwError("error") - ); - component.saveQuestions( - mockData.mcqQuestionMetaData.result.question, - "update" - ); - }); - - it("#updateTarget() should call when buildcondition is called ", () => { - spyOn(component, "updateTarget").and.callThrough(); - component.questionId = "do_1134355571590184961168"; - component.branchingLogic = BranchingLogic; - component.updateTarget(component.questionId); - expect(component.updateTarget).toHaveBeenCalledWith(component.questionId); - }); - - it("#getOptions() should call when child question is edited when option exits", () => { - spyOn(component, "getOptions").and.callThrough(); - editorService.optionsLength = 4; - component.getOptions(); - expect(component.getOptions).toHaveBeenCalled(); - }); - it("#getOptions() should call when child question is edited when option not exits", () => { - spyOn(component, "getOptions").and.callThrough(); - editorService.optionsLength = undefined; - component.getOptions(); - expect(component.getOptions).toHaveBeenCalled(); - }); - - it("#getParentQuestionOptions() should call when add dependent question clicked", () => { - spyOn(component, "getParentQuestionOptions").and.callThrough(); - spyOn(questionService, "readQuestion").and.returnValue( - of(readQuestionMock) - ); - component.questionId = "do_1134355571590184961168"; - editorService.parentIdentifier = component.questionId; - component.getParentQuestionOptions(component.questionId); - expect(component.getParentQuestionOptions).toHaveBeenCalled(); - }); - - it("#updateTreeCache() should call when buildcondition is called ", () => { - component.selectedSectionId='do_1234' - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - }); - - it("#setCondition() should call when buildcondition is called ", () => { - spyOn(component, "setCondition").and.callThrough(); - component.questionId = "do_1134355571590184961168"; - let data = { - branchingLogic: BranchingLogic, - }; - component.setCondition(data); - expect(component.setCondition).toHaveBeenCalledWith(data); - }); - - it("#subMenuConfig() should call when question page render setChildQuestion is true", () => { - component.questionMetaData = mockData.mcqQuestionMetaData.result.question; - sourcingSettingsMock.showAddSecondaryQuestion = true; - component.questionMetaData.hints = { - en: [], - }; - sourcingSettingsMock.showAddHints = false; - component.sourcingSettings = sourcingSettingsMock; - component.questionInput.setChildQuestion = true; - component.subMenuConfig(); - }); - - it("#subMenuConfig() should call when question page render setChildQuestion is false", () => { - component.questionMetaData = mockData.mcqQuestionMetaData.result.question; - component.sourcingSettings = sourcingSettingsMock; - component.questionInput.setChildQuestion = false; - component.subMenuConfig(); - }); - - it("#sliderData() should call when slider question is called", () => { - spyOn(component, "sliderData").and.callThrough(); - const event = { - leftAnchor: 0, - rightAnchor: 10, - step: 1, - }; - component.sliderData(event); - expect(component.sliderData).toHaveBeenCalledWith(event); - }); - - it("#getResponseDeclaration() should call for question save", () => { - spyOn(component, "getResponseDeclaration").and.callThrough(); - component.getResponseDeclaration("slider"); - expect(component.getResponseDeclaration).toHaveBeenCalled(); - }); - - it("#saveUpdateQuestions call on click save button api fail case", () => { - component.questionId = "1245"; - component.showAddSecondaryQuestionCat = true; - - component.editorState = mockData.mcqQuestionMetaData.result.question; - const metaData = mockData.mcqQuestionMetaData.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - spyOn(questionService, "updateHierarchyQuestionUpdate").and.returnValue( - throwError("error") - ); - component.saveUpdateQuestions(); - }); - - it("#saveUpdateQuestions call on click save button api success", () => { - component.questionId = "1245"; - component.showAddSecondaryQuestionCat = true; - - component.editorState = mockData.mcqQuestionMetaData.result.question; - const metaData = mockData.mcqQuestionMetaData.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - spyOn(questionService, "updateHierarchyQuestionUpdate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveUpdateQuestions(); - }); - - it("#setQuestionTypeValues call when question showEvidence is yes", () => { - const metaData = mockData.mcqQuestionMetaData.result.question; - childMetaData.allowMultiSelect = "No"; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.setQuestionTypeValues(metaData); - }); - - it("#setQuestionTypeValues call when question howEvidence is no", () => { - let metaData = mockData.mcqQuestionMetaData.result.question; - childMetaData.showEvidence = "No"; - childMetaData.showRemarks = "Yes"; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "choice"; - component.setQuestionTypeValues(metaData); - }); - - it("#setQuestionTypeValues call when question for slider", () => { - const metaData = mockData.sliderQuestionMetaData.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.sliderDatas = - mockData.sliderQuestionMetaData.result.question.interactions.response1; - component.questionInteractionType = "slider"; - component.setQuestionTypeValues(metaData); - }); - - it("#setQuestionTypeValues call when question for date", () => { - const metaData = mockData.dateQuestionMetaDate.result.question; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "date"; - component.setQuestionTypeValues(metaData); - }); - - it("#setQuestionTypeValues call when question for text", () => { - const metaData = mockData.textQuestionNetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "text"; - component.setQuestionTypeValues(metaData); - }); - - it("#saveQuestions call on click save button", () => { - spyOn(component, "saveQuestions"); - const metaData = mockData.textQuestionNetaData.result.question; - spyOn(questionService, "updateHierarchyQuestionCreate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveQuestions(metaData, "create"); - expect(component.saveQuestion); - }); - - it("#saveQuestions call on click save button api fail", () => { - spyOn(component, "saveQuestions"); - const metaData = mockData.textQuestionNetaData.result.question; - spyOn(questionService, "updateHierarchyQuestionCreate").and.returnValue( - throwError("error") - ); - component.saveQuestions(metaData, "update"); - expect(component.saveQuestion); - }); - - it("#prepareRequestBody call when question save called slider", () => { - spyOn(treeService, "getFirstChild").and.callFake(() => { - return { data: { metadata: { identifier: "0123" } } }; - }); - spyOn(treeService, "getActiveNode").and.callFake(() => { - return { data: { root: true } }; - }); - const metaData = mockData.sliderQuestionMetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "slider"; - component.setQuestionTypeValues(metaData); - component.prepareQuestionBody(); - }); - - it("#prepareRequestBody call when question save called text", () => { - spyOn(treeService, "getFirstChild").and.callFake(() => { - return { data: { metadata: { identifier: "0123" } } }; - }); - spyOn(treeService, "getActiveNode").and.callFake(() => { - return { data: { root: true } }; - }); - const metaData = mockData.textQuestionNetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "text"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - component.prepareQuestionBody(); - }); - - it("#setQuestionTitle() should set #toolbarConfig.title for question", () => { - creationContextMock.objectType = "questionSet"; - component.questionId = "do_123"; - component.creationContext = creationContextMock; - component.questionPrimaryCategory = ""; - component.setQuestionTitle(); - expect(component.questionId).toEqual("do_123"); - }); - - it("#upsertQuestion() should call on question save api fal case", () => { - const metaData = mockData.textQuestionNetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "text"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - component.prepareQuestionBody(); - const event = { button: "saveContent" }; - component.actionType = event.button; - spyOn(questionService, "upsertQuestion").and.returnValue( - of({ - result: { - identifiers: { - "1234": "do_123", - }, - }, - }) - ); - component.upsertQuestion(""); - }); - - it("#upsertQuestion() should call on question save api fal case", () => { - const metaData = mockData.textQuestionNetaData.result.question; - component.questionPrimaryCategory = metaData.primaryCategory; - component.childFormData = childMetaData; - component.subMenus = mockData.subMenus; - component.questionInteractionType = "text"; - component.getQuestionMetadata(); - component.setQuestionTypeValues(metaData); - component.prepareQuestionBody(); - spyOn(questionService, "upsertQuestion").and.returnValue( - throwError("error") - ); - spyOn(editorService, "apiErrorHandling").and.callFake(() => {}); - component.upsertQuestion(""); - }); - - it("#updateQuestion() should call on question save isChildQuestion is true", () => { - component.editorState = mockData.mcqQuestionMetaData.result.question; - component.questionId = "do_11326368076523929611"; - component.showOptions = true; - component.questionId = "do_1134355571590184961168"; - component.selectedSectionId = "do_1134347209749299201119"; - component.showFormError = false; - component.showOptions = true; - component.isChildQuestion = true; - component.condition = "eq"; - component.selectedOptions = 1; - component.sourcingSettings=sourcingSettingsMock; - component.childFormData=childMetaData; - component.saveContent(); - component.updateQuestion(); - component.buildCondition("update"); - component.updateTreeCache( - "Mid-day Meals", - BranchingLogic, - component.selectedSectionId - ); - spyOn(questionService, "updateHierarchyQuestionUpdate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveUpdateQuestions(); - component.updateQuestion(); - }); - - it("#updateQuestion() should call on question save isChildQuestion is false", () => { - spyOn(component,'updateQuestion').and.callThrough(); - component.sourcingSettings=sourcingSettingsMock; - component.childFormData=childMetaData; - component.isChildQuestion=false; - component.questionId='1245' - component.showAddSecondaryQuestionCat=true; - spyOn(questionService, "updateHierarchyQuestionUpdate").and.callFake(() => { - return of({ - result: { - identifiers: { - "1245": "do_123", - }, - }, - }); - }); - component.saveUpdateQuestions(); - component.updateQuestion(); - }); - - it("#updateQuestion() should call on question save isChildQuestion is false api fail", () => { - spyOn(component,'updateQuestion').and.callThrough(); - component.sourcingSettings=sourcingSettingsMock; - component.childFormData=childMetaData; - component.isChildQuestion=false; - component.questionId='1245' - component.showAddSecondaryQuestionCat=true; - spyOn(questionService, "updateHierarchyQuestionUpdate").and.returnValue(throwError('error')) - component.saveUpdateQuestions(); - component.updateQuestion(); - }); - }); diff --git a/projects/collection-editor-library/src/lib/components/question/question.component.ts b/projects/collection-editor-library/src/lib/components/question/question.component.ts index 201728de5..b2dac364d 100644 --- a/projects/collection-editor-library/src/lib/components/question/question.component.ts +++ b/projects/collection-editor-library/src/lib/components/question/question.component.ts @@ -8,20 +8,13 @@ import { PlayerService } from '../../services/player/player.service'; import { EditorTelemetryService } from '../../services/telemetry/telemetry.service'; import { EditorService } from '../../services/editor/editor.service'; import { ToasterService } from '../../services/toaster/toaster.service'; -import { throwError, Subject} from 'rxjs'; +import { throwError, Subject } from 'rxjs'; import { Router } from '@angular/router'; import { ConfigService } from '../../services/config/config.service'; import { FrameworkService } from '../../services/framework/framework.service'; import { TreeService } from '../../services/tree/tree.service'; import { EditorCursor } from '../../collection-editor-cursor.service'; import { filter, finalize, take, takeUntil } from 'rxjs/operators'; -import { SubMenu } from '../question-option-sub-menu/question-option-sub-menu.component'; -import { ICreationContext } from '../../interfaces/CreationContext'; - -const evidenceMimeType=''; -const maxScore=1; -const evidenceSizeLimit='20480'; - @Component({ selector: 'lib-question', templateUrl: './question.component.html', @@ -32,19 +25,16 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { QumlPlayerConfig: any = {}; @Input() questionInput: any; @Input() leafFormConfig: any; - @Input() sourcingSettings: any; public initialLeafFormConfig: any; public childFormData: any; @Output() questionEmitter = new EventEmitter(); private onComponentDestroy$ = new Subject(); toolbarConfig: any = {}; - public terms = false; public editorState: any = {}; public showPreview = false; public mediaArr: any = []; public videoShow = false; public showFormError = false; - public actionType: string; selectedSolutionType: string; selectedSolutionTypeIndex: string; showSolutionDropDown = true; @@ -64,21 +54,13 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { }]; questionMetaData: any; questionInteractionType; - questionCategory; questionId; - creationContext: ICreationContext; - creationMode; tempQuestionId; questionSetId; - unitId; public setCharacterLimit = 160; public showLoader = true; - public isReadOnlyMode = false; - public contentComment : string; - public showReviewModal: boolean = false; questionSetHierarchy: any; showConfirmPopup = false; - showSubmitConfirmPopup = false; validQuestionData = false; questionPrimaryCategory: string; pageId = 'question'; @@ -86,68 +68,31 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { public framework; public frameworkDetails: any = {}; public buttonLoaders = { - saveButtonLoader: false, - 'review': false + saveButtonLoader: false }; - public showTranslation = false; - subMenus: SubMenu[]; - showAddSecondaryQuestionCat: boolean; - sliderDatas: any = {}; - sliderOptions: any = {}; - hints: any; - categoryLabel: any = {}; - scoreMapping: any; - condition = 'default'; - targetOption: any; - responseVariable = 'response1'; - newQuestionID: any; - showOptions: boolean; - selectedOptions: any; - options = []; - isChildQuestion = false; - branchingLogic: any; - selectedSectionId: any; - sectionPrimaryCategory: any; - public questionFormConfig: any; constructor( private questionService: QuestionService, private editorService: EditorService, public telemetryService: EditorTelemetryService, public playerService: PlayerService, private toasterService: ToasterService, private treeService: TreeService, - private frameworkService: FrameworkService, private router: Router, public configService: ConfigService, + private frameworkService: FrameworkService, private router: Router, public configService: ConfigService, private editorCursor: EditorCursor) { - const { primaryCategory, label } = this.editorService.selectedChildren; + const { primaryCategory } = this.editorService.selectedChildren; this.questionPrimaryCategory = primaryCategory; this.pageStartTime = Date.now(); - this.categoryLabel = []; - this.getOptions(); - if (!_.isUndefined(label)) { - this.categoryLabel[primaryCategory] = label; - } } ngOnInit() { - const { questionSetId, questionId, type, category, config, creationContext, creationMode } = this.questionInput; + const { questionSetId, questionId, type } = this.questionInput; this.questionInteractionType = type; - this.questionCategory = category; this.questionId = questionId; this.questionSetId = questionSetId; - this.creationContext = creationContext; - this.creationMode = creationMode; - this.unitId = this.creationContext?.unitIdentifier; - this.isReadOnlyMode = this.creationContext?.isReadOnlyMode; this.toolbarConfig = this.editorService.getToolbarConfig(); this.toolbarConfig.showPreview = false; - this.toolbarConfig.add_translation = true; - if (_.get(this.creationContext, 'objectType') === 'question') { this.toolbarConfig.questionContribution = true; } this.solutionUUID = UUID.UUID(); this.telemetryService.telemetryPageId = this.pageId; this.initialLeafFormConfig = _.cloneDeep(this.leafFormConfig); this.initialize(); this.framework = _.get(this.editorService.editorConfig, 'context.framework'); - } - - fetchFrameWorkDetails() { - this.frameworkService.frameworkData$.pipe(takeUntil(this.onComponentDestroy$), - filter(data => _.get(data, `frameworkdata.${this.framework}`)), take(1)).subscribe((frameworkDetails: any) => { + this.fetchFrameWorkDetails().subscribe((frameworkDetails: any) => { if (frameworkDetails && !frameworkDetails.err) { const frameworkData = frameworkDetails.frameworkdata[this.framework].categories; this.frameworkDetails.frameworkData = frameworkData; @@ -156,7 +101,10 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { } }); } - + fetchFrameWorkDetails() { + return this.frameworkService.frameworkData$.pipe(takeUntil(this.onComponentDestroy$), + filter(data => _.get(data, `frameworkdata.${this.framework}`)), take(1)); + } populateFrameworkData() { const categoryMasterList = this.frameworkDetails.frameworkData; _.forEach(categoryMasterList, (category) => { @@ -166,9 +114,7 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { } }); }); - this.questionFormConfig = _.cloneDeep(this.leafFormConfig); } - ngAfterViewInit() { this.telemetryService.impression({ type: 'edit', pageid: this.telemetryService.telemetryPageId, uri: this.router.url, @@ -179,78 +125,35 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { initialize() { this.editorService.fetchCollectionHierarchy(this.questionSetId).subscribe((response) => { this.questionSetHierarchy = _.get(response, 'result.questionSet'); - const parentId = this.editorService.parentIdentifier ? this.editorService.parentIdentifier : this.questionId; - this.subMenuConfig(); - //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 childerns = _.get(response, 'result.questionSet.children'); - this.sectionPrimaryCategory = _.get(response, 'result.questionSet.primaryCategory'); - this.selectedSectionId = _.get(sectionData, 'data.metadata.parent'); - _.forEach(childerns, (data) => { - if (data.identifier === this.selectedSectionId) { - this.branchingLogic = data?.branchingLogic ? data?.branchingLogic : {}; - if (_.get(data?.branchingLogic, `${this.questionId}.source[0]`)) { - this.isChildQuestion = true; - this.getParentQuestionOptions(data.branchingLogic[this.questionId].source[0]); - this.setCondition(data); - } - } - }); - } - this.questionFormConfig=_.cloneDeep(this.leafFormConfig); - const leafFormConfigFields = _.join(_.map(this.leafFormConfig, value => (value.code)), ','); + const leafFormConfigfields = _.join(_.map(this.leafFormConfig, value => (value.code)), ','); if (!_.isUndefined(this.questionId)) { - this.questionService.readQuestion(this.questionId, leafFormConfigFields) + this.questionService.readQuestion(this.questionId, leafFormConfigfields) .subscribe((res) => { - if (_.get(res,'result')) { - this.questionMetaData = _.get(res,'result.question'); - this.questionPrimaryCategory = _.get(this.questionMetaData,'primaryCategory'); + if (res.result) { + this.questionMetaData = res.result.question; this.populateFormData(); + if (_.isUndefined(this.questionPrimaryCategory)) { + this.questionPrimaryCategory = this.questionMetaData.primaryCategory; + } // tslint:disable-next-line:max-line-length - this.questionInteractionType = _.get(this.questionMetaData,'interactionTypes') ? _.get(this.questionMetaData,'interactionTypes[0]') : 'default'; + this.questionInteractionType = this.questionMetaData.interactionTypes ? this.questionMetaData.interactionTypes[0] : 'default'; if (this.questionInteractionType === 'default') { if (this.questionMetaData.editorState) { this.editorState = this.questionMetaData.editorState; } } - if (this.questionInteractionType === 'slider') { - if (this.questionMetaData.editorState) { - this.editorState = this.questionMetaData.editorState; - this.sliderOptions = this.questionMetaData.interactions.response1; - this.sliderDatas = this.questionMetaData.interactions.response1; - this.hints = this.questionMetaData.hints; - } - } - - if (this.questionInteractionType === 'text') { - if (this.questionMetaData.editorState) { - this.editorState = this.questionMetaData.editorState; - } - } - - if (this.questionInteractionType === 'date') { - if (this.questionMetaData.editorState) { - this.editorState = this.questionMetaData.editorState; - } - } - if (this.questionInteractionType === 'choice') { const responseDeclaration = this.questionMetaData.responseDeclaration; - this.scoreMapping = _.get(responseDeclaration, 'response1.mapping'); const templateId = this.questionMetaData.templateId; - const numberOfOptions = this.questionMetaData?.editorState?.options?.length || 0; - this.editorService.optionsLength = numberOfOptions; - const options = _.map(this.questionMetaData?.editorState?.options, option => ({ body: option.value.body })); - const question = this.questionMetaData?.editorState?.question; - const interactions = this.questionMetaData?.interactions; + this.questionMetaData.editorState = this.questionMetaData.editorState; + const numberOfOptions = this.questionMetaData.editorState.options.length; + const options = _.map(this.questionMetaData.editorState.options, option => ({ body: option.value.body })); + const question = this.questionMetaData.editorState.question; this.editorState = new McqForm({ question, options, answer: _.get(responseDeclaration, 'response1.correctResponse.value') }, { templateId, numberOfOptions }); - this.editorState.solutions = this.questionMetaData?.editorState?.solutions; - this.editorState.interactions = interactions; + this.editorState.solutions = this.questionMetaData.editorState.solutions; } this.setQuestionTitle(this.questionId); if (!_.isEmpty(this.editorState.solutions)) { @@ -272,7 +175,6 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { if (this.questionMetaData.media) { this.mediaArr = this.questionMetaData.media; } - this.contentComment = _.get(this.creationContext, 'correctionComments'); this.showLoader = false; } }, (err: ServerResponse) => { @@ -286,17 +188,11 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { this.tempQuestionId = UUID.UUID(); this.populateFormData(); this.setQuestionTitle(); - let editorState = {} if (this.questionInteractionType === 'default') { - if (this.questionCategory) { - editorState = _.get(this.configService, `editorConfig.defaultStates.nonInteractiveQuestions.${this.questionCategory}`); - } else { - this.editorState = { question: '', answer: '', solutions: '' }; - } - this.editorState = { ...editorState }; + this.editorState = { question: '', answer: '', solutions: '' }; } - else if (this.questionInteractionType === 'choice') { - this.editorState = new McqForm({ question: '', options: [] }, {numberOfOptions: _.get(this.questionInput, 'config.numberOfOptions')}); + if (this.questionInteractionType === 'choice') { + this.editorState = new McqForm({ question: '', options: [] }, {}); } this.showLoader = false; } @@ -306,44 +202,16 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { }; this.editorService.apiErrorHandling(err, errInfo); }); - - } - - get contentPolicyUrl() { - return this.editorService.contentPolicyUrl; } toolbarEventListener(event) { - this.actionType = event.button; switch (event.button) { case 'saveContent': - this.showAddSecondaryQuestionCat = false; this.saveContent(); break; - case 'showTranslation': - this.showTranslation = true; - break; - case 'submitQuestion': - this.submitHandler(); - break; case 'cancelContent': this.handleRedirectToQuestionset(); break; - case 'rejectQuestion': - this.rejectQuestion(event.comment); - break; - case 'publishQuestion': - this.publishQuestion(event); - break; - case 'sourcingApproveQuestion': - this.sourcingUpdate(event); - break; - case 'sourcingRejectQuestion': - this.sourcingUpdate(event); - break; - case 'sendForCorrectionsQuestion': - this.sendBackQuestion(event); - break; case 'backContent': this.handleRedirectToQuestionset(); break; @@ -355,185 +223,34 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { this.showPreview = false; this.toolbarConfig.showPreview = false; break; - case 'showReviewcomments': - this.showReviewModal = !this.showReviewModal; - break; default: break; } } handleRedirectToQuestionset() { - if (_.isUndefined(this.questionId) || this.creationMode === 'edit') { + if (_.isUndefined(this.questionId)) { this.showConfirmPopup = true; } else { this.redirectToQuestionset(); } } - - submitHandler() { - this.validateQuestionData(); - this.validateFormFields(); - if(this.showFormError === false) this.showSubmitConfirmPopup = true; - } - saveContent() { this.validateQuestionData(); + this.validateFormFields(); if (this.showFormError === false) { this.saveQuestion(); } } - sendForReview() { - if (!_.get(this.editorService.editorConfig, 'config.skipTwoLevelReview')) { - let callback = function () { - this.editorService.reviewContent(this.questionId).subscribe(data => { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.002')); - this.redirectToChapterList(); - }, err => { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.002')); - }); - }; - if (!this.questionId) { - callback = function () { - this.editorService.reviewContent(this.questionId).subscribe(data => { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.002')); - this.addResourceToQuestionset(); - }, err => { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.002')); - }); - }; - } - callback = callback.bind(this); - this.upsertQuestion(callback); - } - else { - const publishCallback = this.sendQuestionForPublish.bind(this); - const callback = this.addResourceToQuestionset.bind(this, publishCallback); - this.upsertQuestion(callback); - //this.saveQuestion() - //this.sendQuestionForPublish({}) - } - } - - requestForChanges(comment) { - this.editorService.submitRequestChanges(this.questionId, comment).subscribe(res => { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.003')); - this.redirectToChapterList(); - }, err => { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.003')); - }); - } - - sendQuestionForPublish(event) { - this.editorService.publishContent(this.questionId, event).subscribe(res => { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.037')); - this.redirectToChapterList(); - }, err => { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.038')); - }); - } - - rejectQuestion(comment) { - const editableFields = _.get(this.creationContext, 'editableFields'); - if (this.creationMode === 'orgreview' && editableFields && !_.isEmpty(editableFields[this.creationMode])) { - this.validateFormFields(); - if(this.showFormError === true) { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.029')); - return false; - } - let callback = this.requestForChanges.bind(this, [comment]); - this.upsertQuestion(callback); - } else { - this.requestForChanges(comment); - } - } - - publishQuestion(event) { - const editableFields = _.get(this.creationContext, 'editableFields'); - if (this.creationMode === 'orgreview' && editableFields && !_.isEmpty(editableFields[this.creationMode])) { - this.validateFormFields(); - if(this.showFormError === true) { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.029')); - return false; - } - let callback = this.sendQuestionForPublish.bind(this, [event]); - this.upsertQuestion(callback); - } else { - this.sendQuestionForPublish(event); - } - } - - sourcingUpdate(event) { - const editableFields = _.get(this.creationContext, 'editableFields'); - if (this.creationMode === 'sourcingreview' && editableFields && !_.isEmpty(editableFields[this.creationMode])) { - this.validateFormFields(); - if(this.showFormError === true) { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.029')); - return false; } - } - let questionIds = []; - //let comments = {}; - let comments = event.comment - let successMessage = ''; - this.editorService.fetchCollectionHierarchy(this.questionSetId).subscribe(res => { - const questionSet = res.result['questionSet']; - switch (event.button) { - case 'sourcingApproveQuestion': - questionIds = questionSet.acceptedContributions || []; - successMessage = _.get(this.configService, 'labelConfig.messages.success.038') - break; - case 'sourcingRejectQuestion': - questionIds = questionSet.rejectedContributions || []; - comments = questionSet.rejectedContributionComments || {}; - comments[this.questionId] = event.comment; - successMessage = _.get(this.configService, 'labelConfig.messages.success.039') - break; - default: - break; - } - questionIds.push(this.questionId); - event['requestBody'] = this.prepareSourcingUpdateBody(questionIds, comments); - this.editorService.updateCollection(this.questionSetId, event).subscribe(res => { - this.toasterService.success(successMessage); - this.redirectToChapterList(); - }) - }) - } - - sendBackQuestion(event) { - this.questionService.readQuestion(this.questionId, 'status') - .subscribe((res) => { - const requestObj = { - question: { - prevStatus: _.get(res.result, `question.status`), - status: 'Draft', - requestChanges: event.comment - } - }; - this.questionService.updateQuestion(this.questionId, requestObj).subscribe(res => { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.040')); - this.redirectToChapterList(); - }); - }, (err: ServerResponse) => { - const errInfo = { - errorMsg: 'Cannot update question status. Please try again...', - }; - this.editorService.apiErrorHandling(err, errInfo); - }); - } - validateQuestionData() { if ([undefined, ''].includes(this.editorState.question)) { this.showFormError = true; return; - } else { - this.showFormError = false; } - // to handle when question type is subjective if (this.questionInteractionType === 'default') { if (this.editorState.answer !== '') { @@ -548,47 +265,22 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { if (this.questionInteractionType === 'choice') { const optionValid = _.find(this.editorState.options, option => (option.body === undefined || option.body === '' || option.length > this.setCharacterLimit)); - if (optionValid || (!this.editorState.answer && this.sourcingSettings?.enforceCorrectAnswer)) { + if (optionValid || !this.editorState.answer) { this.showFormError = true; return; } else { this.showFormError = false; } } - - if (this.questionInteractionType === 'slider') { - const min = _.get(this.sliderDatas, 'validation.range.min'); - const max = _.get(this.sliderDatas, 'validation.range.max'); - const step = _.get(this.sliderDatas, 'step'); - if (_.isEmpty(this.sliderDatas) || _.isEmpty(min) || _.isEmpty(max) || _.isEmpty(step)) { - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.005')); - this.showFormError = true; - } else { - this.showFormError = false; - } - } - } redirectToQuestionset() { this.showConfirmPopup = false; - this.treeService.clearTreeCache(); setTimeout(() => { - this.showAddSecondaryQuestionCat ? - this.questionEmitter.emit({ type: 'createNewContent', isChildQuestion: true }) : - this.editorService.parentIdentifier = undefined; - this.showAddSecondaryQuestionCat = false; this.questionEmitter.emit({ status: false }); }, 100); } - redirectToChapterList() { - this.showConfirmPopup = false; - setTimeout(() => { - this.questionEmitter.emit({ type: 'close', actionType: this.actionType, identifier: this.questionId }); - }, 100); - } - editorDataHandler(event, type?) { if (type === 'question') { this.editorState.question = event.body; @@ -615,37 +307,13 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { } } - addResourceToQuestionset(callback = null) { - this.editorService.addResourceToQuestionset(this.questionSetId, this.unitId, this.questionId).subscribe(res => { - if (callback) { - callback(); - } else { - this.redirectToChapterList(); - } - }, err => { - const errInfo = { - errorMsg: 'Adding question to questionset failed. Please try again.', - }; - return throwError(this.editorService.apiErrorHandling(err, errInfo)); - }) - } - saveQuestion() { - if(_.get(this.creationContext, 'objectType') === 'question') { - if(this.creationMode === 'edit') { - let callback = this.addResourceToQuestionset.bind(this); - this.upsertQuestion(callback); - } - else this.upsertQuestion(undefined); + if (_.isUndefined(this.questionId)) { + this.createQuestion(); + } + if (!_.isUndefined(this.questionId)) { + this.updateQuestion(); } - else { - if (_.isUndefined(this.questionId)) { - this.createQuestion(); - } - if (!_.isUndefined(this.questionId)) { - this.updateQuestion(); - } - } } videoDataOutput(event) { @@ -726,16 +394,12 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { media: this.mediaArr, editorState: {} }; - console.log('getQuestionMetadata'); - console.log(this.editorState); metadata = _.assign(metadata, this.editorState); metadata.editorState.question = metadata.question; metadata.body = metadata.question; if (this.questionInteractionType === 'choice') { metadata.body = this.getMcqQuestionHtmlBody(this.editorState.question, this.editorState.templateId); - } else { - metadata.responseDeclaration = this.getResponseDeclaration(this.questionInteractionType); } if (!_.isUndefined(this.selectedSolutionType) && !_.isEmpty(this.selectedSolutionType)) { @@ -747,34 +411,14 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { metadata.solutions = []; } metadata = _.merge(metadata, this.getDefaultSessionContext()); - if(_.get(this.creationContext, 'objectType') === 'question') { - metadata.programId = _.get(this.editorService, 'editorConfig.context.programId'); - metadata.collectionId = _.get(this.editorService, 'editorConfig.context.collectionIdentifier'); - metadata.organisationId = _.get(this.editorService, 'editorConfig.context.contributionOrgId'); - } metadata = _.merge(metadata, _.pickBy(this.childFormData, _.identity)); - // tslint:disable-next-line:max-line-length - return _.omit(metadata, ['question', 'numberOfOptions', 'options', 'allowMultiSelect', 'showEvidence', 'evidenceMimeType', 'showRemarks', 'markAsNotMandatory', 'leftAnchor', 'rightAnchor', 'step', 'numberOnly', 'characterLimit', 'dateFormat', 'autoCapture', 'remarksLimit']); - } - - getResponseDeclaration(type) { - const responseDeclaration = { - response1: { - type: type === 'slider' ? 'integer' : 'string' - } - }; - if (type === 'text' || type === 'slider') { - responseDeclaration.response1['maxScore'] = maxScore; - } - return responseDeclaration; + return _.omit(metadata, ['question', 'numberOfOptions', 'options']); } - - getMcqQuestionHtmlBody(question, templateId) { const mcqTemplateConfig = { // tslint:disable-next-line:max-line-length - mcqBody: '
{question}
' + mcqBody: '
{question}
' }; const { mcqBody } = mcqTemplateConfig; const questionBody = mcqBody.replace('{templateClass}', templateId) @@ -785,7 +429,7 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { getDefaultSessionContext() { return _.omitBy(_.merge( { - creator: _.get(this.editorService.editorConfig, 'context.user.fullName'), + author: _.get(this.editorService.editorConfig, 'context.user.fullName'), createdBy: _.get(this.editorService.editorConfig, 'context.user.id'), ..._.pick(_.get(this.editorService.editorConfig, 'context'), ['board', 'medium', 'gradeLevel', 'subject', 'topic']) }, @@ -795,190 +439,33 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { ), key => _.isEmpty(key)); } - setQuestionTypeValues(metaData) { - metaData.showEvidence = this.childFormData.showEvidence; - if (metaData.showEvidence === 'Yes') { - metaData.evidence = { - required: 'No', - mimeType: this.childFormData.evidenceMimeType, - minCount: 1, - maxCount: 1, - sizeLimit: evidenceSizeLimit, - }; - } - metaData.showRemarks = this.childFormData.showRemarks; - if (metaData.showRemarks === 'Yes') { - metaData.remarks = { - maxLength: this.childFormData.remarksLimit, - required: 'No' - }; - } - metaData.interactions = metaData.interactions || {}; - - metaData.interactions.validation = { required: this.childFormData.markAsNotMandatory === 'Yes' ? 'No' : 'Yes'}; - if (this.childFormData.allowMultiSelect === 'Yes') { - metaData.responseDeclaration.response1.cardinality = 'multiple'; - } - - _.forEach(this.subMenus, (el: any) => { - if (el.id === 'addHint') { - metaData.hints = { - en: [el.value] - }; - } - if (el.id === 'addTip') { - metaData.instructions = { - en: [el.value] - }; - } - }); - - if (!_.isEmpty(this.sliderDatas) && this.questionInteractionType === 'slider') { - metaData.interactionTypes = [this.questionInteractionType]; - metaData.primaryCategory = this.questionPrimaryCategory; - metaData.interactions = { - ...metaData.interactions, - response1: { - validation: this.sliderDatas.validation, - step: this.sliderDatas.step - } - }; - } - - if (this.questionInteractionType === 'date') { - metaData.interactionTypes = [this.questionInteractionType]; - metaData.primaryCategory = this.questionPrimaryCategory; - metaData.interactions = { - ...metaData.interactions, - response1: { - validation: {pattern: this.childFormData.dateFormat}, - autoCapture: this.childFormData.autoCapture - } - }; - } - - if (this.questionInteractionType === 'text') { - metaData.interactionTypes = [this.questionInteractionType]; - metaData.primaryCategory = this.questionPrimaryCategory; - metaData.interactions = { - ...metaData.interactions, - response1: { - validation: { - limit: { - maxLength: this.childFormData.characterLimit, - } - }, - type: { - number: this.childFormData.numberOnly - } - } - }; - } - // return metaData; - } - prepareRequestBody() { const questionId = this.questionId ? this.questionId : UUID.UUID(); - this.newQuestionID = questionId; const data = this.treeService.getFirstChild(); const activeNode = this.treeService.getActiveNode(); const selectedUnitId = _.get(activeNode, 'data.id'); this.editorService.data = {}; - this.editorService.selectedSection = selectedUnitId; - const metaData = this.getQuestionMetadata(); - this.setQuestionTypeValues(metaData); return { nodesModified: { [questionId]: { - metadata: _.omit(metaData, ['creator']), + metadata: this.getQuestionMetadata(), objectType: 'Question', root: false, - isNew: !this.questionId + isNew: this.questionId ? false : true } }, - hierarchy: this.editorService.getHierarchyObj(data, questionId, selectedUnitId) - }; - } - - prepareQuestionBody () { - const requestBody = this.questionId ? - { - question: _.omit(this.getQuestionMetadata(), ['mimeType']) - } : - { - question: { - code: UUID.UUID(), - ...this.getQuestionMetadata() - } + hierarchy: this.editorService._toFlatObj(data, questionId, selectedUnitId) }; - return requestBody; - } - - prepareSourcingUpdateBody (questionIds, comments?) { - const sourcingUpdateAttribute = this.actionType === 'sourcingApproveQuestion' ? 'acceptedContributions' - : 'rejectedContributions'; - const collectionObjectType = _.replace(_.lowerCase(this.creationContext['collectionObjectType']), ' ', ''); - const requestBody = { - request: { - [collectionObjectType]: { - [sourcingUpdateAttribute]: questionIds - } - } - }; - if (this.actionType === 'sourcingRejectQuestion') { - requestBody.request[collectionObjectType]['rejectedContributionComments'] = comments; - // requestBody.request[collectionObjectType]['rejectComment'] = comments; - } - return requestBody; - } - - upsertQuestion(callback) { - const requestBody = this.prepareQuestionBody(); - this.showHideSpinnerLoader(true); - this.questionService.upsertQuestion(this.questionId, requestBody).pipe( - finalize(() => { - this.showHideSpinnerLoader(false); - })).subscribe((response: ServerResponse) => { - if (!_.includes(['submitQuestion'],this.actionType)) { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.013')); - } - this.setQuestionId(_.get(response, 'result.identifier')); - if (callback) callback(); - }, (err: ServerResponse) => { - const errInfo = { - errorMsg: 'Failed to save question. Please try again...', - }; - this.editorService.apiErrorHandling(err, errInfo); - }); } - createQuestion() { - if (this.showOptions) { - this.buildCondition('create'); - } else { - const requestBody = this.prepareRequestBody(); - this.saveQuestions(requestBody, 'create'); - } -} - - - saveQuestions(requestBody, type) { + const requestBody = this.prepareRequestBody(); this.showHideSpinnerLoader(true); this.questionService.updateHierarchyQuestionCreate(requestBody).pipe( finalize(() => { this.showHideSpinnerLoader(false); })).subscribe((response: ServerResponse) => { - if (this.showAddSecondaryQuestionCat) { - const result = _.get(response.result.identifiers, this.newQuestionID); - this.editorService.parentIdentifier = result; - } - - if (type === 'create') { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.007')); - } else { - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.008')); - } + this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.007')); this.redirectToQuestionset(); }, (err: ServerResponse) => { const errInfo = { @@ -988,27 +475,13 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { }); } - updateQuestion() { - if (this.isChildQuestion) { - this.buildCondition('update'); - } else { - this.saveUpdateQuestions(); - } - } - - saveUpdateQuestions() { const requestBody = this.prepareRequestBody(); this.showHideSpinnerLoader(true); this.questionService.updateHierarchyQuestionUpdate(requestBody).pipe( finalize(() => { this.showHideSpinnerLoader(false); })).subscribe((response: ServerResponse) => { - if (this.showAddSecondaryQuestionCat) { - const result = _.get(response.result.identifiers, this.questionId); - this.editorService.parentIdentifier = result; - } - this.toasterService.success(_.get(this.configService, 'labelConfig.messages.success.008')); this.redirectToQuestionset(); }, (err: ServerResponse) => { @@ -1019,15 +492,13 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { }); } - showHideSpinnerLoader(status: boolean, type?) { + showHideSpinnerLoader(status: boolean) { this.buttonLoaders.saveButtonLoader = status; - if(type) { - this.buttonLoaders[type] = status; - } } previewContent() { this.validateQuestionData(); + this.validateFormFields(); if (this.showFormError === false) { this.previewFormData(false); const questionId = _.isUndefined(this.questionId) ? this.tempQuestionId : this.questionId; @@ -1053,63 +524,35 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { console.log('event is for telemetry', JSON.stringify(event)); } - setQuestionId(questionId) { - this.questionId = questionId; - } - setQuestionTitle(questionId?) { let index; let questionTitle = ''; - if (_.get(this.creationContext, 'objectType') === 'question') { - if (!_.isUndefined(this.questionPrimaryCategory)) { - questionTitle = this.questionPrimaryCategory; - } + let hierarchyChildren = this.treeService.getChildren(); + if (!_.isUndefined(questionId)) { + const parentNode = this.treeService.getActiveNode().getParent(); + hierarchyChildren = parentNode.getChildren(); + index = _.findIndex(hierarchyChildren, (node) => node.data.id === questionId); + const question = hierarchyChildren[index]; + questionTitle = `Q${(index + 1).toString()} | ` + question.data.primaryCategory; } else { - let hierarchyChildren = this.treeService.getChildren(); - if (!_.isUndefined(questionId)) { - const parentNode = this.treeService.getActiveNode().getParent(); - hierarchyChildren = parentNode.getChildren(); - _.forEach(hierarchyChildren, (child) => { - if (child.children) { - index = _.findIndex(child.children, { identifier: questionId }); - const question = child.children[index]; - // tslint:disable-next-line:max-line-length - questionTitle = `Q${(index + 1).toString()} | ` + (_.get(this.categoryLabel, `${question.primaryCategory}`) || question.primaryCategory); - } else { - index = _.findIndex(hierarchyChildren, (node) => node.data.id === questionId); - const question = hierarchyChildren[index]; - // tslint:disable-next-line:max-line-length - questionTitle = `Q${(index + 1).toString()} | ` + (_.get(this.categoryLabel, `${_.get(question, 'data.primaryCategory')}`) || _.get(question, 'data.primaryCategory')); - } - }); - - } else { - index = hierarchyChildren.length; - questionTitle = `Q${(index + 1).toString()} | `; - if (!_.isUndefined(this.questionPrimaryCategory)) { - questionTitle = questionTitle + (_.get(this.categoryLabel, `${this.questionPrimaryCategory}`) || this.questionPrimaryCategory); - } + index = hierarchyChildren.length; + questionTitle = `Q${(index + 1).toString()} | `; + if (!_.isUndefined(this.questionPrimaryCategory)) { + questionTitle = questionTitle + this.questionPrimaryCategory; } } this.toolbarConfig.title = questionTitle; } - output(event) { } onStatusChanges(event) { - console.log(event); } valueChanges(event) { - if (_.get(this.creationContext, 'objectType') === 'question') { - // tslint:disable-next-line:radix - event.maxScore = event.maxScore ? parseInt(event.maxScore) : null; - } this.childFormData = event; } - validateFormFields() { - _.forEach(this.questionFormConfig, (formFieldCategory) => { + _.forEach(this.leafFormConfig, (formFieldCategory) => { if (formFieldCategory.required && !this.childFormData[formFieldCategory.code]) { this.showFormError = true; this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.008')); @@ -1118,29 +561,17 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { }); return true; } - previewFormData(status) { - const formConfig = _.cloneDeep(this.leafFormConfig); - this.questionFormConfig = null; - _.forEach(formConfig, (formFieldCategory) => { + const formvalue = _.cloneDeep(this.leafFormConfig); + this.leafFormConfig = null; + _.forEach(formvalue, (formFieldCategory) => { if (_.has(formFieldCategory, 'editable')) { formFieldCategory.editable = status ? _.find(this.initialLeafFormConfig, { code: formFieldCategory.code }).editable : status; formFieldCategory.default = this.childFormData[formFieldCategory.code]; } }); - this.questionFormConfig = formConfig; - } - - isEditable(fieldCode) { - if (this.creationMode === 'edit') { - return true; - } - if (!this.questionId) { - return true; - } - return false; + this.leafFormConfig = formvalue; } - populateFormData() { this.childFormData = {}; _.forEach(this.leafFormConfig, (formFieldCategory) => { @@ -1149,236 +580,19 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { formFieldCategory.default = this.questionMetaData[formFieldCategory.code]; this.childFormData[formFieldCategory.code] = this.questionMetaData[formFieldCategory.code]; } - try { - const availableAlias = { - dateFormat: 'interactions.response1.validation.pattern', - autoCapture: 'interactions.response1.autoCapture', - markAsNotMandatory: 'interactions.validation.required', - numberOnly: 'interactions.response1.type.number', - characterLimit: 'interactions.response1.validation.limit.maxLength', - remarksLimit: 'remarks.maxLength', - evidenceMimeType: 'evidence.mimeType' - }; - if (this.questionMetaData && _.has(availableAlias, formFieldCategory.code)) { - let defaultValue = _.get(this.questionMetaData, availableAlias[formFieldCategory.code]); - if (formFieldCategory.code === 'markAsNotMandatory') { - defaultValue === 'Yes' ? (defaultValue = 'No') : (defaultValue = 'Yes'); - } - formFieldCategory.default = defaultValue; - this.childFormData[formFieldCategory.code] = defaultValue; - } - } catch (error) { - - } } else { // tslint:disable-next-line:max-line-length const questionSetDefaultValue = _.get(this.questionSetHierarchy, formFieldCategory.code) ? _.get(this.questionSetHierarchy, formFieldCategory.code) : ''; - const defaultEditStatus = _.find(this.initialLeafFormConfig, {code: formFieldCategory.code}).editable === true; + const defaultEditStatus = _.find(this.initialLeafFormConfig, { code: formFieldCategory.code }).editable === true ? true : false; formFieldCategory.default = defaultEditStatus ? '' : questionSetDefaultValue; this.childFormData[formFieldCategory.code] = formFieldCategory.default; } }); - this.fetchFrameWorkDetails(); - } - - subMenuChange({ index, value }) { - if (this.subMenus[index].id === 'addDependantQuestion') { - this.showAddSecondaryQuestionCat = true; - this.saveContent(); - if (this.showFormError) { - this.showAddSecondaryQuestionCat = false; - return; - } - } - this.subMenus[index].value = value; - } - - get dependentQuestions() { - try { - return this.subMenus.filter(menu => menu.id === 'addDependantQuestion')[0].value; - } catch (error) { - return null; - } - } - subMenuConfig() { - this.subMenus = [ - { - id: 'addHint', - name: 'Add Hint', - value: _.get(this.questionMetaData, 'hints.en[0]'), - label: 'Hint', - enabled: _.get(this.questionMetaData, 'hints.en[0]') ? true : false, - type: 'input', - show: _.get(this.sourcingSettings, 'showAddHints') - }, - { - id: 'addTip', - name: 'Add Tip', - value: _.get(this.questionMetaData, 'instructions.en[0]'), - label: 'Tip', - enabled: _.get(this.questionMetaData, 'instructions.en[0]') ? true : false, - type: 'input', - show: _.get(this.sourcingSettings, 'showAddTips') - }, - { - id: 'addDependantQuestion', - name: 'Add Dependant Question', - label: '', - value: [], - enabled: false, - type: '', - show: _.get(this.sourcingSettings, 'showAddSecondaryQuestion') && !this.questionInput.setChildQueston - }, - ]; - if (!_.get(this.sourcingSettings, 'showAddSecondaryQuestion') && !this.questionInput.setChildQueston) { - this.showOptions = false; - } else { - this.showOptions = (this.questionInput.setChildQueston === true) ? true : false; - } } ngOnDestroy() { this.onComponentDestroy$.next(); this.onComponentDestroy$.complete(); this.editorCursor.clearQuestionMap(); } - - sliderData($event) { - const val = $event; - const obj = { - validation: { - range: { - min: '', - max: '' - } - }, - step: '' - }; - if (val.leftAnchor) { - obj.validation.range.min = val.leftAnchor; - } - if (val.rightAnchor) { - obj.validation.range.max = val.rightAnchor; - } - if (val.step) { - obj.step = val.step; - } - this.sliderDatas = obj; - } - - - conditionHandler(e) { - this.condition = e.target.value; - } - - optionHandler(e) { - this.targetOption = e.target.value; - } - - - buildCondition(type) { - if(this.condition ==='default' || _.isEmpty(this.selectedOptions) ){ - this.toasterService.error(_.get(this.configService, 'labelConfig.messages.error.038')); - return; - } - const questionId = this.questionId ? this.questionId : UUID.UUID(); - const data = this.treeService.getFirstChild(); - const hierarchyData = this.editorService.getHierarchyObj(data, '', this.selectedSectionId); - const sectionData = _.get(hierarchyData, `${this.selectedSectionId}`); - const sectionName = sectionData.name; - const branchingLogic = { - ...this.branchingLogic, - [this.editorService.parentIdentifier]: { - target: this.updateTarget(questionId), - preCondition: {}, - source: [] - }, - [questionId]: { - target: [], - source: [this.editorService.parentIdentifier], - preCondition: { - and: [ - { - [this.condition]: [ - { - var: `${this.editorService.parentIdentifier}.${this.responseVariable}.value`, - type: 'responseDeclaration', - }, - this.selectedOptions, - ], - }, - ], - }, - }, - }; - this.updateTreeCache(sectionName, branchingLogic, this.selectedSectionId); - const metaData = this.getQuestionMetadata(); - this.setQuestionTypeValues(metaData); - const finalResult = { - nodesModified: { - [questionId]: { - metadata: metaData, - objectType: 'Question', - root: false, - isNew: this.questionId ? false : true - }, - [this.selectedSectionId]: { - ...this.treeService.treeCache.nodesModified[this.selectedSectionId] - } - }, - hierarchy: this.editorService.getHierarchyObj(data, questionId, this.selectedSectionId,this.editorService.parentIdentifier) - }; - this.saveQuestions(finalResult, type); - } - - updateTarget(questionId) { - if (!_.isEmpty(this.branchingLogic) && _.get(this.branchingLogic, `${this.editorService.parentIdentifier}.target`)) { - if (this.branchingLogic[this.editorService.parentIdentifier].target.includes(questionId)) { - return [...this.branchingLogic[this.editorService.parentIdentifier].target]; - } - return [...this.branchingLogic[this.editorService.parentIdentifier].target, `${questionId}`]; - } - return [`${questionId}`]; - } - - getOptions() { - if (this.editorService.optionsLength) { - this.options = []; - Array.from({length: this.editorService.optionsLength}, (x, i) => { - this.options.push({value: i, label: i}); - }); - } - } - - getParentQuestionOptions(questionId) { - this.editorService.parentIdentifier = questionId; - this.questionService.readQuestion(questionId) - .subscribe((res) => { - if (res.responseCode === 'OK') { - const result = res.result.question; - if (result.interactionTypes[0] === 'choice') { - const numberOfOptions = result.editorState.options.length; - this.editorService.optionsLength = numberOfOptions; - this.getOptions(); - } - } - }); - } - - updateTreeCache(sectionName, branchingLogic, selectedSection) { - const metadata = { - name: sectionName, - primaryCategory: this.sectionPrimaryCategory, - allowBranching: 'Yes', - branchingLogic - }; - this.treeService.updateNode(metadata, selectedSection, this.sectionPrimaryCategory); - } - - setCondition(data) { - const Condition = _.get(data?.branchingLogic, `${this.questionId}.preCondition.and[0]`); - const getCondition = Object.keys(Condition); - this.condition = getCondition[0]; - this.selectedOptions = Condition[getCondition][1]; - } - } + diff --git a/projects/collection-editor-library/src/lib/components/quml-player/quml-player.component.ts b/projects/collection-editor-library/src/lib/components/quml-player/quml-player.component.ts index 11fb73ddc..dc79cf5a8 100644 --- a/projects/collection-editor-library/src/lib/components/quml-player/quml-player.component.ts +++ b/projects/collection-editor-library/src/lib/components/quml-player/quml-player.component.ts @@ -35,7 +35,7 @@ export class QumlPlayerComponent implements OnInit { let childNodes = this.qumlPlayerConfig.metadata.childNodes; childNodes = _.filter(childNodes, (identifier) => !_.endsWith(identifier, '.img')); this.qumlPlayerConfig.metadata.childNodes = childNodes; - const allQuestions = _.get(this.qumlPlayerConfig, 'config.objectType') === 'Question' ? [] : this.editorService.getContentChildrens(); + const allQuestions = this.editorService.getContentChildrens(); this.qumlPlayerConfig.metadata.maxQuestions = this.qumlPlayerConfig.metadata.maxQuestions || allQuestions.length; if (this.isSingleQuestionPreview) { this.qumlPlayerConfig.context.threshold = 1; diff --git a/projects/collection-editor-library/src/lib/components/qumlplayer-page/qumlplayer-page.component.html b/projects/collection-editor-library/src/lib/components/qumlplayer-page/qumlplayer-page.component.html index d4ad7f3fa..4782952f9 100644 --- a/projects/collection-editor-library/src/lib/components/qumlplayer-page/qumlplayer-page.component.html +++ b/projects/collection-editor-library/src/lib/components/qumlplayer-page/qumlplayer-page.component.html @@ -7,12 +7,11 @@
- -
@@ -35,7 +34,7 @@
-
{{questionMetaData?.name}}
+
{{questionMetaData?.name}}
diff --git a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.css b/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.html b/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.html deleted file mode 100644 index ba4a28e76..000000000 --- a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.data.ts deleted file mode 100644 index de09aac63..000000000 --- a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.data.ts +++ /dev/null @@ -1,80 +0,0 @@ -export const mockData = { - relationalMetadataConfig: [{ - name: 'First Section', - fields: [ - { - code: 'relName', - dataType: 'text', - description: 'Name of the content', - editable: true, - inputType: 'text', - label: 'Title', - name: 'Name', - placeholder: 'Title', - renderingHints: { - class: 'sb-g-col-lg-1 required' - }, - required: true, - visible: true, - validations: [ - { - type: 'max', - value: '120', - message: 'Input is Exceeded' - }, - { - type: 'required', - message: 'Title is required' - } - ] - } - ] - }], - contentMetadata: { - relationalMetadata: { - relName: 'Hello' - } - }, - editorConfig: { - context: { - framework: 'test', - user: { - id: '5a587cc1-e018-4859-a0a8-e842650b9d64', - name: 'Vaibhav', - orgIds: [ - '01309282781705830427' - ] - }, - identifier: 'do_113274017771085824116', - channel: '01307938306521497658', - authToken: ' ', - sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', - did: '7e85b4967aebd6704ba1f604f20056b6', - uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', - pdata: { - id: 'dev.dock.portal', - ver: '2.8.0', - pid: 'creation-portal' - }, - contextRollup: { - l1: '01307938306521497658' - }, - tags: [ - '01307938306521497658' - ], - cdata: [], - timeDiff: 5, - objectRollup: { - l1: 'do_113140468925825024117', - l2: 'do_113140468926914560125' - }, - host: '', - defaultLicense: 'CC BY 4.0', - endpoint: '/data/v3/telemetry', - env: 'question_set' - }, - config: { - mode: 'review' - } - } -}; diff --git a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.ts b/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.ts deleted file mode 100644 index a5a25e938..000000000 --- a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.spec.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as _ from 'lodash-es'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { RelationalMetadataComponent } from './relational-metadata.component'; -import { mockData } from './relational-metadata.component.spec.data'; -import { EditorService } from '../../services/editor/editor.service'; -import { TreeService } from '../../services/tree/tree.service'; - -describe('RelationalMetadataComponent', () => { - let component: RelationalMetadataComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - declarations: [ RelationalMetadataComponent ], - providers: [EditorService, TreeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(RelationalMetadataComponent); - component = fixture.componentInstance; - // fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should call #attachDefaultValues() when #contentId is not the same', () => { - spyOn(component, 'attachDefaultValues').and.callThrough(); - component.contentMetadata = { - identifier: 'do_456' - }; - component.contentId = 'do_123'; - component.ngOnChanges(); - expect(component.attachDefaultValues).toHaveBeenCalled(); - }); - - it('should not call #attachDefaultValues() when #contentId is the same', () => { - spyOn(component, 'attachDefaultValues').and.callThrough(); - component.contentMetadata = { - identifier: 'do_123' - }; - component.contentId = 'do_123'; - component.ngOnChanges(); - expect(component.attachDefaultValues).not.toHaveBeenCalled(); - }); - - it('should set #formFieldProperties when relationalMetdata form is set', () => { - spyOn(component, 'ifFieldIsEditable').and.callThrough(); - component.contentMetadata = mockData.contentMetadata; - component.formConfig = mockData.relationalMetadataConfig; - component.attachDefaultValues(); - expect(component.formFieldProperties).toBeDefined(); - expect(component.ifFieldIsEditable).toHaveBeenCalled(); - }); - - it('should not set #formFieldProperties when relationalMetdata form is empty', () => { - spyOn(component, 'ifFieldIsEditable').and.callThrough(); - component.contentMetadata = mockData.contentMetadata; - component.formConfig = []; - component.attachDefaultValues(); - expect(component.formFieldProperties).toBeDefined(); - expect(component.ifFieldIsEditable).not.toHaveBeenCalled(); - }); - - it('#isReviewMode() should return #false when #editorMode is "edit" ', () => { - const result = component.isReviewMode(); - expect(result).toBeFalsy(); - }); - - it('#ifFieldIsEditable() should return #true', () => { - const result = component.ifFieldIsEditable('relName'); - expect(result).toBeTruthy(); - }); - - it('#ifFieldIsEditable() should return #false when editorMode is "review"', () => { - const editorService = TestBed.inject(EditorService); - editorService.initialize(mockData.editorConfig); - const result = component.ifFieldIsEditable('relName'); - expect(result).toBeFalsy(); - }); - - it('#onFormStatusChange() should emit the form status', () => { - spyOn(component.statusChanges, 'emit'); - const testStatus = {valid: true}; - component.onFormStatusChange(testStatus); - expect(component.statusChanges.emit).toHaveBeenCalledWith(testStatus); - }); - - it('#onFormValueChange() should emit the form values', () => { - spyOn(component.valueChanges, 'emit'); - const testData = {name: 'Test Book'}; - const treeService = TestBed.inject(TreeService); - spyOn(treeService, 'getActiveNode').and.callFake(() => { - return { data: { metadata: { relationalMetadata: { name: 'Test' }} } }; - }); - component.onFormValueChange(testData); - expect(component.valueChanges.emit).toHaveBeenCalledWith(testData); - }); - -}); diff --git a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.ts b/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.ts deleted file mode 100644 index 062815693..000000000 --- a/projects/collection-editor-library/src/lib/components/relational-metadata/relational-metadata.component.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; -import * as _ from 'lodash-es'; -import { EditorService } from '../../services/editor/editor.service'; -import { ConfigService } from '../../services/config/config.service'; -import { TreeService } from '../../services/tree/tree.service'; - -@Component({ - selector: 'lib-relational-metadata', - templateUrl: './relational-metadata.component.html', - styleUrls: ['./relational-metadata.component.css'] -}) -export class RelationalMetadataComponent implements OnInit, OnChanges { - - @Input() contentMetadata: any; - @Input() formConfig: any; - public contentId; - @Output() statusChanges = new EventEmitter(); - @Output() valueChanges = new EventEmitter(); - public formFieldProperties: any; - constructor(private editorService: EditorService, private treeService: TreeService) { } - - ngOnInit(): void { - } - - ngOnChanges() { - this.contentMetadata = _.get(this.contentMetadata, 'data.metadata') || this.contentMetadata; - if (this.contentId !== this.contentMetadata.identifier) { - this.contentId = this.contentMetadata.identifier; - this.attachDefaultValues(); - } - } - - attachDefaultValues() { - let formConfig = _.cloneDeep(this.formConfig); - formConfig = this.formConfig && _.has(_.first(formConfig), 'fields') ? formConfig : [{name: '', fields: formConfig}]; - const metaDataFields = _.get(this.contentMetadata, 'relationalMetadata', {}); - _.forEach(formConfig, (section) => { - _.forEach(section.fields, field => { - if (metaDataFields) { - if (_.has(metaDataFields, field.code)) { - field.default = _.get(metaDataFields, field.code); - } - } - const ifEditable = this.ifFieldIsEditable(field.code); - _.set(field, 'editable', ifEditable); - - }); - }); - this.formFieldProperties = _.cloneDeep(formConfig); - } - - isReviewMode() { - return _.includes([ 'review', 'read', 'sourcingreview', 'orgreview' ], this.editorService.editorMode); - } - - ifFieldIsEditable(fieldCode) { - const ediorMode = this.editorService.editorMode; - if (!this.isReviewMode()) { - return true; - } - const editableFields = _.get(this.editorService.editorConfig.config, 'editableFields'); - if (editableFields && !_.isEmpty(editableFields[ediorMode]) && _.includes(editableFields[ediorMode], fieldCode)) { - return true; - } - return false; - } - - onFormStatusChange(event) { - this.statusChanges.emit(event); - } - - onFormValueChange(event) { - this.valueChanges.emit(event); - const selectedNode = this.treeService.getActiveNode(); - let relationalMetadata = _.get(selectedNode, 'data.metadata.relationalMetadata', {}); - relationalMetadata = _.assign({}, relationalMetadata, event); - selectedNode.data.metadata = {...selectedNode.data.metadata, relationalMetadata}; - } - -} diff --git a/projects/collection-editor-library/src/lib/components/resource-reorder/resource-reorder.component.html b/projects/collection-editor-library/src/lib/components/resource-reorder/resource-reorder.component.html index bb2b8eca4..b796d9d4e 100644 --- a/projects/collection-editor-library/src/lib/components/resource-reorder/resource-reorder.component.html +++ b/projects/collection-editor-library/src/lib/components/resource-reorder/resource-reorder.component.html @@ -21,7 +21,7 @@
@@ -39,7 +39,7 @@
-
+
diff --git a/projects/collection-editor-library/src/lib/components/slider/slider.component.html b/projects/collection-editor-library/src/lib/components/slider/slider.component.html deleted file mode 100644 index 9c45254e5..000000000 --- a/projects/collection-editor-library/src/lib/components/slider/slider.component.html +++ /dev/null @@ -1,17 +0,0 @@ -
- -
-
- - -
-
- - -
-
- - -
-
-
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/slider/slider.component.scss b/projects/collection-editor-library/src/lib/components/slider/slider.component.scss deleted file mode 100644 index e57a28be9..000000000 --- a/projects/collection-editor-library/src/lib/components/slider/slider.component.scss +++ /dev/null @@ -1,38 +0,0 @@ -.slider-align { - margin-top: 15px; -} -::placeholder { - padding: 0.25rem; - opacity: 0.99; - color: #999999; - font-family: "Noto Sans"; - font-size: 12px; - font-weight: bold; -} - -.sb-input { - margin: 1rem 0; -} - -label { - display: block; - font-size: 1rem; - margin: 0; -} - -.flex-container { - display: flex; - margin-top: 15px; -} - -.textbox { - width: 90%; - border: 1px solid rgba(34,36,38,.15)!important; - box-sizing: border-box; - background-color: #fff; - margin-right: 40px; - height: 45px; - border-radius: 5px; - font-size: 13px; - padding: 12px; -} diff --git a/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.data.ts deleted file mode 100644 index 44f0a5099..000000000 --- a/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.data.ts +++ /dev/null @@ -1,30 +0,0 @@ -export const mockData = { - editorDataInput: { - step: 1, - validation: { - range: { - min: 0, - max: 10, - }, - }, - }, - changeEvent: { - event: { - isTrusted: true, - target:{ - value:10 - }, - }, - }, -}; - -export const mockConfigService={ - labelConfig:{ - lbl:{ - left:"Left", - stepSize:"Step size", - right:"Right", - sliderValue:'Slider Value' - } - } -} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.ts b/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.ts deleted file mode 100644 index 67fc849f7..000000000 --- a/projects/collection-editor-library/src/lib/components/slider/slider.component.spec.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { mockConfigService, mockData } from "./slider.component.spec.data"; -import { SliderComponent } from "./slider.component"; -import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { ConfigService } from '../../services/config/config.service'; - -describe("SliderComponent", () => { - let component: SliderComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SliderComponent], - providers:[ - { provide: ConfigService, useValue: mockConfigService } - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SliderComponent); - component = fixture.componentInstance; - component.sliderValue = {}; - component.editorDataInput = mockData.editorDataInput; - // fixture.detectChanges(); - }); - - it("should create", () => { - expect(component).toBeTruthy(); - }); - - it("should call the ngOnInit", () => { - component.editorDataInput = mockData.editorDataInput; - spyOn(component, "ngOnInit").and.callThrough(); - component.ngOnInit(); - expect(component.ngOnInit).toHaveBeenCalled(); - }); - - it("should call the ngOnInit when editorDataInput is undefined", () => { - component.sliderValue = {}; - component.editorDataInput = {}; - spyOn(component, "ngOnInit").and.callThrough(); - component.ngOnInit(); - expect(component.ngOnInit).toHaveBeenCalled(); - }); - - it("#onValueChange() should emit onChange with data for rightAnchor", () => { - spyOn(component,'onValueChange').and.callThrough(); - spyOn(component.onChange, "emit"); - component.onValueChange(mockData.changeEvent.event, "rightAnchor"); - expect(component.onChange.emit).toHaveBeenCalledWith({ rightAnchor: 10 }); - expect(component.onValueChange).toHaveBeenCalled(); - expect(component.sliderValue.rightAnchor).toBe(10); - }); - -}); diff --git a/projects/collection-editor-library/src/lib/components/slider/slider.component.ts b/projects/collection-editor-library/src/lib/components/slider/slider.component.ts deleted file mode 100644 index 8f2b18e1a..000000000 --- a/projects/collection-editor-library/src/lib/components/slider/slider.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { ConfigService } from '../../services/config/config.service'; -import * as _ from 'lodash-es'; - -export class SilderEvent { - leftAnchor: number; - step: number; - rightAnchor: number; -} - -@Component({ - selector: 'lib-slider', - templateUrl: './slider.component.html', - styleUrls: ['./slider.component.scss'] -}) -export class SliderComponent implements OnInit { - sliderValue:any = {}; - @Input() editorDataInput; - leftAnchor: any; - rightAnchor: any; - step: any; - @Output() onChange: EventEmitter = new EventEmitter(); - constructor(public configService: ConfigService) { } - - ngOnInit(){ - if (_.get(this.editorDataInput,"step")) { - this.step = this.editorDataInput.step; - this.sliderValue['step']= this.editorDataInput.step; - } - if (_.get(this.editorDataInput,"validation.range.min")) { - this.leftAnchor = this.editorDataInput.validation.range.min; - this.sliderValue['leftAnchor']=this.leftAnchor; - } - if (_.get(this.editorDataInput,"validation.range.max")) { - this.rightAnchor = this.editorDataInput.validation.range.max; - this.sliderValue['rightAnchor']=this.rightAnchor; - } - } - - onValueChange(event,key){ - this.sliderValue[key]=event.target.value - this.onChange.emit(this.sliderValue); - } - -} diff --git a/projects/collection-editor-library/src/lib/components/template/template.component.html b/projects/collection-editor-library/src/lib/components/template/template.component.html index ade3272dc..4771f70b7 100644 --- a/projects/collection-editor-library/src/lib/components/template/template.component.html +++ b/projects/collection-editor-library/src/lib/components/template/template.component.html @@ -14,8 +14,8 @@ [ngClass]="{'active': templateSelected === template}">
- {{template + 'icon' }} -
{{configService.labelConfig?.categoryLabels[template] || template}} + +
{{template}}
diff --git a/projects/collection-editor-library/src/lib/components/translations/translations.component.html b/projects/collection-editor-library/src/lib/components/translations/translations.component.html deleted file mode 100644 index ce5cff03b..000000000 --- a/projects/collection-editor-library/src/lib/components/translations/translations.component.html +++ /dev/null @@ -1,25 +0,0 @@ -
- -
-
-
- -
-
{{sampleJson.body.en}}
-
- -
-
-
- -
-
{{options.label.en}}
-
- -
-
-
-
-
\ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/translations/translations.component.scss b/projects/collection-editor-library/src/lib/components/translations/translations.component.scss deleted file mode 100644 index 8d37cc1ae..000000000 --- a/projects/collection-editor-library/src/lib/components/translations/translations.component.scss +++ /dev/null @@ -1,14 +0,0 @@ -.tarnslation{ - margin-top: 15px; - margin-bottom: 15px; -} - -.mt-15{ - margin-top: 15px !important; - margin-bottom: 5px; - } - -.label-align{ - font-size: 15px; - font-weight: 500; -} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.data.ts b/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.data.ts deleted file mode 100644 index ad4922ebd..000000000 --- a/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.data.ts +++ /dev/null @@ -1,23 +0,0 @@ -export const mockData={ - editorState: { - body: { - "answer": '

Yes

', - "question": "

Hi how are you ?

", - "editorState": { - "answer": '

Yes

' - }, - "name": "Subjective Question", - "qType": "SA", - "primaryCategory": "Subjective Question" - }, - mediaobj: {} - }, - eventData: { - body: { answer: "

dad

" }, - editorState: { answer: "

dad

" }, - name: "Subjective Question", - qType: "SA", - primaryCategory: "Subjective Question", - mediaobj: 'audio' - } -} \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.ts b/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.ts deleted file mode 100644 index 84dbb6296..000000000 --- a/projects/collection-editor-library/src/lib/components/translations/translations.component.spec.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TranslationsComponent } from './translations.component'; -import { mockData } from './translations.component.spec.data'; - -describe('TranslationsComponent', () => { - let component: TranslationsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ TranslationsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TranslationsComponent); - component = fixture.componentInstance; - component.editorState = {}; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('#editorDataHandler() should call editorDataHandler for solution', () => { - spyOn(component,'editorDataHandler').and.callThrough(); - component.editorState.solutions=mockData.editorState; - component.editorDataHandler(mockData.eventData, 'solution'); - expect(component.editorDataHandler).toHaveBeenCalledWith(mockData.eventData, 'solution'); - }); - - it('#editorDataHandler() should call editorDataHandler for question', () => { - spyOn(component,'editorDataHandler').and.callThrough(); - component.editorDataHandler(mockData.eventData, 'question'); - expect(component.editorDataHandler).toHaveBeenCalledWith(mockData.eventData, 'question'); - expect(component.editorState.question).toBe(mockData.eventData.body); - }); - - it('#editorDataHandler() should call editorDataHandler without type', () => { - spyOn(component,'editorDataHandler').and.callThrough(); - component.editorDataHandler(mockData.eventData,'test'); - expect(component.editorDataHandler).toHaveBeenCalledWith(mockData.eventData, 'test'); - }); - -}); \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/components/translations/translations.component.ts b/projects/collection-editor-library/src/lib/components/translations/translations.component.ts deleted file mode 100644 index 23de89e8b..000000000 --- a/projects/collection-editor-library/src/lib/components/translations/translations.component.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { Component} from "@angular/core"; -import { ConfigService } from "../../services/config/config.service"; -import * as _ from 'lodash-es'; - -@Component({ - selector: "lib-translations", - templateUrl: "./translations.component.html", - styleUrls: ["./translations.component.scss"], -}) -export class TranslationsComponent { - public editorState: any = {}; - sampleJson = { - body: { - en: "What is the shape of the earth?", - }, - responseDeclaration: { - response1: { - maxScore: 1, - cardinality: "single", - type: "integer", - mapping: [ - { - response: 0, - outcomes: { - FEEDBACK: "feedback1", - }, - }, - { - response: 1, - outcomes: { - FEEDBACK: "feedback2", - }, - }, - { - response: 2, - outcomes: { - FEEDBACK: "feedback3", - }, - }, - ], - }, - }, - interactionTypes: ["choice"], - hints: { - en: ["hints in the specified language"], - }, - instructions: { - en: "instructions in the specified language", - }, - interactions: { - response1: { - type: "choice", - validation: { - required: "Yes/No", - }, - options: [ - { - label: { - en: ["Circular"], - }, - hints: { - en: ["hints in the specified language"], - }, - value: 0, - }, - { - label: { - en: ["Spherical"], - }, - hints: { - en: ["hints in the specified language"], - }, - value: 1, - }, - { - label: { - en: ["Rectangle"], - }, - hints: { - en: ["hints in the specified language"], - }, - value: 1, - }, - { - label: { - en: ["Square"], - }, - hints: { - en: ["hints in the specified language"], - }, - value: 1, - }, - ], - }, - }, - solution: [], - media: [], - showEvidence: "Yes/No", - evidence: { - required: "Yes/No", - mimeType: ["image/png", "audio/mp3", "video/mp4", "video/webm"], - minCount: 1, - maxCount: 1, - sizeLimit: "20480", - caption: "Yes/No", - }, - showRemarks: "Yes/No", - remarks: { - maxLength: "", - required: "Yes/No", - }, - canBeNotApplicable: "Yes/No", - }; - constructor(public configService: ConfigService) {} - - - editorDataHandler(event, type?) { - if (type === 'question') { - this.editorState.question = event.body; - } else if (type === 'solution') { - this.editorState.solutions = event.body; - } - - if (event.mediaobj) { - const media = event.mediaobj; - console.log(media); - } - } -} diff --git a/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.spec.ts b/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.spec.ts deleted file mode 100644 index 1d8fd97db..000000000 --- a/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { DateFormatPipe } from './date-format.pipe'; -import * as moment from 'moment'; - -describe('DateFormatPipe', () => { - describe('#transform', () => { - it('should take default format for date', () => { - const pipe = new DateFormatPipe(); - const date = new Date(); - const result = pipe.transform(date, ''); - const ans = moment(date).format('Do MMMM YYYY'); - expect(result).toBe(ans); - }); - - it('test for given format for date', () => { - const pipe = new DateFormatPipe(); - const date = new Date(); - const result = pipe.transform(date, 'MMMM YYYY Do'); - const ans = moment(date).format('MMMM YYYY Do'); - expect(result).toBe(ans); - }); - - it('if date is blank', () => { - const pipe = new DateFormatPipe(); - const result = pipe.transform('', 'Do MMMM YYYY'); - expect(result).toBe('-'); - }); - - }); -}); diff --git a/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.ts b/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.ts deleted file mode 100644 index 5295e59c5..000000000 --- a/projects/collection-editor-library/src/lib/directives/date-format/date-format.pipe.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; -const momentConstructor: (value?: any) => moment.Moment = (moment).default || moment; - -/** - * Pipe for date format - * - */ -@Pipe({ - name: 'dateFormat' -}) -export class DateFormatPipe implements PipeTransform { - /** - * To create date format pipe - * - * @param {Date} value current Date, string or number - * @param {string} format format of Date - * - */ - transform(value: Date | moment.Moment | string | number, format: string): string { - if (value) { - return momentConstructor(value).format(format || 'Do MMMM YYYY'); - } else { - return '-'; - } - } - -} diff --git a/projects/collection-editor-library/src/lib/interfaces/CreationContext.ts b/projects/collection-editor-library/src/lib/interfaces/CreationContext.ts deleted file mode 100644 index b0d68fc08..000000000 --- a/projects/collection-editor-library/src/lib/interfaces/CreationContext.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface ICreationContext { - objectType?: string; - collectionObjectType?: string; - unitIdentifier?: string; - isReadOnlyMode?: boolean | undefined; - mode?: string; - correctionComments?: string, - editableFields?: any; - index?: number; - } diff --git a/projects/collection-editor-library/src/lib/interfaces/editor.ts b/projects/collection-editor-library/src/lib/interfaces/editor.ts index d82e23416..f4ec96b0b 100644 --- a/projects/collection-editor-library/src/lib/interfaces/editor.ts +++ b/projects/collection-editor-library/src/lib/interfaces/editor.ts @@ -1,9 +1,7 @@ export interface Context { - programId?: string; - contributionOrgId?: string; user: User; - identifier?: string; - mode?: string; + identifier: string; + mode: string; authToken?: string; sid: string; did: string; @@ -29,29 +27,14 @@ export interface Context { subject?: any; topic?: any; framework: string; - cloudStorageUrls?: string[]; - additionalCategories?: any[]; + cloudStorageUrls: string[]; + additionalCategories: any[]; labels?: any; - actor?: any; - channelData?: any; - correctionComments?: any; - sourcingResourceStatus?: string; - sourcingResourceStatusClass?: string; - collectionIdentifier?: string; - unitIdentifier?: string; - collectionObjectType?: string; - collectionPrimaryCategory?: string; - targetFWIds?: string[]; } export interface User { id: string; - name?: string; + name: string; orgIds: string[]; - organisations?: any; - fullName?: string; - firstName?: string; - lastName?: string; - isRootOrgAdmin?: boolean; } export interface Pdata { id: string; diff --git a/projects/collection-editor-library/src/lib/interfaces/loader.ts b/projects/collection-editor-library/src/lib/interfaces/loader.ts deleted file mode 100644 index 58dc0ffa5..000000000 --- a/projects/collection-editor-library/src/lib/interfaces/loader.ts +++ /dev/null @@ -1,11 +0,0 @@ - -export interface ILoaderMessage { - /** - * header message - */ - headerMessage?: string; - /** - * loader message - */ - loaderMessage?: string; -} diff --git a/projects/collection-editor-library/src/lib/pipes/interpolate.pipe.ts b/projects/collection-editor-library/src/lib/pipes/interpolate.pipe.ts deleted file mode 100644 index 5ce2bdd69..000000000 --- a/projects/collection-editor-library/src/lib/pipes/interpolate.pipe.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Pipe, PipeTransform } from "@angular/core"; -import * as _ from "lodash-es"; - -@Pipe({ - name: "interpolate", -}) -export class InterpolatePipe implements PipeTransform { - transform(text: string, replaceText: string, replacedWith: string): string { - return _.replace(text, replaceText, replacedWith); - } -} diff --git a/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.spec.ts b/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.spec.ts deleted file mode 100644 index 7ea0e190f..000000000 --- a/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.spec.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {SanitizeHtmlPipe} from './sanitize-html.pipe'; -import {BrowserModule, DomSanitizer} from '@angular/platform-browser'; -import {TestBed} from '@angular/core/testing'; - -describe('TitleCasePipe', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [BrowserModule], - }); - }); - - it('should create an instance', () => { - const domSanitizer = TestBed.get(DomSanitizer); - const pipe = new SanitizeHtmlPipe(domSanitizer); - expect(pipe).toBeTruthy(); - }); -}); diff --git a/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.ts b/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.ts deleted file mode 100644 index 074754ef9..000000000 --- a/projects/collection-editor-library/src/lib/pipes/sanitize-html.pipe.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Pipe, PipeTransform } from "@angular/core"; -import { DomSanitizer, SafeHtml } from "@angular/platform-browser"; - -@Pipe({ name: "sanitizeHtml" }) -export class SanitizeHtmlPipe implements PipeTransform { - constructor(private _sanitizer: DomSanitizer) {} - - transform(value: string): SafeHtml { - return this._sanitizer.bypassSecurityTrustHtml(value); - } -} diff --git a/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.spec.ts b/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.spec.ts deleted file mode 100644 index dad87cb7c..000000000 --- a/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { BulkJobService } from './bulk-job.service'; -import { ConfigService } from '../config/config.service'; -import * as urlConfig from '../config/url.config.json'; -import * as labelConfig from '../config/label.config.json'; -import { HttpClientModule, HttpClient } from '@angular/common/http'; -import { PublicDataService } from '../public-data/public-data.service'; -import { of, throwError } from 'rxjs'; -import * as _ from 'lodash-es'; -xdescribe('BulkJobService', () => { - const configStub = { - urlConFig: (urlConfig as any).default, - labelConfig: (labelConfig as any).default - }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientModule], - providers: [HttpClient, PublicDataService, { provide: ConfigService, useValue: configStub }] - }); - }); - - it('should be created', () => { - const service: BulkJobService = TestBed.get(BulkJobService); - expect(service).toBeTruthy(); - }); - it('#getBulkOperationStatus() should get bulk operation status', () => { - const publicDataService: PublicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({})); - const service: BulkJobService = TestBed.get(BulkJobService); - const observable = service.getBulkOperationStatus('do_123'); - observable.subscribe((data) => { - expect(data).toEqual({}); - }); - }); - it('#createBulkJob() should get bulk operation status', () => { - const publicDataService: PublicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({})); - const service: BulkJobService = TestBed.get(BulkJobService); - const observable = service.createBulkJob('do_123'); - observable.subscribe((data) => { - expect(data).toEqual({}); - }); - }); -}); diff --git a/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.ts b/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.ts deleted file mode 100644 index bc212db0c..000000000 --- a/projects/collection-editor-library/src/lib/services/bulk-job/bulk-job.service.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { PublicDataService } from '../public-data/public-data.service'; -import { ConfigService } from '../config/config.service'; - -@Injectable({ - providedIn: 'root' -}) -export class BulkJobService { - - constructor(private publicDataService: PublicDataService, public configService: ConfigService) { } - - getBulkOperationStatus(reqData): Observable { - const req = { - url: `${this.configService.urlConFig.URLS.BULKJOB.SEARCH}`, - data: { - request: reqData - } - }; - return this.publicDataService.post(req); - } - - searchContentWithProcessId(processId) { - const reqData = { - url: `${this.configService.urlConFig.URLS.BULKJOB.STATUS}`, - data: { - request: { - processId - } - } - }; - return this.publicDataService.post(reqData); - } - - createBulkJob(reqData): Observable { - const req = { - url: `${this.configService.urlConFig.URLS.BULKJOB.CREATE}`, - data: { - request: reqData - } - }; - return this.publicDataService.post(req); - } - - updateBulkJob(reqData): Observable { - const req = { - url: `${this.configService.urlConFig.URLS.BULKJOB.UPDATE}`, - data: { - request: reqData - } - }; - return this.publicDataService.patch(req); - } - - createBulkImport(reqData, headers): Observable { - const req = { - url: `${this.configService.urlConFig.URLS.BULKJOB.UPLOAD}`, - data: { - request: reqData - }, - header: headers - }; - return this.publicDataService.post(req); - } -} diff --git a/projects/collection-editor-library/src/lib/services/config/category.config.json b/projects/collection-editor-library/src/lib/services/config/category.config.json index c7d19562f..1442dbcea 100644 --- a/projects/collection-editor-library/src/lib/services/config/category.config.json +++ b/projects/collection-editor-library/src/lib/services/config/category.config.json @@ -1,7 +1,6 @@ { "QuestionSet": "questionSet", "Collection": "content", - "Question": "question", "additionalCategories": { "QuestionSet": "contentAdditionalCategories", "Collection": "collectionAdditionalCategories" diff --git a/projects/collection-editor-library/src/lib/services/config/config.service.spec.ts b/projects/collection-editor-library/src/lib/services/config/config.service.spec.ts index 05a733031..c8fff3dd4 100644 --- a/projects/collection-editor-library/src/lib/services/config/config.service.spec.ts +++ b/projects/collection-editor-library/src/lib/services/config/config.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { ConfigService } from './config.service'; -xdescribe('ConfigService', () => { +describe('ConfigService', () => { beforeEach(() => TestBed.configureTestingModule({})); it('should be created', () => { diff --git a/projects/collection-editor-library/src/lib/services/config/editor.config.json b/projects/collection-editor-library/src/lib/services/config/editor.config.json index 257610e53..d01ef555a 100644 --- a/projects/collection-editor-library/src/lib/services/config/editor.config.json +++ b/projects/collection-editor-library/src/lib/services/config/editor.config.json @@ -1,8 +1,8 @@ { "rejectCommentsMaxLength": 500, "setDefaultCopyRight": true, - "showOriginPreviewUrl": false, - "showSourcingStatus": false, + "showOriginPreviewUrl": false, + "showSourcingStatus": false, "showCorrectionComments": false, "publicStorageAccount": "", "assetConfig": { @@ -17,9 +17,9 @@ "accepted": "mp4, webm" } }, - "questionPrimaryCategories": ["Multiple Choice Question", "Subjective Question"], + "questionPrimaryCategories": ["Multiple Choice Question", "Subjective Question"], "contentPrimaryCategories": ["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set"], - "readQuestionFields": "body,primaryCategory,mimeType,qType,answer,templateId,responseDeclaration,interactionTypes,interactions,name,solutions,editorState,media,remarks,evidence,hints,instructions,", + "readQuestionFields": "body,primaryCategory,mimeType,qType,answer,templateId,responseDeclaration,interactionTypes,interactions,name,solutions,editorState,media,", "omitFalseyProperties":["topic", "topicsIds", "targetTopicIds", "keywords"], "questionSet": { "maxQuestionsLimit": "500" @@ -27,32 +27,5 @@ "collection": { "maxContentsLimit": "1200" }, - "showAddCollaborator": false, - "enableBulkUpload": false, - "defaultStates": { - "nonInteractiveQuestions": { - "MTF": { - "question": "

Match the following:

Column 1Column 2
", - "answer": "

Match the following:

Column 1Column 2
" - }, - "FTB": { - "question": "", "answer": "", "solutions": "" - }, - "VSA": { - "question": "", "answer": "", "solutions": "" - }, - "SA": { - "question": "", "answer": "", "solutions": "" - }, - "LA": { - "question": "", "answer": "", "solutions": "" - }, - "CuriosityQuestion": { - "question": "", "answer": "", "solutions": "" - }, - "Comprehension": { - "question": "", "answer": "", "solutions": "" - } - } - } + "showAddCollaborator": false } diff --git a/projects/collection-editor-library/src/lib/services/config/label.config.json b/projects/collection-editor-library/src/lib/services/config/label.config.json index a95fa63c6..423bd045b 100644 --- a/projects/collection-editor-library/src/lib/services/config/label.config.json +++ b/projects/collection-editor-library/src/lib/services/config/label.config.json @@ -45,8 +45,7 @@ "delete_btn_label":"Delete", "next_btn_label":"Next", "remove_btn_label":"Remove", - "done_btn_label":"Done", - "add_translation_label":"Add Translation" + "done_btn_label":"Done" }, "lbl":{ "search":"Search", @@ -122,8 +121,8 @@ "viewComments":"View Comments", "addReviewComments":"Add Review Comments", "enterYourComments":"Enter your comments", - "publishCollection":"Publish ${objectType}", - "confirmPublishCollection":"Are you sure you want to publish this ${objectType}?", + "publishCollection":"Publish Collection", + "confirmPublishCollection":"Are you sure you want to publish this collection?", "fillComments":"Fill comments", "searchLibrary":"Search Library", "options":"Options", @@ -175,52 +174,8 @@ "collaborators": "Collaborators", "addCollaborators": "Add Collaborators", "manageCollaborators": "Manage Collaborators", - "sliderValue":"Slider Value", - "left":"Left", - "stepSize":"Step size", - "right":"Right", - "translation":"Translation", "publishchecklistTitle": "Please confirm that ALL the following items are verified (by ticking the check-boxes) before you can publish:", - "bulkUploadErrorMessage" : "The metadata file has following errors. Please check and upload again", - "bulkUploadQuestion": "Bulk Upload Question", - "lastUploaded": "Last uploaded", - "bulkInProgress": "Bulk upload in progress", - "viewDetails": "View Details", - "downloadSampleMetadataCsvFileAndCreate": "Download sample metadata CSV file and create your own metadata file using the format", - "makeSureYourFile": "Make sure your file", - "allColumnsAreAvailableShownFormat": "All columns are available as shown in format.", - "hasAllMandatoryColumnsFilledAsMarkedInFormat": "Has all mandatory columns filled, as marked in the format", - "hasNoDuplicateUrlsFilepathColumn": "Has no duplicate URLs in the filepath column", - "downloadSampleMetadataCsv": "Download sample metadata CSV", - "processingDroppedFiles" : "Processing dropped files...", - "retry": "retry", - "dragAndDrop": "Drag and Drop file", - "or" : "or", - "selectFile": "Select file", - "uploadCSVXlEntries": "Upload csv upto 300 entries", - "no": "No", - "yes": "Yes", - "cancel": "Cancel", - "ok": "OK", - "validatingCSVFile": "Validating CSV file", - "metadataFileValidationFailed": "Metadata file validation failed.", - "metadataFollowingError": "The metadata file has following errors. Please check and upload again", - "uploadingYourContentFromCSV": "Uploading your question from CSV", - "uploadFail" : "Upload failed", - "uploadSuccessful" : "Upload successful", - "uploadRemaining" : "Upload remaining", - "bulkUploadComplete" : "Bulk upload complete!", - "contentUploaded" : "Question uploaded", - "downloadReport": "Download report", - "next": "Next", - "back": "Back", - "close": "Close", - "bulkUploadNoticeLine1": "Uploading in bulk may take some time, click on", - "bulkUploadNoticeLine2": "to continue using Vidyadaan.", - "bulkUploadNoticeLine3": "Your upload will keep running in the background.", - "alreadyContentPresent": "Already present in this folder", - "loaderHeading": "Please wait", - "loaderMessage": "We are fetching details." + "alreadyContentPresent": "Already present in this folder" }, "err":{ "somethingWentWrong":"Something went wrong", @@ -267,17 +222,8 @@ "031": "Cannot create question. reached limit of maximum number of questions allowed.", "032": "Cannot add content. reached limit of maximum number of contents allowed.", "033": "failed to convert url to blob ", - "034": "failed to download {FILE_TYPE} file using blob url ", - "035": "Unable to get pre_signed_url and Question bulk upload Failed, Please Try Again", - "036": "Unable to upload to Blob and Question bulk upload Failed, Please Try Again", - "037": "Unable to accepted question", - "038": "Unable to approve content", - "039": "Unable to reject content", - "040": "Unable to send content back for corrections", - "041": "Cannot add question. reached limit of maximum number of questions allowed.", - "042": "Cannot create content. reached limit of maximum number of contents allowed.", - "043": "Adding question to questionset failed. Please try again." - }, + "034": "failed to download {FILE_TYPE} file using blob url " + }, "success": { "001": "Content is saved", "002": "Content is sent for review", @@ -290,12 +236,7 @@ "009": "QR code(s) updated successfully", "010": "QR code generated.", "011": "QR codes downloaded" , - "012": "Collaborators updated successfully", - "013": "Question saved successfully", - "037": "Question accepted successfully", - "038": "Content is successfully approved", - "039": "Content is successfully rejected", - "040": "Content sent back for corrections" + "012": "Collaborators updated successfully" }, "warning" : { "001" : "Errors found in linked QR Codes. Please check and correct.", @@ -304,8 +245,5 @@ "info" : { "001" : "QR code image generation is in progress. Please try downloading after sometime" } - }, - "categoryLabels": { - "Multiselect Multiple Choice Question": "Multiple Choice Question" - } - } + } + } \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/services/config/player.config.json b/projects/collection-editor-library/src/lib/services/config/player.config.json index 896bb03d5..46421b10f 100644 --- a/projects/collection-editor-library/src/lib/services/config/player.config.json +++ b/projects/collection-editor-library/src/lib/services/config/player.config.json @@ -89,9 +89,6 @@ "video-player":[ "video/mp4", "video/webm" - ], - "epub-player": [ - "application/epub" ] }, "baseURL":"/content/preview/preview.html?webview=true", diff --git a/projects/collection-editor-library/src/lib/services/config/url.config.json b/projects/collection-editor-library/src/lib/services/config/url.config.json index bbbdd51ef..b5f7459a2 100644 --- a/projects/collection-editor-library/src/lib/services/config/url.config.json +++ b/projects/collection-editor-library/src/lib/services/config/url.config.json @@ -2,26 +2,13 @@ "URLS": { "QuestionSet": { "HIERARCHY_READ": "questionset/v1/hierarchy", - "ADD": "questionset/v1/add", "READ": "questionset/v1/read", - "CREATE": "questionset/v1/create", - "UPDATE": "questionset/v1/update/", "HIERARCHY_UPDATE": "questionset/v1/hierarchy/update", "CONTENT_REVIEW" : "questionset/v1/review/", "CONTENT_REJECT" : "questionset/v1/reject/", "CONTENT_PUBLISH" : "questionset/v1/publish/", "DEFAULT_PARAMS_FIELDS": "instructions", - "SYSYTEM_UPDATE": "questionset/v4/system/update/", - "DELETENODE" : "questionset/v1/remove" - }, - "Question": { - "HIERARCHY_READ": "questionset/v1/hierarchy", - "CREATE": "question/v1/create", - "UPDATE": "question/v1/update/", - "CONTENT_REVIEW" : "question/v1/review/", - "CONTENT_REJECT": "question/v1/reject/", - "CONTENT_PUBLISH": "question/v1/publish/", - "SYSYTEM_UPDATE": "question/v4/system/update/" + "SYSYTEM_UPDATE": "questionset/v4/system/update/" }, "Collection": { "HIERARCHY_READ": "content/v3/hierarchy", @@ -42,7 +29,7 @@ }, "ContentPolicyUrl" : "/term-of-use.html", "assetProxyUrl": "/assets/public/", - "getCategoryDefinition": "object/category/definition/v1/read?fields=objectMetadata,forms,name,label", + "getCategoryDefinition": "object/category/definition/v1/read?fields=objectMetadata,forms,name", "CONTENT": { "HIERARCHY_ADD":"content/v3/hierarchy/add", "READ":"content/v3/read/", @@ -64,21 +51,8 @@ "DOWNLOAD": "collection/v1/export/", "SAMPLE_COLLECTION_HIERARCHY": "sourcing/collection-hierarchy/createfoldersamplecsvfile.csv" }, - "BULKJOB": { - "CREATE": "program/v1/process/create", - "UPDATE": "program/v1/process/update", - "SEARCH": "program/v1/process/search", - "UPLOAD": "question/v1/bulkUpload", - "STATUS": "question/v1/bulkUploadStatus", - "SAMPLE_QUESTION_FILE" : "bulk-question-upload-sample-format.csv" - }, "USER": { "SEARCH":"user/v1/search" - }, - "ASSET": { - "READ":"asset/v1/read/", - "CREATE":"asset/v1/create", - "UPLOAD":"asset/v1/upload/" - } + } } } diff --git a/projects/collection-editor-library/src/lib/services/editor/editor.service.spec.ts b/projects/collection-editor-library/src/lib/services/editor/editor.service.spec.ts index 59c82d82b..e764c4362 100755 --- a/projects/collection-editor-library/src/lib/services/editor/editor.service.spec.ts +++ b/projects/collection-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 } 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'; @@ -11,12 +11,10 @@ import * as categoryConfig from '../../services/config/category.config.json'; 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'; describe('EditorService', () => { let editorService: EditorService; - let treeService; const configStub = { urlConFig: (urlConfig as any).default, labelConfig: (labelConfig as any).default, @@ -29,16 +27,6 @@ describe('EditorService', () => { '011': 'File downloaded' }, } - }, - categoryConfig: { - QuestionSet: 'questionSet' - }, - urlConFig: { - URLS: { - questionSet: { - SYSYTEM_UPDATE: '' - } - } } }; beforeEach(() => { @@ -46,12 +34,10 @@ describe('EditorService', () => { imports: [HttpClientModule], providers: [HttpClient, DataService, - TreeService, PublicDataService, { provide: ConfigService, useValue: configStub }] }); editorService = TestBed.get(EditorService); - treeService=TestBed.get(TreeService); editorService.initialize(editorConfig); }); @@ -99,20 +85,12 @@ describe('EditorService', () => { expect(result).toBeTruthy(); }); - it('#emitshowLibraryPageEvent() should call #showLibraryPage.emit event', () => { - spyOn(editorService, 'emitshowLibraryPageEvent').and.callThrough(); - spyOn(editorService.showLibraryPage, 'emit').and.callFake(() => {}); + it('#emitshowLibraryPageEvent() should call #showLibraryPage.emit event', ()=> { + spyOn(editorService.showLibraryPage, 'emit'); editorService.emitshowLibraryPageEvent('test'); expect(editorService.showLibraryPage.emit).toHaveBeenCalledWith('test'); }); - it('#emitshowQuestionLibraryPageEvent() should call #showQuestionLibraryPage.emit event', ()=> { - spyOn(editorService, 'emitshowQuestionLibraryPageEvent').and.callThrough(); - spyOn(editorService.showQuestionLibraryPage, 'emit').and.callFake(() => {}); - editorService.emitshowQuestionLibraryPageEvent('test'); - expect(editorService.showQuestionLibraryPage.emit).toHaveBeenCalledWith('test'); - }); - it('#contentsCountAddedInLibraryPage() should increase value of contentsCount', () => { const service: EditorService = TestBed.get(EditorService); service.contentsCount = 0; @@ -132,23 +110,18 @@ describe('EditorService', () => { expect(result).toBeTruthy(); }); - it('#getshowQuestionLibraryPageEmitter() should return event emitter object', () => { - const result: EventEmitter = editorService.getshowQuestionLibraryPageEmitter(); - expect(result).toBeTruthy(); - }); - it('#getQuestionList() should return question list', async()=> { const questionIds: string[] = [ - 'do_11330103476396851218', - 'do_113301035530600448110' + "do_11330103476396851218", + "do_113301035530600448110" ]; const dataService = TestBed.get(DataService); spyOn(dataService, 'post').and.returnValue(of({ - id: 'api.questions.list', - result: { - questions: [ + "id": "api.questions.list", + "result": { + "questions": [ ], - count: 0 + "count": 0 } })); editorService.getQuestionList(questionIds).subscribe(data => { @@ -159,7 +132,7 @@ describe('EditorService', () => { it('#fetchCollectionHierarchy() should return collection hierarchy', async()=> { const collectionId = 'do_11330102570702438417'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'get').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'get').and.returnValue(of({"responseCode": "OK"})); editorService.fetchCollectionHierarchy(collectionId).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -168,34 +141,35 @@ describe('EditorService', () => { it('#readQuestionSet() should return question set', async()=> { const questionSetId = 'do_11330102570702438417'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'get').and.returnValue(of({responseCode: 'OK'})); - editorService.readQuestionSet(questionSetId); - expect(publicDataService.get).toHaveBeenCalled(); + spyOn(publicDataService, 'get').and.returnValue(of({"responseCode": "OK"})); + editorService.readQuestionSet(questionSetId).subscribe(data => { + expect(data.responseCode).toEqual('OK'); + }); }); it('#fetchContentDetails() should return content details', async()=> { - spyOn(editorService, 'fetchContentDetails').and.callThrough(); const contentId = 'do_113297001817145344190'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'get').and.returnValue(of({responseCode: 'OK'})); - editorService.fetchContentDetails(contentId); - expect(publicDataService.get).toHaveBeenCalled(); + spyOn(publicDataService, 'get').and.returnValue(of({"responseCode": "OK"})); + editorService.fetchContentDetails(contentId).subscribe(data => { + expect(data.responseCode).toEqual('OK'); + }); }); it('#updateHierarchy() should update hierarchy', async()=> { const publicDataService = TestBed.get(PublicDataService); spyOn(editorService, 'getCollectionHierarchy').and.callFake(()=>{ return { - id: 'api.content.hierarchy.get', - ver: '3.0', - ts: '2021-06-29T09:17:27ZZ', - responseCode: 'OK', - result: { - content: {} + "id": "api.content.hierarchy.get", + "ver": "3.0", + "ts": "2021-06-29T09:17:27ZZ", + "responseCode": "OK", + "result": { + "content": {} } }; }) - spyOn(publicDataService, 'patch').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'patch').and.returnValue(of({"responseCode": "OK"})); editorService.updateHierarchy().subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -204,7 +178,7 @@ describe('EditorService', () => { it('#reviewContent() should update hierarchy', async()=> { const contentId = 'do_11326714211239526417'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'post').and.returnValue(of({"responseCode": "OK"})); editorService.reviewContent(contentId).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -214,7 +188,7 @@ describe('EditorService', () => { const contentId = 'do_11326714211239526417'; const comment = 'No appropriate description' const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'post').and.returnValue(of({"responseCode": "OK"})); editorService.submitRequestChanges(contentId, comment).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -223,7 +197,7 @@ describe('EditorService', () => { it('#publishContent() should publish content when API success', async()=> { const contentId = 'do_11326714211239526417'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'post').and.returnValue(of({"responseCode": "OK"})); editorService.publishContent(contentId, {}).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -234,7 +208,7 @@ describe('EditorService', () => { const unitIdentifier = 'do_11326714211239526417'; const contentId = 'do_11326714211239526417'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'patch').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'patch').and.returnValue(of({"responseCode": "OK"})); editorService.addResourceToHierarchy(collection, unitIdentifier, contentId).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -245,7 +219,7 @@ describe('EditorService', () => { const channel = 'forms'; const objectType = 'name'; const publicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'post').and.returnValue(of({responseCode: 'OK'})); + spyOn(publicDataService, 'post').and.returnValue(of({"responseCode": "OK"})); editorService.getCategoryDefinition(categoryName, channel, objectType).subscribe(data => { expect(data.responseCode).toEqual('OK'); }); @@ -254,7 +228,7 @@ describe('EditorService', () => { it('#checkIfContentsCanbeAdded() should return true', ()=> { editorService.contentsCount = 0; spyOn(editorService, 'getContentChildrens').and.callFake(() => []); - let result = editorService.checkIfContentsCanbeAdded('add'); + let result = editorService.checkIfContentsCanbeAdded(); expect(editorService.getContentChildrens).toHaveBeenCalled(); expect(result).toBe(true); }); @@ -268,7 +242,7 @@ describe('EditorService', () => { it('#checkIfContentsCanbeAdded() should return false', ()=> { editorService.contentsCount = 0; spyOn(editorService, 'getContentChildrens').and.callFake(() => [1,2,3,4,5,6,7,8,9,10]); - let result = editorService.checkIfContentsCanbeAdded('add'); + let result = editorService.checkIfContentsCanbeAdded(); expect(editorService.getContentChildrens).toHaveBeenCalled(); expect(result).toBe(false); }); @@ -378,136 +352,4 @@ describe('EditorService', () => { expect(publicDataService.post).toHaveBeenCalled(); expect(returnValue).toBeDefined(); }); - it('#addResourceToQuestionset() should add question to questionSet on API success', () => { - const questionId = 'do_123'; - const collectionId = 'do_11330102570702438417'; - const unitIdentifier = 'do_11326714211239526417'; - const publicDataService: PublicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'patch').and.returnValue(of({ - responseCode: 'OK' - })); - editorService.addResourceToQuestionset(collectionId, unitIdentifier, questionId).subscribe(data => { - expect(data.responseCode).toEqual('OK'); - }); - }); - it('#addResourceToQuestionset() should add questions to questionSet on API success', () => { - const questionIds = ['do_123', 'do_1234']; - const collectionId = 'do_11330102570702438417'; - const unitIdentifier = 'do_11326714211239526417'; - const publicDataService: PublicDataService = TestBed.get(PublicDataService); - spyOn(publicDataService, 'patch').and.returnValue(of({ - responseCode: 'OK' - })); - editorService.addResourceToQuestionset(collectionId, unitIdentifier, questionIds); - expect(publicDataService.patch).toHaveBeenCalled(); }); - it('#updateCollection() should reject question for event sourcingRejectQuestion', () => { - const collectionId = 'do_11330102570702438417'; - const event = { - button: 'sourcingRejectQuestion', - requestBody: { - request: { - questionset: {} - } - } - }; - const publicDataService: PublicDataService = TestBed.get(PublicDataService); - editorConfig.context.collectionObjectType = 'QuestionSet'; - spyOn(publicDataService, 'patch').and.returnValue(of({ - responseCode: 'OK' - })); - editorService.updateCollection(collectionId, event).subscribe(data => { - expect(data.responseCode).toEqual('OK'); - }); - }) - - it('#getBranchingLogicByFolder() should call', () => { - spyOn(editorService,'getBranchingLogicByFolder').and.callThrough(); - spyOn(editorService.treeService, 'getNodeById').and.returnValue(of(treeNodeData)) - editorService.getBranchingLogicByFolder('do_113432866096922624110'); - expect(editorService.getBranchingLogicByFolder).toHaveBeenCalled(); - }); - - it('#getDependentNodes() should call', () => { - spyOn(editorService,'getDependentNodes').and.callThrough(); - spyOn(editorService.treeService, 'getNodeById').and.returnValue(of(treeNodeData)) - editorService.getDependentNodes('do_113432866096922624110'); - expect(editorService.getDependentNodes).toHaveBeenCalled(); - }); - - it('#getBranchingLogicByNodeId() should call', () => { - spyOn(editorService,'getBranchingLogicByNodeId').and.callThrough(); - spyOn(editorService.treeService, 'getNodeById').and.returnValue(of(treeNodeData)) - editorService.getBranchingLogicByNodeId('do_113432866096922624110'); - expect(editorService.getBranchingLogicByNodeId).toHaveBeenCalled(); - }); - - it('#getParentDependentMap() should call', () => { - spyOn(editorService,'getParentDependentMap').and.callThrough(); - editorService.getParentDependentMap(rootNodeData); - expect(editorService.getParentDependentMap).toHaveBeenCalled(); - }); - - it('#getFlattenedBranchingLogic() should call', () => { - spyOn(editorService,'getFlattenedBranchingLogic'); - editorService._toFlatObjFromHierarchy(rootNodeData) - editorService.getFlattenedBranchingLogic(rootNodeData); - expect(editorService.getFlattenedBranchingLogic); - }); - - it('#getBranchingLogicEntry() should call', () => { - spyOn(editorService,'getBranchingLogicEntry').and.callThrough(); - editorService.getBranchingLogicEntry(BranchingLogicData,'do_113432866799935488112'); - expect(editorService.getBranchingLogicEntry).toHaveBeenCalled(); - }); - - it('#getPrimaryCategoryName() should call to get primary category name', () => { - spyOn(editorService.treeService, 'getNodeById').and.returnValue(of(treeNodeData)) - spyOn(editorService,'getPrimaryCategoryName').and.callThrough(); - editorService.getPrimaryCategoryName('do_11326714211239526417'); - expect(editorService.getPrimaryCategoryName).toHaveBeenCalledWith('do_11326714211239526417') - }); - - it('#getCollectionHierarchy should call',()=>{ - spyOn(editorService,'getCollectionHierarchy').and.callThrough(); - spyOn(treeService, 'getFirstChild').and.callFake(() => { - return { data: { metadata: { identifier: '0123'} } }; - }); - hierarchyRootNodeData.folder=true; - editorService.getHierarchyObj(hierarchyRootNodeData,'do_113432866096922624110','do_113432866096922624110','do_1134468013653114881310'); - editorService.getCollectionHierarchy(); - expect(editorService.getCollectionHierarchy).toHaveBeenCalled(); - }) - - it('#getCollectionHierarchy should call when folder false',()=>{ - spyOn(editorService,'getCollectionHierarchy').and.callThrough(); - spyOn(treeService, 'getFirstChild').and.callFake(() => { - return { data: { metadata: { identifier: '0123'} } }; - }); - hierarchyRootNodeData.folder=false; - editorService.getHierarchyObj(hierarchyRootNodeData,'do_113432866096922624110','do_113432866096922624110','do_1134468013653114881310'); - editorService.getCollectionHierarchy(); - expect(editorService.getCollectionHierarchy).toHaveBeenCalled(); - }) - - it('#getCollectionHierarchy should call when no section id and parent',()=>{ - spyOn(editorService,'getCollectionHierarchy').and.callThrough(); - spyOn(treeService, 'getFirstChild').and.callFake(() => { - return { data: { metadata: { identifier: '0123'} } }; - }); - hierarchyRootNodeData.folder=false; - editorService.getHierarchyObj(hierarchyRootNodeData); - editorService.getCollectionHierarchy(); - expect(editorService.getCollectionHierarchy).toHaveBeenCalled(); - }) - - it('#_toFlatObjFromHierarchy should call',()=>{ - spyOn(editorService,'_toFlatObjFromHierarchy').and.callThrough(); - spyOn(treeService, 'getFirstChild').and.callFake(() => { - return { data: { metadata: { identifier: '0123'} } }; - }); - editorService._toFlatObjFromHierarchy(rootNodeData); - expect(editorService._toFlatObjFromHierarchy).toHaveBeenCalled(); - }) - -}); \ No newline at end of file diff --git a/projects/collection-editor-library/src/lib/services/editor/editor.service.ts b/projects/collection-editor-library/src/lib/services/editor/editor.service.ts index 01beccfba..7b98f31fd 100755 --- a/projects/collection-editor-library/src/lib/services/editor/editor.service.ts +++ b/projects/collection-editor-library/src/lib/services/editor/editor.service.ts @@ -1,5 +1,5 @@ import { Injectable, EventEmitter } from '@angular/core'; -import { Observable, Subject, BehaviorSubject } from 'rxjs'; +import { Observable, Subject } from 'rxjs'; import * as _ from 'lodash-es'; import { TreeService } from '../tree/tree.service'; import { PublicDataService } from '../public-data/public-data.service'; @@ -10,9 +10,8 @@ import { EditorTelemetryService } from '../../services/telemetry/telemetry.servi import { DataService } from '../data/data.service'; import { map } from 'rxjs/operators'; import { HttpClient } from '@angular/common/http'; -import { ExportToCsv } from 'export-to-csv'; + interface SelectedChildren { - label?: string; primaryCategory?: string; mimeType?: string; interactionType?: string; @@ -26,17 +25,7 @@ export class EditorService { private _editorConfig: IEditorConfig; private _editorMode = 'edit'; public showLibraryPage: EventEmitter = new EventEmitter(); - public showQuestionLibraryPage: EventEmitter = new EventEmitter(); - private _bulkUploadStatus$ = new BehaviorSubject(undefined); - public readonly bulkUploadStatus$: Observable = this._bulkUploadStatus$; public contentsCount = 0; - templateList = []; - parentIdentifier: any; - branchingLogic = {}; - selectedSection: any; - optionsLength: any; - selectedPrimaryCategory: any; - leafParentIdentifier: any; constructor(public treeService: TreeService, private toasterService: ToasterService, public configService: ConfigService, private telemetryService: EditorTelemetryService, private publicDataService: PublicDataService, private dataService: DataService, public httpClient: HttpClient) { @@ -83,21 +72,12 @@ export class EditorService { return _.cloneDeep(_.merge(this.configService.labelConfig.button_labels, _.get(this.editorConfig, 'context.labels'))); } - nextBulkUploadStatus(status) { - this._bulkUploadStatus$.next(status); - } emitshowLibraryPageEvent(page) { this.showLibraryPage.emit(page); } getshowLibraryPageEmitter() { return this.showLibraryPage; } - emitshowQuestionLibraryPageEvent(page) { - this.showQuestionLibraryPage.emit(page); - } - getshowQuestionLibraryPageEmitter() { - return this.showQuestionLibraryPage; - } getQuestionList(questionIds: string[]): Observable { const option = { @@ -161,7 +141,7 @@ export class EditorService { } getFieldsToUpdate(collectionId) { - const formFields = {}; + let formFields = {}; const editableFields = _.get(this.editorConfig.config, 'editableFields'); if (editableFields && !_.isEmpty(editableFields[this.editorMode])) { const fields = editableFields[this.editorMode]; @@ -174,36 +154,21 @@ export class EditorService { return formFields; } - updateCollection(collectionId, event: any = {}) { + updateCollection(collectionId, data?) { let objType = this.configService.categoryConfig[this.editorConfig.config.objectType]; - let url = this.configService.urlConFig.URLS[this.editorConfig.config.objectType]; - let requestBody = { - request: { } - }; objType = objType.toLowerCase(); - - if (event.button === 'sourcingApproveQuestion' || event.button === 'sourcingRejectQuestion') { - objType = this.configService.categoryConfig[this.editorConfig.context['collectionObjectType']]; - objType = objType.toLowerCase(); - url = this.configService.urlConFig.URLS[this.editorConfig.context['collectionObjectType']]; - - requestBody = event.requestBody; - requestBody.request[objType]['lastPublishedBy'] = this.editorConfig.context.user.id; - } - else { - const fieldsObj = this.getFieldsToUpdate(collectionId); - requestBody = { - request: { - [objType]: { - ...fieldsObj, - lastPublishedBy: this.editorConfig.context.user.id - } + const url = this.configService.urlConFig.URLS[this.editorConfig.config.objectType]; + const fieldsObj = this.getFieldsToUpdate(collectionId); + const requestBody = { + request: { + [objType]: { + ...fieldsObj, + lastPublishedBy: this.editorConfig.context.user.id } - }; - } - - const publishData = _.get(event, 'publishData'); - if(publishData) { + } + }; + const publishData = _.get(data, 'publishData'); + if(publishData) { requestBody.request[objType] = { ...requestBody.request[objType], ...publishData }; } const option = { @@ -258,9 +223,9 @@ export class EditorService { } }; const publishData = _.get(event, 'publishData'); - if(publishData) { + if(publishData) { requestBody.request[objType] = { ...requestBody.request[objType], ...publishData }; - } + } const option = { url: `${url.CONTENT_PUBLISH}${contentId}`, data: requestBody @@ -282,23 +247,6 @@ export class EditorService { return this.publicDataService.patch(req); } - addResourceToQuestionset(collection, unitIdentifier, contentId) { - const children: any[] = _.isArray(contentId) ? contentId : [contentId]; - const req = { - url: _.get(this.configService.urlConFig, 'URLS.QuestionSet.ADD'), - data: { - request: { - questionset: { - rootId: collection, - collectionId: unitIdentifier, - children - } - } - } - }; - return this.publicDataService.patch(req); - } - public getQuestionStream$() { return this.questionStream$; } @@ -336,73 +284,33 @@ export class EditorService { const data = this.treeService.getFirstChild(); return { nodesModified: this.treeService.treeCache.nodesModified, - hierarchy: instance.getHierarchyObj(data) + hierarchy: instance._toFlatObj(data) }; } - getHierarchyObj(data, questionId?, selectUnitId?, parentId?) { + _toFlatObj(data, questionId?, selectUnitId?) { const instance = this; if (data && data.data) { - const relationalMetadata = this.getRelationalMetadataObj(data.children); instance.data[data.data.id] = { name: data.title, - children: _.map(data.children, (child) => child.data.id), - ...(!_.isEmpty(relationalMetadata) && {relationalMetadata}), + children: _.map(data.children, (child) => { + return child.data.id; + }), root: data.data.root }; if (questionId && selectUnitId && selectUnitId === data.data.id) { - if (parentId) { - const children = instance.data[data.data.id].children; - const index = _.findIndex(children, (e) => { - return e === parentId; - }, 0); - const setIndex = index + 1; - children.splice(setIndex, 0, questionId); - } else { - instance.data[data.data.id].children.push(questionId); - } + instance.data[data.data.id].children.push(questionId); } if (questionId && selectUnitId && data.folder === false) { delete instance.data[data.data.id]; } _.forEach(data.children, (collection) => { - instance.getHierarchyObj(collection, questionId, selectUnitId, parentId); - }); - } - return instance.data; - } - - - _toFlatObjFromHierarchy(data) { - const instance = this; - if (data && data.children) { - instance.data[data.identifier] = { - name: data.name, - children: _.map(data.children, (child) => { - return child.identifier; - }), - branchingLogic: data.branchingLogic - }; - _.forEach(data.children, (collection) => { - instance._toFlatObjFromHierarchy(collection); + instance._toFlatObj(collection, questionId, selectUnitId); }); } return instance.data; } - getRelationalMetadataObj(data) { - let relationalMetadata = {}; - _.forEach(data, (child) => { - if (_.get(child, 'data.metadata.relationalMetadata')) { - relationalMetadata = { - ...relationalMetadata, - [child.data.id]: _.get(child, 'data.metadata.relationalMetadata') - }; - } - }); - return relationalMetadata; - } - getCategoryDefinition(categoryName, channel, objectType?: any) { const req = { url: _.get(this.configService.urlConFig, 'URLS.getCategoryDefinition'), @@ -480,28 +388,17 @@ export class EditorService { this.contentsCount = this.contentsCount + 1; } } - checkIfContentsCanbeAdded(buttonAction) { + checkIfContentsCanbeAdded() { const config = { errorMessage: '', maxLimit: 0 }; if (_.get(this.editorConfig, 'config.objectType') === 'QuestionSet') { + config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.031'); config.maxLimit = _.get(this.editorConfig, 'config.questionSet.maxQuestionsLimit'); - if (buttonAction === 'add') { - config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.041'); - } - if (buttonAction === 'create') { - config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.031'); - } - } else { + config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.032'); config.maxLimit = _.get(this.editorConfig, 'config.collection.maxContentsLimit'); - if (buttonAction === 'add') { - config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.032'); - } - if (buttonAction === 'create') { - config.errorMessage = _.get(this.configService, 'labelConfig.messages.error.042'); - } } const childrenCount = this.getContentChildrens().length + this.contentsCount; if (childrenCount >= config.maxLimit) { @@ -569,98 +466,4 @@ export class EditorService { console.error( _.replace(_.get(this.configService, 'labelConfig.messages.error.033'), '{FILE_TYPE}', config.fileType ) + error); } } - - generateCSV(config) { - const tableData = config.tableData; - delete config.tableData; - let options = { - fieldSeparator: ',', - quoteStrings: '"', - decimalSeparator: '.', - showLabels: true, - useTextFile: false, - useBom: true, - showTitle: true, - title: '', - filename: '', - headers: [] - }; - options = _.merge(options, config); - const csvExporter = new ExportToCsv(options); - csvExporter.generateCsv(tableData); - } - - getBranchingLogicByFolder(identifier) { - const nodeData = this.treeService.getNodeById(identifier); - const branchingLogic = _.get(nodeData, 'data.metadata.branchingLogic'); - return branchingLogic || {}; - } - -/** - * - * @public - * @param identifier identifier of the node - * @returns { source: [], target: [], sourceTarget?: [] } - * @memberof EditorService - */ -getDependentNodes(identifier) { - const sectionBranchingLogic = this.getBranchingLogicByNodeId(identifier); - - if (!_.isEmpty(sectionBranchingLogic)) { - const branchingEntry = this.getBranchingLogicEntry(sectionBranchingLogic, identifier); - const source = _.get(branchingEntry, 'source'); - if (!_.isEmpty(source)) { // if the node is a dependent node - - const sourceBranchingEntry = this.getBranchingLogicEntry(sectionBranchingLogic, _.first(branchingEntry.source)); - - return !_.isEmpty(sourceBranchingEntry) ? { source: branchingEntry.source, target: branchingEntry.target, - sourceTarget: sourceBranchingEntry.target } : {}; - - } else { // if the node is a parent node - return !_.isEmpty(branchingEntry) ? { source: branchingEntry.source, target: branchingEntry.target } : {}; - } - } - } - -/** - * - * @public - * @param identifier identifier of the node - * @returns {"do_id": { "target": [ "do_id123", "do_id456" ], "preCondition": {}, "source": [] }} - * @memberof EditorService - */ - getBranchingLogicByNodeId(identifier) { - const leafNode = this.treeService.getNodeById(identifier); - const parentIdentifier = _.get(leafNode, 'parent.data.id'); - return this.getBranchingLogicByFolder(parentIdentifier); - } - - getBranchingLogicEntry(parentBranchingLogic, identifier) { - return _.find(parentBranchingLogic, (logic, key) => { - return key === identifier; - }); - } - - getFlattenedBranchingLogic(data) { - const flatHierarchy = this._toFlatObjFromHierarchy(data); - const branchingLogics = _.compact(_.map(flatHierarchy, 'branchingLogic')); - return _.reduce(branchingLogics, (acc, val) => { - return _.assign(acc, val); - }, {}); - } - - getParentDependentMap(data) { - const branchingLogic = this.getFlattenedBranchingLogic(data); - const obj = {}; - _.forEach(_.keys(branchingLogic), item => { - obj[item] = !_.isEmpty(branchingLogic[item].source) ? 'dependent' : !_.isEmpty(branchingLogic[item].target) ? 'parent' : ''; - }); - return obj; - } - - getPrimaryCategoryName(sectionId) { - const nodeData = this.treeService.getNodeById(sectionId); - return _.get(nodeData, 'data.primaryCategory'); - } - } diff --git a/projects/collection-editor-library/src/lib/services/question/question.service.spec.ts b/projects/collection-editor-library/src/lib/services/question/question.service.spec.ts index e7dfbbeaf..531849552 100644 --- a/projects/collection-editor-library/src/lib/services/question/question.service.spec.ts +++ b/projects/collection-editor-library/src/lib/services/question/question.service.spec.ts @@ -121,15 +121,4 @@ describe('QuestionService', () => { expect(data.responseCode).toEqual('OK'); }) }) - - it('#upsertQuestion() it should update question on API success', () => { - const questionId = 'do_123'; - spyOn(publicDataService, 'patch').and.returnValue(of({ - responseCode: 'OK' - })); - questionService.upsertQuestion(questionId, {}).subscribe(data => { - expect(data.responseCode).toEqual('OK'); - }); - }) - }) diff --git a/projects/collection-editor-library/src/lib/services/question/question.service.ts b/projects/collection-editor-library/src/lib/services/question/question.service.ts index 4c8151c6c..777fb0db6 100644 --- a/projects/collection-editor-library/src/lib/services/question/question.service.ts +++ b/projects/collection-editor-library/src/lib/services/question/question.service.ts @@ -6,6 +6,7 @@ import { ServerResponse } from '../../interfaces/serverResponse'; import * as _ from 'lodash-es'; import { UUID } from 'angular2-uuid'; import { HttpClient } from '@angular/common/http'; +import { map } from 'rxjs/operators'; import { ConfigService } from '../config/config.service'; import { EditorService } from '../editor/editor.service'; @Injectable({ @@ -31,29 +32,6 @@ export class QuestionService { return this.publicDataService.get(option); } - upsertQuestion(questionId, questionBody) { - let mode = questionId ? 'UPDATE' : 'CREATE'; - const req = { - url: `${this.configService.urlConFig.URLS[this.editorService.editorConfig.config.objectType][mode]}${mode === 'UPDATE' ? questionId : ''}`, - data: { - request: questionBody - } - } - return mode === 'UPDATE' ? this.publicDataService.patch(req) - : this.publicDataService.post(req); - } - - updateQuestion(questionId, requestObj) { - const objectType = _.get(this.editorService.editorConfig, 'config.objectType'); - const req = { - url: `${this.configService.urlConFig.URLS[objectType].SYSYTEM_UPDATE}${questionId}`, - data: { - request: requestObj - } - }; - return this.publicDataService.patch(req); - } - updateHierarchyQuestionCreate(hierarchyBody): Observable { const requestObj = { data: hierarchyBody @@ -103,11 +81,11 @@ export class QuestionService { createMediaAsset(req?: object) { const reqParam = { - url: _.get(this.configService.urlConFig, 'URLS.ASSET.CREATE'), + url: _.get(this.configService.urlConFig, 'URLS.CONTENT.CREATE'), data: { request: { - asset: { - primaryCategory: 'asset', + content: { + contentType: 'Asset', language: ['English'], code: UUID.UUID(), } @@ -120,7 +98,7 @@ export class QuestionService { uploadMedia(req, assetId: any) { let reqParam = { - url: `${this.configService.urlConFig.URLS.ASSET.UPLOAD}${assetId}`, + url: `${this.configService.urlConFig.URLS.CONTENT.UPLOAD}${assetId}`, data: req.data }; reqParam = req ? _.merge({}, reqParam, req) : reqParam; @@ -139,7 +117,7 @@ export class QuestionService { getVideo(videoId) { const reqParam = { - url: `${this.configService.urlConFig.URLS.ASSET.READ}${videoId}` + url: `${this.configService.urlConFig.URLS.CONTENT.READ}${videoId}` }; return this.publicDataService.get(reqParam); } diff --git a/projects/collection-editor-library/src/lib/services/tree/tree.service.spec.ts b/projects/collection-editor-library/src/lib/services/tree/tree.service.spec.ts index b455e5665..edd4df2fc 100755 --- a/projects/collection-editor-library/src/lib/services/tree/tree.service.spec.ts +++ b/projects/collection-editor-library/src/lib/services/tree/tree.service.spec.ts @@ -32,8 +32,7 @@ describe('TreeService', () => { }; spyOn(treeService, 'setNodeTitle'); spyOn(treeService, 'updateTreeNodeMetadata'); - treeService.updateNode(metadata,'','Observation'); - treeService.updateTreeNodeMetadata(treeNode,undefined,'Observation'); + treeService.updateNode(metadata); expect(treeService.setNodeTitle).toHaveBeenCalled(); expect(treeService.updateTreeNodeMetadata).toHaveBeenCalled(); }) @@ -57,92 +56,14 @@ describe('TreeService', () => { it("#updateTreeNodeMetadata() should call #setTreeCache()", ()=> { spyOn(treeService, 'getActiveNode').and.callFake(()=> treeNode); - treeService.updateTreeNodeMetadata(treeNode,undefined,'Observation'); - }) - - it("#updateTreeNodeMetadata() should call #setTreeCache() with primaryCategory", ()=> { - spyOn(treeService, 'getActiveNode').and.callFake(()=> treeNode); - spyOn(treeService, 'getTreeObject').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }}); - spyOn(treeService, 'setTreeCache'); - treeService.updateTreeNodeMetadata(treeNode,undefined,'Observation'); + treeService.updateTreeNodeMetadata(treeNode); expect(treeService.setTreeCache).toHaveBeenCalled(); }) - it("#getNodeById() should call", ()=> { - spyOn(treeService, 'getNodeById'); - spyOn(treeService,'getTreeObject').and.callThrough(); - treeService.getNodeById('do_123'); - expect(treeService.getNodeById).toHaveBeenCalled(); - }); - - it("#getParent() should call", ()=> { - spyOn(treeService,'getParent'); - spyOn(treeService, 'getActiveNode').and.callFake(()=> {}); - spyOn(treeService, 'getNodeById'); - spyOn(treeService,'getFirstChild'); - treeService.getParent(); - expect(treeService.getParent).toHaveBeenCalled(); - }); - - it("#getNodeById() should call", ()=> { - spyOn(treeService, 'getTreeObject').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }; - }); - treeService.getNodeById('d0_123'); - }); - - it("#getLeafNodes() should call", ()=> { - spyOn(treeService, 'getActiveNode').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }; - }); - treeService.getLeafNodes(); - }); - - it("#getChildren() should call", ()=> { - spyOn(treeService, 'getActiveNode').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }; - }); - treeService.getChildren(); - }); - - it("#replaceNodeId() should call", ()=> { - spyOn(treeService, 'getTreeObject').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }; - }); - treeService.replaceNodeId('do_123'); - }); - - it("#clearTreeCache() should call to clear all the treecache no node", ()=> { - spyOn(treeService,'clearTreeCache').and.callThrough(); - treeService.clearTreeCache(); - expect(treeService.clearTreeCache).toHaveBeenCalled(); - expect(treeService.treeCache.nodesModified).toEqual({}) - }); - - it("#clearTreeCache() should call to clear all the treecache with node", ()=> { - let node={ - id:'do_123' - } - spyOn(treeService,'clearTreeCache').and.callThrough(); - treeService.clearTreeCache(node); - expect(treeService.clearTreeCache).toHaveBeenCalled(); - }); - it("#removeSpecialChars() should remove special characters from string", ()=> { let string = "test@ioo!$%#"; const result = treeService.removeSpecialChars(string); expect(result).toEqual('testioo'); }) - - it('#getChildren should call',()=>{ - spyOn(treeService,'getChildren').and.callThrough(); - spyOn(treeService, 'getActiveNode').and.callFake(() => { - return { visit(cb) { cb({ data: { metadata: {} } }); } }; - }); - treeService.getChildren(); - expect(treeService.getChildren).toHaveBeenCalled(); - }) - }); diff --git a/projects/collection-editor-library/src/lib/services/tree/tree.service.ts b/projects/collection-editor-library/src/lib/services/tree/tree.service.ts index 2c6ce60ea..e8814079e 100755 --- a/projects/collection-editor-library/src/lib/services/tree/tree.service.ts +++ b/projects/collection-editor-library/src/lib/services/tree/tree.service.ts @@ -24,7 +24,6 @@ export class TreeService { private _treeStatus$ = new BehaviorSubject(undefined); public readonly treeStatus$: Observable = this._treeStatus$ .asObservable().pipe(skipWhile(status => status === undefined || status === null)); - previousNode: any; constructor(private toasterService: ToasterService, private helperService: HelperService, public configService: ConfigService) { } @@ -41,9 +40,9 @@ export class TreeService { this.treeNativeElement = el; } - updateNode(metadata, nodeToBeUpdated?, primaryCategory?: any) { + updateNode(metadata) { this.setNodeTitle(metadata.name); - this.updateTreeNodeMetadata(metadata, nodeToBeUpdated, primaryCategory); + this.updateTreeNodeMetadata(metadata); } updateAppIcon(appIconUrl) { @@ -60,9 +59,9 @@ export class TreeService { this.setTreeCache(nodeId, _.merge({}, {[key] : value}, _.pick(node.data.metadata, ['objectType']))); } - updateTreeNodeMetadata(newData: any, nodeToBeUpdated?: any, primaryCategory?: any) { - const activeNode = !_.isUndefined(nodeToBeUpdated) ? this.getNodeById(nodeToBeUpdated) : this.getActiveNode(); - const nodeId = nodeToBeUpdated || activeNode.data.id; + updateTreeNodeMetadata(newData: any) { + const activeNode = this.getActiveNode(); + const nodeId = activeNode.data.id; if (newData.instructions) { newData.instructions = { default: newData.instructions }; } @@ -73,8 +72,6 @@ export class TreeService { const attributions = newData.attributions; if (attributions && _.isString(attributions)) { newData.attributions = attributions.split(','); - } else if (attributions && _.isArray(attributions)) { - newData.attributions = attributions; } else { newData.attributions = []; } @@ -95,9 +92,6 @@ export class TreeService { } delete newData.maxTime; delete newData.warningTime; - if (primaryCategory) { - newData.primaryCategory = primaryCategory; - } this.setTreeCache(nodeId, newData, activeNode.data); } @@ -165,11 +159,6 @@ export class TreeService { } } - getParent() { - const selectedNode = this.getActiveNode(); - return !_.isEmpty(selectedNode) ? selectedNode.getParent() : this.getNodeById(this.previousNode) || this.getFirstChild(); - } - getFirstChild() { return $(this.treeNativeElement).fancytree('getRootNode').getFirstChild(); } @@ -208,14 +197,6 @@ export class TreeService { return nodes; } - getLeafNodes() { - const nodes = []; - this.getActiveNode().visit((node) => { - if (!_.includes(node.icon, 'folder')) { nodes.push(node); } - }); - return nodes; - } - highlightNode(nodeId: string, action: string) { const nodeElem = this.getNodeById(nodeId); if (!nodeElem) { return; } diff --git a/proxy.conf.json b/proxy.conf.json index d385ac624..9a034c4cd 100644 --- a/proxy.conf.json +++ b/proxy.conf.json @@ -1,22 +1,4 @@ { - "/action/question/v1/bulkUpload": { - "target": "http://localhost:3000", - "secure": false, - "logLevel": "debug", - "changeOrigin": true - }, - "/action/question/v1/bulkUploadStatus": { - "target": "http://localhost:3000", - "secure": false, - "logLevel": "debug", - "changeOrigin": true - }, - "/action/program/v1": { - "target": "http://localhost:3000", - "secure": false, - "logLevel": "debug", - "changeOrigin": true - }, "/action/questionset/v1": { "target": "http://localhost:3000", "secure": false, diff --git a/server.js b/server.js index 387cac13f..5b4279544 100644 --- a/server.js +++ b/server.js @@ -4,130 +4,81 @@ var express = require('express'), proxy = require('express-http-proxy'), urlHelper = require('url'); const latexService = require('./latexService.js') - -// ENV Variables -const BASE_URL = 'dock.sunbirded.org'; -const API_AUTH_TOKEN = ""; -const PORTAL_COOKIES= "" -const USER_TOKEN = ""; - - +const host = ''; // dev.sunbirded.org var app = express(); app.set('port', 3000); -app.use(express.json()) +app.use(bodyParser.urlencoded({ extended: false })) +app.use(bodyParser.json({ limit: '50mb' })) app.get("/latex/convert", latexService.convert) app.post("/latex/convert", bodyParser.json({ limit: '1mb' }), latexService.convert); -app.all(['/api/framework/v1/read/*', +app.all([ + '/api/framework/v1/read/*', '/learner/framework/v1/read/*', - '/api/channel/v1/read/*'], proxy(BASE_URL, { + '/api/channel/v1/read/*'], proxy(host, { https: true, proxyReqPathResolver: function(req) { console.log('proxyReqPathResolver ', urlHelper.parse(req.url).path); return urlHelper.parse(req.url).path; }, proxyReqOptDecorator: function(proxyReqOpts, srcReq) { - console.log('proxyReqOptDecorator 2') + console.log('proxyReqOptDecorator') // 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['authorization'] = 'Bearer '; return proxyReqOpts; } })); -app.use(['/action/questionset/v1/*', + +app.use([ + '/action/questionset/v1/*', '/action/question/v1/*', - '/action/collection/v1/*', '/action/object/category/definition/v1/*', - '/action/collection/v1/*' - ], proxy(BASE_URL, { + '/action/data/v1/*' + ], proxy(host, { https: true, - limit: '30mb', proxyReqPathResolver: function (req) { let originalUrl = req.originalUrl.replace('/action/', '/api/') console.log('proxyReqPathResolver questionset', originalUrl, require('url').parse(originalUrl).path); return require('url').parse(originalUrl).path; }, proxyReqOptDecorator: function (proxyReqOpts, srcReq) { - console.log('proxyReqOptDecorator 3') + console.log('proxyReqOptDecorator questionset') // 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/program/v1/*', - '/action/question/v1/bulkUpload', - '/action/question/v1/bulkUploadStatus' - ], proxy(BASE_URL, { - https: true, - limit: '30mb', - proxyReqPathResolver: function (req) { - let originalUrl = req.originalUrl.replace('/action/', '/api/') - console.log('proxyReqPathResolver questionset', 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; + proxyReqOpts.headers['authorization'] = 'Bearer '; + return proxyReqOpts; } })); -app.use(['/api','/assets','/action'], proxy(BASE_URL, { +app.use(['/api','/assets','/action'], proxy(host, { https: true, - limit: '30mb', proxyReqPathResolver: function(req) { console.log('proxyReqPathResolver ', urlHelper.parse(req.url).path); return urlHelper.parse(req.url).path; }, proxyReqOptDecorator: function(proxyReqOpts, srcReq) { - console.log('proxyReqOptDecorator 4') - // you can update headers - proxyReqOpts.headers['Content-Type'] = 'application/json'; - proxyReqOpts.headers['user-id'] = 'content-editor'; - proxyReqOpts.headers['Cookie'] = PORTAL_COOKIES; - return proxyReqOpts; - } -})); - -app.use(['/action/content/*'], proxy(BASE_URL, { - https: true, - proxyReqPathResolver: function (req) { - let originalUrl = req.originalUrl.replace('/api/', '/api/') - console.log('proxyReqPathResolver questionset', originalUrl, require('url').parse(originalUrl).path); - return require('url').parse(originalUrl).path; - }, - proxyReqOptDecorator: function (proxyReqOpts, srcReq) { - console.log('proxyReqOptDecorator 1') + console.log('proxyReqOptDecorator') // 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 '; + proxyReqOpts.headers['x-authenticated-user-token'] = '' return proxyReqOpts; } })); -app.use(['/content/preview/*', '/content-plugins/*', '/assets/public/*'], proxy(BASE_URL, { +app.use(['/content/preview/*', '/content-plugins/*', '/assets/public/*'], proxy(host, { https: true, proxyReqPathResolver: function(req) { - return require('url').parse(`https://${BASE_URL}` + req.originalUrl).path + return require('url').parse(`https://${host}` + req.originalUrl).path }, proxyReqOptDecorator: function(proxyReqOpts, srcReq) { - console.log('proxyReqOptDecorator 5') + console.log('proxyReqOptDecorator') // 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['authorization'] = 'Bearer '; return proxyReqOpts; } })); diff --git a/src/app/app.component.html b/src/app/app.component.html index da015aaec..93396c011 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,10 +2,7 @@
- - + - - -
+
\ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d11dc73a0..4ae45c1cc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,15 +1,10 @@ import { Component } from '@angular/core'; -import { observationEditorConfig, observationRubricsEditorConfig, questionSetEditorConfig, - collectionEditorConfig, courseEditorConfig, questionEditorConfig,surveyEditorConfig } from './data'; +import { questionEditorConfig, collectionEditorConfig, courseEditorConfig } from './data'; const configMapper = { - questionSet: questionSetEditorConfig, question: questionEditorConfig, collection : collectionEditorConfig, - course: courseEditorConfig, - survey: surveyEditorConfig, - observation: observationEditorConfig, - rubrics: observationRubricsEditorConfig + course: courseEditorConfig }; @Component({ @@ -29,18 +24,12 @@ export class AppComponent { } setType(editorType) { - if (editorType === 'questionSet') { - localStorage.setItem('editorType', 'questionSet'); + if (editorType === 'question') { + localStorage.setItem('editorType', 'question'); } else if (editorType === 'course') { localStorage.setItem('editorType', 'course'); } else if (editorType === 'collection') { localStorage.setItem('editorType', 'collection'); - } else if (editorType === 'observation') { - localStorage.setItem('editorType', 'observation'); - } else if (editorType === 'survey') { - localStorage.setItem('editorType', 'survey'); - } else if (editorType === 'rubrics') { - localStorage.setItem('editorType', 'rubrics'); } window.location.reload(); } diff --git a/src/app/data.ts b/src/app/data.ts index 66971fbcb..0c60c09c8 100644 --- a/src/app/data.ts +++ b/src/app/data.ts @@ -72,7 +72,6 @@ export const courseEditorConfig = { dialcodeMaxLength: 250, iconClass: 'fa fa-book', showAddCollaborator: true, - enableBulkUpload: false, children: {}, hierarchy: { level1: { @@ -140,10 +139,8 @@ export const courseEditorConfig = { } }; -export const questionSetEditorConfig = { +export const questionEditorConfig = { context: { - programId: 'f72ad8b0-36df-11ec-a56f-4b503455085f', - contributionOrgId: '', user: { id: '5a587cc1-e018-4859-a0a8-e842650b9d64', fullName: 'Vaibahv Bhuva', @@ -151,7 +148,7 @@ export const questionSetEditorConfig = { lastName: 'Bhuva', orgIds: ['01309282781705830427'] }, - identifier: 'do_113476420248436736138', // do_11330102570702438417 , do_113449692707643392118, //do_113449692707643392118 , do_113460158539554816151 + identifier: 'do_1132393548335759361558', // do_11330102570702438417 authToken: ' ', sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', did: '7e85b4967aebd6704ba1f604f20056b6', @@ -253,215 +250,74 @@ export const questionSetEditorConfig = { ], labels: { save_collection_btn_label: 'Save as Draft', - }, - correctionComments: false, - sourcingResourceStatus: true, + } }, config: { mode: 'edit', // edit / review / read / sourcingReview // orgReview - enableQuestionCreation: true, - enableAddFromLibrary: true, editableFields: { - sourcingreview: ['instructions'], + //sourcingreview: ['instructions'], orgreview: ['name', 'instructions', 'learningOutcome'], review: ['name', 'description'], }, - maxDepth: 4, + maxDepth: 0, objectType: 'QuestionSet', primaryCategory: 'Practice Question Set', isRoot: true, iconClass: 'fa fa-book', showAddCollaborator: false, - enableBulkUpload: true, - publicStorageAccount: 'https://dockstorage.blob.core.windows.net/', - hideSubmitForReviewBtn: false, children: { Question: [ 'Multiple Choice Question', 'Subjective Question' ] }, - addFromLibrary: false, hierarchy: { - level1: { - name: 'Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Practice Question Set', - iconClass: 'fa fa-folder-o', - children: {}, - addFromLibrary: true - }, - level2: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Practice Question Set', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Subjective Question' - ] - }, - addFromLibrary: true - }, - level3: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Practice Question Set', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Subjective Question' - ] - } - } + // level1: { + // name: 'Section', + // type: 'Unit', + // mimeType: 'application/vnd.sunbird.questionset', + // primaryCategory: 'Practice Question Set', + // iconClass: 'fa fa-folder-o', + // children: { + // Question: [ + // 'Multiple Choice Question', + // 'Subjective Question' + // ] + // } + // }, + // level2: { + // name: 'Sub Section', + // type: 'Unit', + // mimeType: 'application/vnd.sunbird.questionset', + // primaryCategory: 'Practice Question Set', + // iconClass: 'fa fa-folder-o', + // children: { + // Question: [ + // 'Multiple Choice Question', + // 'Subjective Question' + // ] + // } + // }, + // level3: { + // name: 'Sub Section', + // type: 'Unit', + // mimeType: 'application/vnd.sunbird.questionset', + // primaryCategory: 'Practice Question Set', + // iconClass: 'fa fa-folder-o', + // children: { + // Question: [ + // 'Subjective Question' + // ] + // } + // } }, contentPolicyUrl: '/term-of-use.html' } }; -export const questionEditorConfig = { - context: { - user: { - id: '5a587cc1-e018-4859-a0a8-e842650b9d64', - fullName: 'Vaibahv Bhuva', - firstName: 'Vaibhav', - lastName: 'Bhuva', - orgIds: ['01309282781705830427'] - }, - identifier: 'do_113395509928394752193', // do_113388220110217216123 - collectionIdentifier: 'do_1133872840783626241899', - collectionPrimaryCategory: 'Exam Question Set', - collectionObjectType: 'QuestionSet', - sourcingResourceStatus: 'Review Pending', - sourcingResourceStatusClass: 'sb-color-warning', - authToken: ' ', - sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', - did: '7e85b4967aebd6704ba1f604f20056b6', - uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', - channel: '01309282781705830427', - pdata: { - id: 'dev.dock.portal', - ver: '2.8.0', - pid: 'creation-portal' - }, - contextRollup: { - l1: '01307938306521497658', - }, - tags: ['01307938306521497658'], - cdata: [ - { - id: '01307938306521497658', - type: 'sourcing_organization', - }, - { - type: 'project', - id: 'ec5cc850-3f71-11eb-aae1-fb99d9fb6737', - }, - { - type: 'linked_collection', - id: 'do_113140468925825024117' - } - ], - timeDiff: 5, - objectRollup: { - l1: 'do_113140468925825024117', - l2: 'do_113140468926914560125' - }, - host: 'https://dev.sunbirded.org', - defaultLicense: 'CC BY 4.0', - endpoint: '/data/v3/telemetry', - env: 'questionset_editor', - framework: 'ekstep_ncert_k-12', - cloudStorageUrls: ['https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/', 'https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/', - 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/'], - board: 'CBSE', - medium: ['English'], - gradeLevel: ['Class 1'], - subject: ['Environmental Studies'], - topic: ['Forest'], - additionalCategories: [ - { - value: 'Classroom Teaching Video', - label: 'Classroom Teaching Video' - }, - { - value: 'Concept Map', - label: 'Concept Map' - }, - { - value: 'Curiosity Question Set', - label: 'Curiosity Question Set' - }, - { - value: 'Textbook', - label: 'Textbook' - }, - { - value: 'Experiential Resource', - label: 'Experiential Resource' - }, - { - value: 'Explanation Video', - label: 'Explanation Video' - }, - { - value: 'Focus Spot', - label: 'Focus Spot' - }, - { - value: 'Learning Outcome Definition', - label: 'Learning Outcome Definition' - }, - { - value: 'Marking Scheme Rubric', - label: 'Marking Scheme Rubric' - }, - { - value: 'Pedagogy Flow', - label: 'Pedagogy Flow' - }, - { - value: 'Lesson Plan', - label: 'Lesson Plan' - }, - { - value: 'Previous Board Exam Papers', - label: 'Previous Board Exam Papers' - }, - { - value: 'TV Lesson', - label: 'TV Lesson' - } - ], - labels: { - save_collection_btn_label: 'Save as Draft', - reject_collection_btn_label: 'Request Changes', - } - }, - config: { - mode: 'sourcingReview', // edit / review / read / sourcingReview // orgReview - objectType: 'Question', - primaryCategory: 'Multiple Choice Question', - mimeType: 'application/vnd.sunbird.question', - interactionType: 'choice', - showSourcingStatus: true, - showCorrectionComments: false, - isReadOnlyMode: true, - editableFields: { - //sourcingreview: ['instructions'], - orgReview: ['name', 'learningOutcome'], - review: ['name', 'learningOutcome'], - } - } -}; - export const collectionEditorConfig = { context: { - identifier: 'do_113367576496021504151', + identifier: 'do_113345692849029120131', channel: '01309282781705830427', authToken: '', sid: 'vLpZ1rFl6-sxMVHi4RrmrlHw0HsX9ggC', @@ -505,7 +361,6 @@ export const collectionEditorConfig = { config: { mode: 'edit', showAddCollaborator: true, - enableBulkUpload: false, maxDepth: 4, objectType: 'Collection', primaryCategory: 'Digital Textbook', @@ -584,584 +439,3 @@ export const collectionEditorConfig = { } } }; - - -export const observationEditorConfig = { - context: { - programId: 'f72ad8b0-36df-11ec-a56f-4b503455085f', - contributionOrgId: '', - user: { - id: '5a587cc1-e018-4859-a0a8-e842650b9d64', - fullName: 'Vaibahv Bhuva', - firstName: 'Vaibhav', - lastName: 'Bhuva', - orgIds: ['01309282781705830427'] - }, - // identifier: 'do_113395089840529408131', // 'do_1132393548335759361558', // do_11330102570702438417 - identifier: 'do_113480838751551488129', // 'do_1133610108714352641210', // Observation - // identifier: 'do_113395099906416640139', // survey - // identifier: 'do_1134357224765685761203', // Observation With Rubrics - authToken: ' ', - sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', - did: '7e85b4967aebd6704ba1f604f20056b6', - uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', - channel: '01309282781705830427', - pdata: { - id: 'dev.dock.portal', - ver: '2.8.0', - pid: 'creation-portal' - }, - contextRollup: { - l1: '01307938306521497658', - }, - tags: ['01307938306521497658'], - cdata: [ - { - id: '01307938306521497658', - type: 'sourcing_organization', - }, - { - type: 'project', - id: 'ec5cc850-3f71-11eb-aae1-fb99d9fb6737', - }, - { - type: 'linked_collection', - id: 'do_113140468925825024117' - } - ], - timeDiff: 5, - objectRollup: { - l1: 'do_113140468925825024117', - l2: 'do_113140468926914560125' - }, - host: 'https://dock.sunbirded.org', - defaultLicense: 'CC BY 4.0', - endpoint: '/data/v3/telemetry', - env: 'questionset_editor', - framework: 'ekstep_ncert_k-12', - cloudStorageUrls: ['https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/', 'https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/', - 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/'], - board: 'CBSE', - medium: ['English'], - gradeLevel: ['Class 1'], - subject: ['Environmental Studies'], - topic: ['Forest'], - additionalCategories: [ - { - value: 'Classroom Teaching Video', - label: 'Classroom Teaching Video' - }, - { - value: 'Concept Map', - label: 'Concept Map' - }, - { - value: 'Curiosity Question Set', - label: 'Curiosity Question Set' - }, - { - value: 'Textbook', - label: 'Textbook' - }, - { - value: 'Experiential Resource', - label: 'Experiential Resource' - }, - { - value: 'Explanation Video', - label: 'Explanation Video' - }, - { - value: 'Focus Spot', - label: 'Focus Spot' - }, - { - value: 'Learning Outcome Definition', - label: 'Learning Outcome Definition' - }, - { - value: 'Marking Scheme Rubric', - label: 'Marking Scheme Rubric' - }, - { - value: 'Pedagogy Flow', - label: 'Pedagogy Flow' - }, - { - value: 'Lesson Plan', - label: 'Lesson Plan' - }, - { - value: 'Previous Board Exam Papers', - label: 'Previous Board Exam Papers' - }, - { - value: 'TV Lesson', - label: 'TV Lesson' - } - ], - labels: { - save_collection_btn_label: 'Save as Draft', - } - }, - config: { - mode: 'edit', // edit / review / read / sourcingReview // orgReview - editableFields: { - //sourcingreview: ['instructions'], - orgreview: ['name', 'instructions', 'learningOutcome'], - review: ['name', 'description'], - }, - maxDepth: 4, - objectType: 'QuestionSet', - // primaryCategory: 'Observation', - primaryCategory: 'Observation', - isRoot: true, - iconClass: 'fa fa-book', - showAddCollaborator: false, - enableBulkUpload: true, - publicStorageAccount: 'https://dockstorage.blob.core.windows.net/', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - }, - hierarchy: { - level1: { - name: 'Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level2: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level3: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - } - }, - contentPolicyUrl: '/term-of-use.html' - } -}; - -export const surveyEditorConfig = { - context: { - programId: 'f72ad8b0-36df-11ec-a56f-4b503455085f', - contributionOrgId: '', - user: { - id: '5a587cc1-e018-4859-a0a8-e842650b9d64', - fullName: 'Vaibahv Bhuva', - firstName: 'Vaibhav', - lastName: 'Bhuva', - orgIds: ['01309282781705830427'] - }, - // identifier: 'do_113395089840529408131', // 'do_1132393548335759361558', // do_11330102570702438417 - // identifier: 'do_11343286031200256013', // 'do_1133610108714352641210', // Observation - identifier: 'do_113395099906416640139', // survey - // identifier: 'do_1134357224765685761203', // Observation With Rubrics - authToken: ' ', - sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', - did: '7e85b4967aebd6704ba1f604f20056b6', - uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', - channel: '01309282781705830427', - pdata: { - id: 'dev.dock.portal', - ver: '2.8.0', - pid: 'creation-portal' - }, - contextRollup: { - l1: '01307938306521497658', - }, - tags: ['01307938306521497658'], - cdata: [ - { - id: '01307938306521497658', - type: 'sourcing_organization', - }, - { - type: 'project', - id: 'ec5cc850-3f71-11eb-aae1-fb99d9fb6737', - }, - { - type: 'linked_collection', - id: 'do_113140468925825024117' - } - ], - timeDiff: 5, - objectRollup: { - l1: 'do_113140468925825024117', - l2: 'do_113140468926914560125' - }, - host: 'https://dock.sunbirded.org', - defaultLicense: 'CC BY 4.0', - endpoint: '/data/v3/telemetry', - env: 'questionset_editor', - framework: 'ekstep_ncert_k-12', - cloudStorageUrls: ['https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/', 'https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/', - 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/'], - board: 'CBSE', - medium: ['English'], - gradeLevel: ['Class 1'], - subject: ['Environmental Studies'], - topic: ['Forest'], - additionalCategories: [ - { - value: 'Classroom Teaching Video', - label: 'Classroom Teaching Video' - }, - { - value: 'Concept Map', - label: 'Concept Map' - }, - { - value: 'Curiosity Question Set', - label: 'Curiosity Question Set' - }, - { - value: 'Textbook', - label: 'Textbook' - }, - { - value: 'Experiential Resource', - label: 'Experiential Resource' - }, - { - value: 'Explanation Video', - label: 'Explanation Video' - }, - { - value: 'Focus Spot', - label: 'Focus Spot' - }, - { - value: 'Learning Outcome Definition', - label: 'Learning Outcome Definition' - }, - { - value: 'Marking Scheme Rubric', - label: 'Marking Scheme Rubric' - }, - { - value: 'Pedagogy Flow', - label: 'Pedagogy Flow' - }, - { - value: 'Lesson Plan', - label: 'Lesson Plan' - }, - { - value: 'Previous Board Exam Papers', - label: 'Previous Board Exam Papers' - }, - { - value: 'TV Lesson', - label: 'TV Lesson' - } - ], - labels: { - save_collection_btn_label: 'Save as Draft', - } - }, - config: { - mode: 'edit', // edit / review / read / sourcingReview // orgReview - editableFields: { - //sourcingreview: ['instructions'], - orgreview: ['name', 'instructions', 'learningOutcome'], - review: ['name', 'description'], - }, - maxDepth: 4, - objectType: 'QuestionSet', - // primaryCategory: 'Observation', - primaryCategory: 'Survey', - isRoot: true, - iconClass: 'fa fa-book', - showAddCollaborator: false, - enableBulkUpload: true, - publicStorageAccount: 'https://dockstorage.blob.core.windows.net/', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - }, - hierarchy: { - level1: { - name: 'Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level2: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level3: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - } - }, - contentPolicyUrl: '/term-of-use.html' - } -}; - -export const observationRubricsEditorConfig = { - context: { - programId: 'f72ad8b0-36df-11ec-a56f-4b503455085f', - contributionOrgId: '', - user: { - id: '5a587cc1-e018-4859-a0a8-e842650b9d64', - fullName: 'Vaibahv Bhuva', - firstName: 'Vaibhav', - lastName: 'Bhuva', - orgIds: ['01309282781705830427'] - }, - // identifier: 'do_113395089840529408131', // 'do_1132393548335759361558', // do_11330102570702438417 - // identifier: 'do_11343286031200256013', // 'do_1133610108714352641210', // Observation - // identifier: 'do_113395099906416640139', // survey - identifier: 'do_1134357224765685761203', // Observation With Rubrics Framework - tpd - // identifier: 'do_113437470826086400127', // Observation With Rubrics Framework - nit_tpd - authToken: ' ', - sid: 'iYO2K6dOSdA0rwq7NeT1TDzS-dbqduvV', - did: '7e85b4967aebd6704ba1f604f20056b6', - uid: 'bf020396-0d7b-436f-ae9f-869c6780fc45', - channel: '01309282781705830427', - pdata: { - id: 'dev.dock.portal', - ver: '2.8.0', - pid: 'creation-portal' - }, - contextRollup: { - l1: '01307938306521497658', - }, - tags: ['01307938306521497658'], - cdata: [ - { - id: '01307938306521497658', - type: 'sourcing_organization', - }, - { - type: 'project', - id: 'ec5cc850-3f71-11eb-aae1-fb99d9fb6737', - }, - { - type: 'linked_collection', - id: 'do_113140468925825024117' - } - ], - timeDiff: 5, - objectRollup: { - l1: 'do_113140468925825024117', - l2: 'do_113140468926914560125' - }, - host: 'https://dock.sunbirded.org', - defaultLicense: 'CC BY 4.0', - endpoint: '/data/v3/telemetry', - env: 'questionset_editor', - framework: 'tpd', - cloudStorageUrls: ['https://s3.ap-south-1.amazonaws.com/ekstep-public-qa/', 'https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/', - 'https://sunbirddev.blob.core.windows.net/sunbird-content-dev/'], - board: 'CBSE', - medium: ['English'], - gradeLevel: ['Class 1'], - subject: ['Environmental Studies'], - topic: ['Forest'], - additionalCategories: [ - { - value: 'Classroom Teaching Video', - label: 'Classroom Teaching Video' - }, - { - value: 'Concept Map', - label: 'Concept Map' - }, - { - value: 'Curiosity Question Set', - label: 'Curiosity Question Set' - }, - { - value: 'Textbook', - label: 'Textbook' - }, - { - value: 'Experiential Resource', - label: 'Experiential Resource' - }, - { - value: 'Explanation Video', - label: 'Explanation Video' - }, - { - value: 'Focus Spot', - label: 'Focus Spot' - }, - { - value: 'Learning Outcome Definition', - label: 'Learning Outcome Definition' - }, - { - value: 'Marking Scheme Rubric', - label: 'Marking Scheme Rubric' - }, - { - value: 'Pedagogy Flow', - label: 'Pedagogy Flow' - }, - { - value: 'Lesson Plan', - label: 'Lesson Plan' - }, - { - value: 'Previous Board Exam Papers', - label: 'Previous Board Exam Papers' - }, - { - value: 'TV Lesson', - label: 'TV Lesson' - } - ], - labels: { - save_collection_btn_label: 'Save as Draft', - } - }, - config: { - mode: 'edit', // edit / review / read / sourcingReview // orgReview - editableFields: { - //sourcingreview: ['instructions'], - orgreview: ['name', 'instructions', 'learningOutcome'], - review: ['name', 'description'], - }, - maxDepth: 4, - objectType: 'QuestionSet', - // primaryCategory: 'Observation', - primaryCategory: 'Observation With rubrics', - isRoot: true, - iconClass: 'fa fa-book', - showAddCollaborator: false, - enableBulkUpload: true, - publicStorageAccount: 'https://dockstorage.blob.core.windows.net/', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - }, - hierarchy: { - level1: { - name: 'Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level2: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - }, - level3: { - name: 'Sub Section', - type: 'Unit', - mimeType: 'application/vnd.sunbird.questionset', - primaryCategory: 'Observation', - iconClass: 'fa fa-folder-o', - children: { - Question: [ - 'Multiple Choice Question', - 'Slider', - 'Text', - 'Date' - ] - } - } - }, - contentPolicyUrl: '/term-of-use.html' - } -}; \ No newline at end of file diff --git a/src/assets/styles/legacy.scss b/src/assets/styles/legacy.scss index 0912c6763..42dce8eb4 100644 --- a/src/assets/styles/legacy.scss +++ b/src/assets/styles/legacy.scss @@ -2508,11 +2508,6 @@ i.blue.icon { left: auto; } } -.sb-btn-hover-none{ - &:hover{ - background: none !important; - } -} // To clean /* Margin in all direction */ diff --git a/src/assets/styles/vendors/_fine-uploader-new.scss b/src/assets/styles/vendors/_fine-uploader-new.scss index f55056612..67a2c491c 100644 --- a/src/assets/styles/vendors/_fine-uploader-new.scss +++ b/src/assets/styles/vendors/_fine-uploader-new.scss @@ -65,10 +65,9 @@ /* Upload Button ------------------------------------------ */ - -.qq-upload-button{ +.qq-upload-button { display: inline; - min-width: 105px; + width: 105px; margin-bottom: 10px; padding: 7px 10px; text-align: center; @@ -81,7 +80,6 @@ 1px 0 1px rgba(255, 255, 255, 0.07) inset, 0 1px 0 rgba(0, 0, 0, 0.36), 0 -2px 12px rgba(0, 0, 0, 0.08) inset; - } .qq-upload-button-hover { background: #33B6CC; diff --git a/utils/hierarchy/bulk-question-upload-sample-format.csv b/utils/hierarchy/bulk-question-upload-sample-format.csv deleted file mode 100644 index 5184229e7..000000000 --- a/utils/hierarchy/bulk-question-upload-sample-format.csv +++ /dev/null @@ -1,62 +0,0 @@ -Name of the Question,QuestionText,QuestionImage,Option Layout,Option1,Option1Image,Option2,Option2Image,Option3,Option3Image,Option4,Option4Image,AnswerNo,Level 1 Question Set Section,Keywords,Author,Copyright,Attributions -"Mandatory: No -Default: Multiple Choice Question -Validations: -- Upto 120 characters -- No special characters -Tip: Please provide name for the question","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Length not more than 1000 characters. -Tip: Provide text in Unicode.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Only JPG format. Google Drive Link - Publicly accessible. -Tip: Only JPG format. Google Drive Link - Publicly accessible.","Mandatory: Yes -Default: None -Validation: Only 1, 2, or 3 -Tip: Layout number = Needs involved decision making, depending on question length and answer/option length. -1 = vertical (most flexible) -2 = horizontal (suitable for one-two words or images) -3 = grid (suitable for a few words or images)","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Length not more than 1000 characters. -Tip: Provide text in Unicode.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Only JPG format. Google Drive Link - Publicly accessible. -Tip: Only JPG format. Google Drive Link - Publicly accessible.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Length not more than 1000 characters. -Tip: Provide text in Unicode.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Only JPG format. Google Drive Link - Publicly accessible. -Tip: Only JPG format. Google Drive Link - Publicly accessible.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Length not more than 1000 characters. -Tip: Provide text in Unicode.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Only JPG format. Google Drive Link - Publicly accessible. -Tip: Only JPG format. Google Drive Link - Publicly accessible.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Length not more than 1000 characters. -Tip: Provide text in Unicode.","Mandatory: Conditional - any one of text or image should be provided. -Default: None -Validation: Only JPG format. Google Drive Link - Publicly accessible. -Tip: Only JPG format. Google Drive Link - Publicly accessible.","Mandatory: Yes -Default: None -Validation: Only 1, 2, 3, or 4 -Tip: Enter Correct answer option value between 1 to 4","Mandatory: No -Default: None -Validation: Should match with the names provided in the question set hierarchy. Not case-sensitive / Case insensitive. -Tip: Provide name of the folder where you want to upload a question","Mandatory: No -Default: None -Validation: Comma separated values. No special characters. -Tip: Keywords"," -Mandatory: No -Default: None -Validation: No special characters. Max 300 characters. -Tip: The person or organization who has authored the content","Mandatory: No -Default: Name of the tenant. -Validation: No special characters. Max 300 characters. -Tip: Person or Organization who owns the copyright. Default name is DIKSHA tenant.","Mandatory: No -Default: None -Validation: No special characters. Max 300 characters. -Tip: List of persons or organizations who have contributed to this content."