diff --git a/.circleci/config.yml b/.circleci/config.yml index 0aada78dd74..681cfa58b5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,3 +54,4 @@ workflows: build_and_test: jobs: - test-cases + \ No newline at end of file diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 00000000000..9f46399d100 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,106 @@ +name: CI/CD + +on: + push: + branches: + - "*" # Trigger on push to any branch + pull_request: + branches: + - "*" # Trigger on pull request to any branch + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + # Checkout the repository to the runner + - name: Checkout repository + uses: actions/checkout@v3 + + # Set up Node.js environment + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 18 + + # Install client dependencies + - name: Install client dependencies + working-directory: src/app/client + run: yarn install --no-progress --production=true + + # Build the client + - name: Build client + working-directory: src/app/client + run: npm run build + + # List all files after the build + - name: List all files after build + working-directory: src/app/client + run: find . -type f + + # Check if the dist directory exists and list its contents + - name: Check if dist directory exists and list contents + working-directory: src/app/client + run: | + if [ -d dist ]; then + echo "dist directory exists. Listing contents:" + ls -l dist + else + echo "dist directory does not exist" + fi + + # Move index.html to index.ejs if it exists + - name: Move index.html to index.ejs if it exists + working-directory: src/app/client + run: | + if [ -f dist/index.html ]; then + mv dist/index.html dist/index.ejs + else + echo "File dist/index.html does not exist" + fi + + # Set up server directories + - name: Set up server directories + run: mkdir -p $GITHUB_WORKSPACE/app_dist + + # Copy server files to the destination directory + - name: Copy server files + run: | + cp -r src/app/libs src/app/helpers src/app/proxy src/app/resourcebundles src/app/package.json src/app/framework.config.js src/app/sunbird-plugins src/app/routes src/app/constants src/app/controllers src/app/server.js $GITHUB_WORKSPACE/app_dist/ + shell: /usr/bin/bash -e {0} + + # Install server dependencies + - name: Install server dependencies + working-directory: ${{ github.workspace }}/app_dist + run: yarn install --ignore-engines --no-progress --production=true + + # Run server build script + - name: Run server build script + working-directory: ${{ github.workspace }}/app_dist + run: node helpers/resourceBundles/build.js -task="phraseAppPull" + # Execute test cases using JEST + - name: Execute test cases using JEST + working-directory: src/app/client + run: | + yarn config set ignore-engines true + yarn install + npm run test:ci + + # Install Sonar Scanner + - name: Install Sonar Scanner + run: | + cd /tmp + wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip + sudo apt-get install -y unzip + unzip sonar-scanner-cli-5.0.1.3006-linux.zip + cd - + + - name: Run Sonar Scanner + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + /tmp/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner \ + -Dsonar.projectKey=Sunbird-Ed_SunbirdEd-portal \ + -Dsonar.organization=sunbird-ed \ + -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.login=$SONAR_TOKEN diff --git a/README.md b/README.md index deb9ce71d6d..e172d5c4d21 100644 --- a/README.md +++ b/README.md @@ -223,10 +223,10 @@ Installing Sunbird requires two primary software components: | Plugin Name | Plugin Repository | npm version | NG Version | |-------------------------------------------------------------------------------------------------------------- |------------------------------------------------------------------ |------------- |------------ | -| [@project-sunbird/chatbot-client](https://www.npmjs.com/package/@project-sunbird/chatbot-client) | https://github.com/project-sunbird/sunbird-bot-client | 4.0.0 | NG 13 | -| [@project-sunbird/common-consumption](https://www.npmjs.com/package/@project-sunbird/common-consumption) | https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents | 6.0.0 | NG 13 | -| [@project-sunbird/common-form-elements-full](https://www.npmjs.com/package/@project-sunbird/common-form-elements-full) | https://github.com/Sunbird-Ed/SunbirdEd-forms | 6.0.0 | NG 14 | -| [@project-sunbird/sb-content-section](https://www.npmjs.com/package/@project-sunbird/sb-content-section) | https://github.com/Sunbird-Ed/sb-content-module | 6.0.0 | NG 13 | -| [@project-sunbird/sb-notification](https://www.npmjs.com/package/@project-sunbird/sb-notification) | https://github.com/Sunbird-Ed/sb-notification | 6.0.0 | NG 14 | -| [@shikshalokam/sl-questionnaire](https://www.npmjs.com/package/@shikshalokam/sl-questionnaire) | https://github.com/shikshalokam/sl-questionnaire-components | 2.3.0 | NG 12 | -| [@shikshalokam/sl-reports-library](https://www.npmjs.com/package/@shikshalokam/sl-reports-library) | https://github.com/shikshalokam/sl-reports-library | 3.0.1 | NG 14 | \ No newline at end of file +| [@project-sunbird/chatbot-client](https://www.npmjs.com/package/@project-sunbird/chatbot-client) | https://github.com/project-sunbird/sunbird-bot-client | 8.0.1 | NG 16 | +| [@project-sunbird/common-consumption](https://www.npmjs.com/package/@project-sunbird/common-consumption) | https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents | 8.0.2 | NG 16 | +| [@project-sunbird/common-form-elements-full](https://www.npmjs.com/package/@project-sunbird/common-form-elements-full) | https://github.com/Sunbird-Ed/SunbirdEd-forms | 8.0.1 | NG 16 | +| [@project-sunbird/sb-content-section](https://www.npmjs.com/package/@project-sunbird/sb-content-section) | https://github.com/Sunbird-Ed/sb-content-module | 8.0.1 | NG 16 | +| [@project-sunbird/sb-notification](https://www.npmjs.com/package/@project-sunbird/sb-notification) | https://github.com/Sunbird-Ed/sb-notification | 8.0.1 | NG 16 | +| [@shikshalokam/sl-questionnaire](https://www.npmjs.com/package/@shikshalokam/sl-questionnaire) | https://github.com/shikshalokam/sl-questionnaire-components | 7.0.0 | NG 16 | +| [@shikshalokam/sl-reports-library](https://www.npmjs.com/package/@shikshalokam/sl-reports-library) | https://github.com/shikshalokam/sl-reports-library | 6.0.0 | NG 16 | \ No newline at end of file diff --git a/src/app/client/package.json b/src/app/client/package.json index 73aa746c577..e80dcfe5616 100644 --- a/src/app/client/package.json +++ b/src/app/client/package.json @@ -27,7 +27,8 @@ "inject-cdn-fallback": "gulp inject:cdnFallBack:script", "with-stats": "node --max_old_space_size=8096 node_modules/.bin/ng build --configuration production --stats-json", "build:stats": "ng build --stats-json", - "analyze": "webpack-bundle-analyzer dist/stats.json" + "analyze": "webpack-bundle-analyzer dist/stats.json", + "test-for-file": "./node_modules/jest/bin/jest.js --clearCache && node --max_old_space_size=2048 ./node_modules/jest/bin/jest.js telemetry-interact.directive.spec --ci --collectCoverage=true --coverageReporters=lcov" }, "nodemonConfig": { "ext": "png,jpeg,js,ts,html,json,css,scss" @@ -63,31 +64,31 @@ "@project-sunbird/common-consumption": "8.0.2", "@project-sunbird/common-form-elements-full": "8.0.1", "@project-sunbird/discussions-ui": "8.0.1", - "@project-sunbird/ng2-semantic-ui": "8.0.2", + "@project-sunbird/ng2-semantic-ui": "^8.0.3", "@project-sunbird/sb-content-section": "8.0.1", "@project-sunbird/sb-dashlet": "8.0.2", "@project-sunbird/sb-notification": "8.0.1", - "@project-sunbird/sb-styles": "0.0.16", + "@project-sunbird/sb-styles": "0.0.17", "@project-sunbird/sb-svg2pdf": "8.0.1", - "@project-sunbird/sb-themes": "8.0.5", - "@project-sunbird/sunbird-collection-editor": "5.4.10", + "@project-sunbird/sb-themes": "8.0.8", + "@project-sunbird/sunbird-collection-editor": "6.1.0", "@project-sunbird/sunbird-epub-player-v9": "5.6.0", "@project-sunbird/sunbird-epub-player-web-component": "1.2.0", "@project-sunbird/sunbird-file-upload-library": "1.0.2", "@project-sunbird/sunbird-pdf-player-v9": "5.5.0", "@project-sunbird/sunbird-pdf-player-web-component": "1.4.0", - "@project-sunbird/sunbird-questionset-editor": "8.0.1", + "@project-sunbird/sunbird-questionset-editor": "8.0.3", "@project-sunbird/sunbird-quml-player": "7.0.3", "@project-sunbird/sunbird-quml-player-v9": "5.1.5", - "@project-sunbird/sunbird-quml-player-web-component": "4.0.0", - "@project-sunbird/sunbird-resource-library": "8.0.0", + "@project-sunbird/sunbird-quml-player-web-component": "4.0.2", + "@project-sunbird/sunbird-resource-library": "8.0.2", "@project-sunbird/sunbird-video-player-v9": "5.5.1", "@project-sunbird/sunbird-video-player-web-component": "1.1.1", "@project-sunbird/telemetry-sdk": "1.3.0", "@project-sunbird/web-extensions": "8.0.1", - "@samagra-x/uci-console": "6.0.3", + "uci-console-v16": "8.0.0", "@shikshalokam/sl-questionnaire": "7.0.0", - "@shikshalokam/sl-reports-library": "3.0.1", + "@shikshalokam/sl-reports-library": "6.0.0", "@swimlane/ngx-datatable": "20.1.0", "@types/jquery": "3.3.31", "@types/jquery.fancytree": "2.7.34", @@ -244,4 +245,4 @@ "jest-preset-angular/build/serializers/html-comment" ] } -} +} \ No newline at end of file diff --git a/src/app/client/src/app/modules/core/components/content-type/content-type.component.scss b/src/app/client/src/app/modules/core/components/content-type/content-type.component.scss index 7bb4244bf4d..dcbf4a60667 100644 --- a/src/app/client/src/app/modules/core/components/content-type/content-type.component.scss +++ b/src/app/client/src/app/modules/core/components/content-type/content-type.component.scss @@ -29,7 +29,7 @@ border-radius: calculateRem(6px); box-shadow: var(--sbt-box-shadow-6px); font-size: calculateRem(12px); - font-weight: bold; + font-weight: 500; margin-right: calculateRem(12px); height: calculateRem(48px); transition: all ease .3s; diff --git a/src/app/client/src/app/modules/core/services/data/data.service.spec.ts b/src/app/client/src/app/modules/core/services/data/data.service.spec.ts index d6b92fe6f97..05976376f37 100644 --- a/src/app/client/src/app/modules/core/services/data/data.service.spec.ts +++ b/src/app/client/src/app/modules/core/services/data/data.service.spec.ts @@ -86,7 +86,7 @@ describe('DataService', () => { it('should return observableThrowError for failed POST request', (done) => { const mockErrorResponse = { responseCode: 'ERROR', data: 'Error data' }; - jest.spyOn(mockHttpClient, 'post').mockReturnValue(throwError(mockErrorResponse)); + jest.spyOn(mockHttpClient, 'post').mockReturnValue(of(mockErrorResponse)); (dayjs as any).mockReturnValue({ format: jest.fn(() => 'formatDate') }); dataService.post({ url: '/mock-url', @@ -114,7 +114,7 @@ describe('DataService', () => { it('should handle error for failed PATCH request', (done) => { const mockErrorResponse = { responseCode: 'ERROR', data: 'Error data' }; - jest.spyOn(mockHttpClient, 'patch').mockReturnValue(throwError(mockErrorResponse)); + jest.spyOn(mockHttpClient, 'patch').mockReturnValue(of(mockErrorResponse)); (dayjs as any).mockReturnValue({ format: jest.fn(() => 'formatDate') }); dataService.patch({ url: '/mock-url', @@ -142,7 +142,7 @@ describe('DataService', () => { it('should handle error for failed DELETE request', (done) => { const mockErrorResponse = { responseCode: 'ERROR', data: 'Error data' }; - jest.spyOn(mockHttpClient, 'delete').mockReturnValue(throwError(mockErrorResponse)); + jest.spyOn(mockHttpClient, 'delete').mockReturnValue(of(mockErrorResponse)); (dayjs as any).mockReturnValue({ format: jest.fn(() => 'formatDate') }); dataService.delete({ url: '/mock-url', @@ -170,7 +170,7 @@ describe('DataService', () => { it('should handle error for failed PUT request', (done) => { const mockErrorResponse = { responseCode: 'ERROR', data: 'Error data' }; - jest.spyOn(mockHttpClient, 'put').mockReturnValue(throwError(mockErrorResponse)); + jest.spyOn(mockHttpClient, 'put').mockReturnValue(of(mockErrorResponse)); (dayjs as any).mockReturnValue({ format: jest.fn(() => 'formatDate') }); dataService.put({ url: '/mock-url', @@ -286,5 +286,25 @@ describe('DataService', () => { }); }); }); + it('should handle successful POST request with headers', async () => { + jest.spyOn(document, 'getElementById').mockImplementation((data) => { + return { value: '32cef05697d1ab3a8049c0e8981bcc79' } as any; + }); + dataService.rootOrgId = '1234567890'; + dataService.channelId = '1234567890'; + DataService.userId = 'user_123'; + const mockResponse = { responseCode: 'OK', data: 'Mock data' }; + const mockHeaders = { get: jest.fn(() => '2023-01-01T12:00:00Z') }; + + jest.spyOn(mockHttpClient, 'post').mockReturnValue(of({ body: mockResponse, headers: mockHeaders })); + (dayjs as any).mockReturnValue({ format: jest.fn(() => 'formatDate') }); + jest.spyOn(dataService, 'getDateDiff' as any).mockReturnValue(0); + + await dataService.postWithHeaders({ url: '/mock-url', data: { key: 'value' }, header: { 'Custom-Header': 'custom-value' } }).subscribe((response) => { + expect(response).toEqual(mockResponse); + expect(mockHttpClient.post).toHaveBeenCalledWith(expect.stringContaining('/mock-url'), { key: 'value' }, expect.any(Object)); + expect(dataService['getDateDiff']).toHaveBeenCalledWith('2023-01-01T12:00:00Z'); + }); + }); }); \ No newline at end of file diff --git a/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.data.ts b/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.data.ts index 2a5161f4916..fa7b1ad9049 100644 --- a/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.data.ts +++ b/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.data.ts @@ -32,9 +32,104 @@ export const MockResponse = { courseHierarchy: { contentType: 'Course', primaryCategory: 'Course', - trackable: {enabled: 'Yes'} + trackable: { enabled: 'Yes' } + }, + courseHierarchyNew: { + contentType: 'Course', + primaryCategory: 'Course', + trackable: 'true' + }, + courseHierarchyone:{ + contentType: 'course', + primaryCategory: 'course', + }, + courseHierarchytwo:{ + contentType: 'book', + primaryCategory: 'book', }, generaliseLblResponse: { - 'result': '{"dflt":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":" Tasks","chapter":" Learning module"}},"messages":{"stmsg":{"m0125":" Start creating or uploading content. You currently do not have any content saved as a draft "}}},"trk":{"frmelmnts":{"btn":{"create":" Create ","enroll":" Join"},"tab":{"courses":" Tasks"}},"messages":{"dashboard":{"emsg":{"m002":" User has not joined any batch for this learning task"}}}}},"crs":{"nontrk":{"frmelmnts":{"lbl":{"ActivityTextbooks":" Courses","ACTIVITY_TEXTBOOK_TITLE":" Courses","desktop":{"downloadBook":" Download course","find_more":" Find more courses and related content on {instance}","updateTextbook":" Update course"},"downloadBooks":" Download courses to access while offline","fromTheTextBook":" from the course","noBookfoundTitle":" Board is adding courses","textbooks":" Courses","chapter":" Course module"}}},"trk":{"completedCourse":" Course completed","frmelmnts":{"btn":{"createCourse":" Create course"},"lbl":{"accessCourse":" Access course","accessToLogin":" To access the course you have to log in and join the course"}},"messages":{"dashboard":{"emsg":{"m002":" The user is not enrolled in any batch of this course"}}}}}}' + result: + { + 'default': { + 'nontrackable': { + 'en': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Tasks', + 'chapter': ' Learning module' + } + }, + 'messages': { + 'stmsg': { + 'm0125': ' Start creating or uploading content. You currently do not have any content saved as a draft' + } + } + } + }, + 'trackable': { + 'en': { + 'frmelmnts': { + 'btn': { + 'create': ' Create ', + 'enroll': ' Join' + }, + 'tab': { + 'courses': ' Tasks' + } + }, + 'messages': { + 'dashboard': { + 'emsg': { + 'm002': ' User has not joined any batch for this learning task' + } + } + } + } + } + }, + 'course': { + 'nontrackable': { + 'en': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Courses', + 'ACTIVITY_TEXTBOOK_TITLE': ' Courses', + 'desktop': { + 'downloadBook': ' Download course', + 'find_more': ' Find more courses and related content on {instance}', + 'updateTextbook': ' Update course' + }, + 'downloadBooks': ' Download courses to access while offline', + 'fromTheTextBook': ' from the course', + 'noBookfoundTitle': ' Board is adding courses', + 'textbooks': ' Courses', + 'chapter': ' Course module' + } + } + } + }, + 'trackable': { + 'en': { + 'completedCourse': ' Course completed', + 'frmelmnts': { + 'btn': { + 'createCourse': ' Create course' + }, + 'lbl': { + 'accessCourse': ' Access course', + 'accessToLogin': ' To access the course you have to log in and join the course' + } + }, + 'messages': { + 'dashboard': { + 'emsg': { + 'm002': ' The user is not enrolled in any batch of this course' + } + } + } + } + } + } + } } }; diff --git a/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.ts b/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.ts index a29e014ea2b..0e9509e6753 100644 --- a/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.ts +++ b/src/app/client/src/app/modules/core/services/generalisedLable/generaliseLable.service.spec.ts @@ -21,14 +21,18 @@ describe('GeneraliseLabelService', () => { }, COURSE_FRAMEWORK: { COURSE_FRAMEWORKID: 'data/v1/system/settings/get/courseFrameworkId' - } + }, + GET_GENERALISED_RESOURCE: 'getGeneralisedResourcesBundles' } } }; const mockUsageService: Partial = { getData: jest.fn() }; - const mockResourceService: Partial = {}; + const mockResourceService: Partial = { + messages:'this is the default message', + frmelmnts:'this is the default frmelmnts' + }; const mockFormService: Partial = { getFormConfig: jest.fn().mockReturnValue(of(MockResponse.resourceBundleConfig)) as any }; @@ -77,15 +81,144 @@ describe('GeneraliseLabelService', () => { generaliseLabelService.getGeneraliseResourceBundle() expect(generaliseLabelService.formService.getFormConfig).toHaveBeenCalled(); }); - }); + }); - it('should initialize with the provided content data and language', () => { + it('should initialize with the provided content data and language', () => { const contentData = {}; const lang = 'en'; const mockGetLabels = jest.spyOn(generaliseLabelService, 'getLabels' as any); - mockGetLabels.mockImplementation(() => {}); + mockGetLabels.mockImplementation(() => { }); generaliseLabelService.initialize(contentData, lang); expect(mockGetLabels).toHaveBeenCalledWith(contentData, lang); }); + it('should initialize with the component and call the fetchGeneraliseLables method', () => { + jest.spyOn(generaliseLabelService.usageService, 'getData').mockReturnValue(of(MockResponse.resourceBundleConfig as any) as any) as any; + generaliseLabelService['fetchGeneraliseLables']('en', 'all_labels_en.json').subscribe(data => { + expect(data).toEqual(MockResponse.resourceBundleConfig); + }); + }); + it('should initialize with the component and call the getResourcedFileName method', () => { + jest.spyOn(generaliseLabelService.usageService, 'getData').mockReturnValue(of(MockResponse.resourceBundleConfig as any) as any) as any; + generaliseLabelService['gResourseBundleForm'] = MockResponse.generaliseLblResponse.result; + const value = generaliseLabelService['getResourcedFileName'](MockResponse.courseHierarchy, 'en') + expect(value).toEqual(MockResponse.generaliseLblResponse.result.course.trackable.en); + }); + it('should initialize with the component and call the getResourcedFileName method for nontrackable', () => { + jest.spyOn(generaliseLabelService.usageService, 'getData').mockReturnValue(of(MockResponse.courseHierarchyNew as any) as any) as any; + generaliseLabelService['gResourseBundleForm'] = MockResponse.generaliseLblResponse.result; + const value = generaliseLabelService['getResourcedFileName'](MockResponse.courseHierarchyNew, 'en') + expect(value).toEqual(MockResponse.generaliseLblResponse.result.course.nontrackable.en); + }); + it('should initialize with the component and call the getResourcedFileName method for the course', () => { + jest.spyOn(generaliseLabelService.usageService, 'getData').mockReturnValue(of(MockResponse.courseHierarchyNew as any) as any) as any; + generaliseLabelService['gResourseBundleForm'] = MockResponse.generaliseLblResponse.result; + const value = generaliseLabelService['getResourcedFileName'](MockResponse.courseHierarchyone, 'ka') + expect(value).toEqual(MockResponse.generaliseLblResponse.result.course.trackable.en); + }); + it('should initialize with the component and call the getResourcedFileName method for other than the course', () => { + jest.spyOn(generaliseLabelService.usageService, 'getData').mockReturnValue(of(MockResponse.courseHierarchyNew as any) as any) as any; + generaliseLabelService['gResourseBundleForm'] = MockResponse.generaliseLblResponse.result; + const value = generaliseLabelService['getResourcedFileName'](MockResponse.courseHierarchytwo, 'ka') + expect(value).toEqual(MockResponse.generaliseLblResponse.result.default.nontrackable.en); + }); + it('should initialize with the component and call the setLabels method', () => { + const labels = { + 'dflt': { + 'nontrk': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Tasks' + } + }, + 'messages': { + 'stmsg': { + 'm0125': ' Start creating or uploading content.' + } + } + } + }, + 'book': { + 'nontrk': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Tasks' + } + }, + 'messages': { + 'stmsg': { + 'm0125': ' Start creating or uploading content.' + } + } + } + } + } + generaliseLabelService['contentTypeLblKey'] = 'book'; + generaliseLabelService['setLabels'](labels); + expect(generaliseLabelService.messages).toEqual({ + stmsg: { + m0125: ' Start creating or uploading content.' + } + } + ) + expect(generaliseLabelService.frmelmnts).toEqual({ lbl: { ActivityTextbooks: ' Tasks'} }); + }); + it('should initialize with the component and call the setLabels method isTrackable as trackable', () => { + generaliseLabelService['isTrackable']='trackable' + const labels = { + 'dflt': { + 'trk': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Tasks' + } + }, + 'messages': { + 'dashboard': { + 'emsg': { + 'm002': ' User has not joined any batch for this learning task' + } + } + } + } + }, + 'book': { + 'trk': { + 'frmelmnts': { + 'lbl': { + 'ActivityTextbooks': ' Tasks' + } + }, + 'messages': { + 'dashboard': { + 'emsg': { + 'm002': ' User has not joined any batch for this learning task' + } + } + } + } + } + } + generaliseLabelService['contentTypeLblKey'] = 'book'; + generaliseLabelService['setLabels'](labels); + expect(generaliseLabelService.messages).toEqual({'dashboard': { + 'emsg': { + 'm002': ' User has not joined any batch for this learning task' + } + }}) + expect(generaliseLabelService.frmelmnts).toEqual({ lbl: { ActivityTextbooks: ' Tasks'} }); + }); + it('should initialize with the component and call the setLabels method with default value', () => { + generaliseLabelService['isTrackable']='trackable' + const labels = { + } + generaliseLabelService['contentTypeLblKey'] = 'book'; + generaliseLabelService['setLabels'](labels); + expect(generaliseLabelService.messages).toEqual('this is the default message') + expect(generaliseLabelService.frmelmnts).toEqual('this is the default frmelmnts'); + }); + xit('should initialize with the component and call the getLabels method ', () => { + generaliseLabelService['getLabels'](MockResponse.courseHierarchy,'en'); + + }); }); \ No newline at end of file diff --git a/src/app/client/src/app/modules/core/services/otp/otp.service.spec.ts b/src/app/client/src/app/modules/core/services/otp/otp.service.spec.ts index b7c3ff70045..7cae427c6f3 100644 --- a/src/app/client/src/app/modules/core/services/otp/otp.service.spec.ts +++ b/src/app/client/src/app/modules/core/services/otp/otp.service.spec.ts @@ -10,10 +10,10 @@ describe('OtpService', () => { urlConFig: { URLS: { OTP: { - GENERATE: 'otp/v1/generate', - VERIFY: 'otp/v1/verify', + GENERATE: 'otp/v2/generate', + VERIFY: 'otp/v2/verify', ANONYMOUS:{ - GENERATE_USERDELETE:'anonymous/delete/otp/v1/generate' + GENERATE_USERDELETE:'anonymous/delete/otp/v2/generate' } } } diff --git a/src/app/client/src/app/modules/core/services/permission/permission.mock.spec.data.ts b/src/app/client/src/app/modules/core/services/permission/permission.mock.spec.data.ts index a4e3838b119..484c1f9cbfd 100644 --- a/src/app/client/src/app/modules/core/services/permission/permission.mock.spec.data.ts +++ b/src/app/client/src/app/modules/core/services/permission/permission.mock.spec.data.ts @@ -330,6 +330,188 @@ export const mockPermissionRes = { } ] } + }, + rolelist: [ + { + "name": "Book Creator", + "id": "BOOK_CREATOR" + }, + { + "name": "Membership Management", + "id": "MEMBERSHIP_MANAGEMENT" + }, + { + "name": "Flag Reviewer", + "id": "FLAG_REVIEWER" + }, + { + "name": "Report Viewer", + "id": "REPORT_VIEWER" + }, + { + "name": "Program Manager", + "id": "PROGRAM_MANAGER" + }, + { + "name": "Program Designer", + "id": "PROGRAM_DESIGNER" + }, + { + "name": "System Administration", + "id": "SYSTEM_ADMINISTRATION" + }, + { + "name": "Content Curation", + "id": "CONTENT_CURATION" + }, + { + "name": "Book Reviewer", + "id": "BOOK_REVIEWER" + }, + { + "name": "Content Creator", + "id": "CONTENT_CREATOR" + }, + { + "name": "Org Management", + "id": "ORG_MANAGEMENT" + }, + { + "name": "Course Admin", + "id": "COURSE_ADMIN" + }, + { + "name": "Org Moderator", + "id": "ORG_MODERATOR" + }, + { + "name": "Public", + "id": "PUBLIC" + }, + { + "name": "Admin", + "id": "ADMIN" + }, + { + "name": "Course Mentor", + "id": "COURSE_MENTOR" + }, + { + "name": "Content Reviewer", + "id": "CONTENT_REVIEWER" + }, + { + "name": "Report Admin", + "id": "REPORT_ADMIN" + }, + { + "name": "Org Admin", + "id": "ORG_ADMIN" + } + ], + roles:[ + 'COURSE_MENTOR', + 'CONTENT_CREATOR', + 'COURSE_ADMIN', + 'BOOK_CREATOR', + 'ORG_ADMIN', + 'REPORT_ADMIN', + 'CONTENT_REVIEWER', + 'ADMIN', + 'PUBLIC' + ], + RolesAndPermissions:[ + { + "roleName": "Book Creator", + "role": "BOOK_CREATOR", + 'actions': [ + { + 'urls': [ + 'v1/Book/create' + ], + 'name': 'Book Creator', + 'id': 'BOOK_CREATOR' + } + + ] + }, + { + "roleName": "Book Reviewer", + "role": "BOOK_REVIEWER", + 'actions': [ + { + 'urls': [ + 'v1/Book/review' + ], + 'name': 'Book Reviewer', + 'id': 'BOOK_REVIEWER' + } + + ] + }, + { + "roleName": "Content Creator", + "role": "CONTENT_CREATOR", + 'actions': [ + { + 'urls': [ + 'v1/course/create' + ], + 'name': 'Course Creator', + 'id': 'CONTENT_CREATOR' + } + + ] } + ], + WORKSPACEAUTHGARDROLES:[ + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"createRole","url":"workspace/content/create","tab":"CREATE" + }, + { + "roles":["ORG_ADMIN"], + "roleName":"alltextbookRole","url":"workspace/content/alltextbooks","tab":"ALLTEXTBOOKS" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"draftRole","url":"workspace/content/draft/1","tab":"DRAFTS" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"inreviewRole","url":"/workspace/content/review/1","tab":"Review Submissions" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"publishedRole","url":"workspace/content/published/1","tab":"PUBLISHED" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW"], + "roleName":"alluploadsRole","url":"workspace/content/uploaded/1","tab":"All UPLOADS" + }, + { + "roles":["CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_REVIEWER"], + "roleName":"upForReviewRole","url":"workspace/content/upForReview/1","tab":"Up FOR REVIEW" + }, + { + "roles":["COURSE_MENTOR"],"roleName":"courseBatchRoles","url":"/workspace/content/batches/1","tab":"Course Batches" + }, + { + "roles":["FLAG_REVIEWER"], + "roleName":"flagReviewerRole","url":"workspace/content/flagreviewer/1","tab":"FLAG REVIEWER" + }, + { + "roles":["FLAG_REVIEWER"], + "roleName":"flaggedRole","url":"workspace/content/flagged/1","tab":"Flagged" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"limitedPublishingRole","url":"workspace/content/upForReview/1","tab":"Limited Publishing" + }, + { + "roles":["CONTENT_CREATOR","CONTENT_CREATION","CONTENT_REVIEWER","CONTENT_REVIEW","BOOK_CREATOR"], + "roleName":"collaboratingRole","url":"workspace/content/collaborating-on","tab":"Collaborating On" + } + ], }; diff --git a/src/app/client/src/app/modules/core/services/permission/permission.service.spec.ts b/src/app/client/src/app/modules/core/services/permission/permission.service.spec.ts new file mode 100644 index 00000000000..a467fb3c79c --- /dev/null +++ b/src/app/client/src/app/modules/core/services/permission/permission.service.spec.ts @@ -0,0 +1,127 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { ConfigService, ServerResponse, ToasterService, ResourceService, IUserData } from '@sunbird/shared'; +import { LearnerService } from './../learner/learner.service'; +import { UserService } from '../user/user.service'; +import { Injectable } from '@angular/core'; +import { _ } from 'lodash-es'; +import { RolesAndPermissions, Roles } from './../../interfaces'; +import { Observable, BehaviorSubject, of } from 'rxjs'; +import { shareReplay, tap } from 'rxjs/operators'; +import { PermissionService } from './permission.service'; +import { mockPermissionRes } from './permission.mock.spec.data' + +describe('PermissionService', () => { + let component: PermissionService; + + const resourceService: Partial = {}; + const config: Partial = { + urlConFig: { + URLS: { + ROLES: { + READ: "data/v1/role/read", + } + }, + }, + rolesConfig:{ + WORKSPACEAUTHGARDROLES: mockPermissionRes.WORKSPACEAUTHGARDROLES + } + }; + const learner: Partial = { + get: jest.fn().mockReturnValue(of(mockPermissionRes.success)) + }; + const userService: Partial = { + loggedIn: true, + slug: jest.fn().mockReturnValue('tn') as any, + userData$: of({ + userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: {}, + hashTagIds: ['id'], + userRoles:['BOOK_REVIEWER'] + } as any, + }) as any, + setIsCustodianUser: jest.fn(), + setGuestUser: jest.fn(), + userid: 'sample-uid', + appId: 'sample-id', + getServerTimeDiff: '', + }; + const toasterService: Partial = {}; + + beforeAll(() => { + component = new PermissionService( + resourceService as ResourceService, + config as ConfigService, + learner as LearnerService, + userService as UserService, + toasterService as ToasterService + ) + component.mainRoles = mockPermissionRes.RolesAndPermissions; + component.rolesAndPermissions = mockPermissionRes.RolesAndPermissions; + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of component', () => { + expect(component).toBeTruthy(); + }); + it('should create a instance of component and call the initialize method', () => { + const privateMethodSpy = jest.spyOn(component,['setCurrentRoleActions'] as any) as any; + component.initialize() + expect(component).toBeTruthy(); + expect(privateMethodSpy).toBeCalled(); + }); + it('should create a instance of component and call the getPermissionsData method', () => { + jest.spyOn(learner,'get').mockReturnValue(of(mockPermissionRes.success as any)) as any + component['getPermissionsData'](); + expect(component).toBeTruthy(); + }); + it('should create a instance of component and call the checkRolesPermissions method', () => { + const value = component.checkRolesPermissions(mockPermissionRes.roles); + expect(component).toBeTruthy(); + expect(value).toBeFalsy(); + }); + it('should create a instance of component and call the checkRolesPermissions method', () => { + userService.userData$.subscribe((data) => { + data.userProfile.userRoles = ['PUBLIC']; + }); + component.userRoles = ['PUBLIC', 'BOOK_CREATOR'] + component.initialize(); + const value = component.checkRolesPermissions(mockPermissionRes.roles); + expect(component).toBeTruthy(); + expect(value).toBeTruthy(); + }); + it('should create a instance of component and call the allRoles method', () => { + const value = component.allRoles; + expect(component).toBeTruthy(); + expect(JSON.stringify(value)).toEqual(JSON.stringify(mockPermissionRes.RolesAndPermissions)); + }); + it('should create a instance of component and call the getWorkspaceAuthRoles method', () => { + const value = component.getWorkspaceAuthRoles(); + expect(component).toBeTruthy(); + expect(JSON.stringify(value)).toEqual(JSON.stringify(mockPermissionRes.WORKSPACEAUTHGARDROLES[0])) + }); + it('should create a instance of component and call the setCurrentRoleActions method', () => { + component.rolesAndPermissions = mockPermissionRes.RolesAndPermissions; + component['setCurrentRoleActions'](); + expect(component).toBeTruthy(); + expect(component.permissionAvailable).toBeTruthy(); + }); + xit('should create a instance of component and call the setCurrentRoleActions method with user error', () => { + userService.userData$.subscribe((data) => { + data.err = mockPermissionRes.error as any; + component['setCurrentRoleActions'](); + }); + }); + +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/core/services/tenant/tenant.service.spec.ts b/src/app/client/src/app/modules/core/services/tenant/tenant.service.spec.ts index 90e8c404cb7..896e1a7c7ca 100644 --- a/src/app/client/src/app/modules/core/services/tenant/tenant.service.spec.ts +++ b/src/app/client/src/app/modules/core/services/tenant/tenant.service.spec.ts @@ -12,8 +12,8 @@ describe('TenantService', () => { urlConFig: { URLS: { OTP: { - GENERATE: 'otp/v1/generate', - VERIFY: 'otp/v1/verify', + GENERATE: 'otp/v2/generate', + VERIFY: 'otp/v2/verify', }, TENANT: { INFO: 'sunbird' diff --git a/src/app/client/src/app/modules/core/services/user/user.service.spec.ts b/src/app/client/src/app/modules/core/services/user/user.service.spec.ts index fe87f913988..57d3cd14ee9 100644 --- a/src/app/client/src/app/modules/core/services/user/user.service.spec.ts +++ b/src/app/client/src/app/modules/core/services/user/user.service.spec.ts @@ -19,8 +19,8 @@ describe('UserService', () => { }, URLS: { OTP: { - GENERATE: 'otp/v1/generate', - VERIFY: 'otp/v1/verify', + GENERATE: 'otp/v2/generate', + VERIFY: 'otp/v2/verify', }, USER: { GET_PROFILE: 'user/v5/read/', @@ -31,11 +31,11 @@ describe('UserService', () => { TNC_ACCEPT: 'user/v1/tnc/accept' }, OFFLINE: { - READ_USER: 'desktop/user/v1/read', - CREATE_USER: 'desktop/user/v1/create', - UPDATE_USER: 'desktop/user/v1/update', + READ_USER: 'desktop/user/v5/read', + CREATE_USER: 'desktop/user/v1/sso/create', + UPDATE_USER: 'desktop/user/v3/update', GET_USER_BY_KEY: 'desktop/user/v1/read/by/key', - USER_EXISTS_GET_USER_BY_KEY: 'desktop/user/v1/exists/by/key' + USER_EXISTS_GET_USER_BY_KEY: 'desktop/user/v2/exists/by/key' } } } diff --git a/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.html b/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.html index f915da9e355..48533ece1a0 100644 --- a/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.html +++ b/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.html @@ -109,42 +109,40 @@
-
-
- -
- -
- - - -
- {{ resourceService?.frmelmnts?.lbl?.selectFilters }} -
-
-
-
- - -
+ +
+ +
+ + + +
+ {{ resourceService?.frmelmnts?.lbl?.selectFilters }} +
+
+
+
+ +
+
- - - - -
- -
- - -
-
+
+ + + + +
+ +
+ + +
diff --git a/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.ts b/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.ts index e4f339d13b6..206085e0e3e 100644 --- a/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.ts +++ b/src/app/client/src/app/modules/dashboard/components/data-chart/data-chart.component.ts @@ -490,6 +490,7 @@ export class DataChartComponent implements OnInit, OnDestroy { if (this.filterPopUpMat) { this.dialogRef = this.dialog.open(this.filterPopUpMat, { data: this.chartData['selectedFilters'], + panelClass: 'material-modal' }); } } diff --git a/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.spec.ts b/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.spec.ts new file mode 100644 index 00000000000..624271e1c19 --- /dev/null +++ b/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.spec.ts @@ -0,0 +1,375 @@ +import { ListAllReportsComponent } from './list-all-reports.component'; +import { UserService, TncService } from '@sunbird/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NavigationHelperService, LayoutService, ResourceService } from '@sunbird/shared'; +import { TelemetryService } from '@sunbird/telemetry'; +import { Location } from '@angular/common'; +import { of } from 'rxjs'; +import { ReportService } from '../../services'; +import { ElementRef } from '@angular/core'; + + +describe('ListAllReportsComponent', () => { + let component: ListAllReportsComponent; + const mockResourceService: Partial = {} + const mockUserService: Partial = { + userData$: of({ + userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: {}, + hashTagIds: ['id'], + + } as any, + subscribe: jest.fn() + }) as any, + }; + const mockReportService: Partial = { + isAuthenticated: jest.fn().mockReturnValue(of(true)), + isUserReportAdmin: jest.fn().mockReturnValue(true), + isUserSuperAdmin: jest.fn().mockReturnValue(false), + listAllReports: jest.fn().mockReturnValue(of({ reports: [{ report_type: 'Report' }, { report_type: 'Dataset' }] })), + getMaterializedChildRows: jest.fn(), + getFlattenedReports: jest.fn() + }; + const mockActivatedRoute: Partial = { + snapshot: { + data: { + telemetry: { + env: 'test-env', + pageid: 'test-pageid' + }, + roles: ['admin'] + } + } as any, + }; + const mockRouter: Partial = { + navigate: jest.fn().mockResolvedValue(true), + url: '/test-url' + }; + const mockNavigationHelperService: Partial = { + getPageLoadTime: jest.fn().mockReturnValue(500) + }; + const mockTelemetryService: Partial = { + interact: jest.fn(), + }; + const mockTncService: Partial = { + getReportViewerTnc: jest.fn().mockReturnValue(of({ + result: { + response: { + value: '{ "latestVersion": "1.0","1.0": "abc","abc": {"url": "http://example.com"}}' + } + } + })) + }; + const mockLocation: Partial = { + back: jest.fn() + }; + const mockLayoutService: Partial = { + initlayoutConfig: jest.fn(), + switchableLayout: jest.fn().mockReturnValue(of({ layout: 'mockLayout' })) + }; + + beforeEach(() => { + component = new ListAllReportsComponent( + mockResourceService as ResourceService, + mockReportService as ReportService, + mockActivatedRoute as ActivatedRoute, + mockRouter as Router, + mockUserService as UserService, + mockNavigationHelperService as NavigationHelperService, + mockTelemetryService as TelemetryService, + mockLayoutService as LayoutService, + mockTncService as TncService, + mockLocation as Location, + + ) + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set userProfile and call getReportViewerTncPolicy if user and userProfile exist', () => { + const mockUser = { + userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: {}, + hashTagIds: ['id'], + + } as any, + }; + const getReportViewerTncPolicySpy = jest.spyOn(component, 'getReportViewerTncPolicy'); + component.ngOnInit(); + expect(component.userProfile).toEqual(mockUser.userProfile); + expect(getReportViewerTncPolicySpy).toHaveBeenCalled(); + }); + + it('should set reportsList$ based on authentication and user role', () => { + mockReportService.isAuthenticated = jest.fn().mockReturnValue(of(true)); + mockReportService.isUserReportAdmin = jest.fn().mockReturnValue(true); + const mockReports = [{ id: 1, name: 'Report 1' }, { id: 2, name: 'Report 2' }]; + component.ngOnInit(); + expect(component.reportsList$).toBeDefined(); + component.reportsList$.subscribe(reports => { + expect(reports).toEqual(mockReports); + }); + expect(mockReportService.isAuthenticated).toHaveBeenCalledWith(['admin']); + expect(mockReportService.isUserReportAdmin).toHaveBeenCalled(); + // expect(component.getReportsList).toHaveBeenCalledWith(true); + }); + + + it('should navigate to the report with reportId and optional hash', () => { + // Arrange + const reportId = 'testReportId'; + const hash = 'testHash'; + const materialize = true; + // Act + component.rowClickEventHandler(reportId, hash, materialize); + // Assert + expect(mockRouter.navigate).toHaveBeenCalledWith( + ['/dashBoard/reports', reportId, hash], + { queryParams: { materialize } } + ); + }); + + it('should navigate to the report without optional hash', () => { + // Arrange + const reportId = 'testReportId'; + // Act + component.rowClickEventHandler(reportId); + // Assert + expect(mockRouter.navigate).toHaveBeenCalledWith( + ['/dashBoard/reports', reportId], + { queryParams: {} } + ); + }); + + it('should set reportViewerTncVersion and reportViewerTncUrl', () => { + component.getReportViewerTncPolicy(); + expect(component.reportViewerTncVersion).toEqual('1.0'); + expect(component.reportViewerTncUrl).toEqual(undefined); + }); + + it('should set showTncPopup to true if reportViewerTncObj is not present in userProfile', () => { + // Arrange + component.userProfile = { allTncAccepted: {} }; + // Act + component.showReportViewerTncForFirstUser(); + // Assert + expect(component.showTncPopup).toBeTruthy(); + }); + + it('should not set showTncPopup to true if reportViewerTncObj is present in userProfile', () => { + // Arrange + component.userProfile = { allTncAccepted: { reportViewerTnc: true } }; + // Act + component.showReportViewerTncForFirstUser(); + // Assert + expect(component.showTncPopup).toBeFalsy(); + }); + + it('should call location.back() when goBack() is called', () => { + component.goBack(); + expect(mockLocation.back).toHaveBeenCalled(); + }); + + it('should update layoutConfiguration based on switchableLayout observable', () => { + component.initLayout(); + expect(component.layoutConfiguration).toBe('mockLayout'); + }); + + + it('should return the telemetry impression object', () => { + // Arrange + const type = 'test-type'; + const cdata = [{ id: 'test-id', type: 'test-type' }]; + // Act + const telemetryImpression = component.getTelemetryImpression({ type, cdata }); + // Assert + expect(telemetryImpression).toEqual({ + context: { + env: 'test-env', + cdata: [{ id: 'test-id', type: 'test-type' }] + }, + object: { + id: undefined, + type: 'user', + ver: '1.0' + }, + edata: { + type: 'test-type', + pageid: 'test-pageid', + uri: '/test-url', + duration: 500 + } + }); + }); + + it('should return correct reports count for different scenarios', () => { + const reports = [ + { id: 1, status: 'draft' }, + { id: 2, status: 'live' }, + { id: 3, status: 'draft' }, + { id: 4, status: 'archived' } + ]; + const draftReportsCount = component['getReportsCount']({ reports, status: 'draft' }); + const liveReportsCount = component['getReportsCount']({ reports, status: 'live' }); + const archivedReportsCount = component['getReportsCount']({ reports, status: 'archived' }); + expect(draftReportsCount).toBe(2); + expect(liveReportsCount).toBe(1); + expect(archivedReportsCount).toBe(1); + }); + + + it('should return 0 when reports array is empty', () => { + const reports = []; + const count = component['getReportsCount']({ reports }); + expect(count).toBe(0); + }); + + it('should return correct count when reports array contains elements with specified status', () => { + const reports = [ + { id: 1, status: 'draft' }, + { id: 2, status: 'live' }, + { id: 3, status: 'draft' }, + { id: 4, status: 'archived' } + ]; + const countDraft = component['getReportsCount']({ reports, status: 'draft' }); + const countLive = component['getReportsCount']({ reports, status: 'live' }); + const countArchived = component['getReportsCount']({ reports, status: 'archived' }); + expect(countDraft).toBe(2); + expect(countLive).toBe(1); + expect(countArchived).toBe(1); + }); + + it('should return 0 when reports array does not contain elements with specified status', () => { + const reports = [ + { id: 1, status: 'draft' }, + { id: 2, status: 'draft' }, + { id: 3, status: 'draft' } + ]; + const count = component['getReportsCount']({ reports, status: 'live' }); + expect(count).toBe(0); + }); + + it('should return correct count when status is not specified', () => { + const reports = [ + { id: 1, status: 'draft' }, + ]; + const count = component['getReportsCount']({ reports }); + expect(count).toBe(reports.length); + }); + + it('should prepare table when inputTag is set', () => { + const mockElementRef: ElementRef = { + nativeElement: document.createElement('div') + }; + const mockReports = [{ id: 1, name: 'Report 1' }, { id: 2, name: 'Report 2' }]; + component.reports = [{ id: 1, name: "Report 1" }] + component.prepareTable = jest.fn(); + component.inputTag = mockElementRef; + expect(component.prepareTable).toHaveBeenCalledWith(mockElementRef.nativeElement, mockReports[0]); + }); + + + it('should not prepare table when inputTag is null', () => { + component.prepareTable = jest.fn(); + component.inputTag = null; + expect(component.prepareTable).not.toHaveBeenCalled(); + }); + + it('should not prepare dataset table when datasetTable is null', () => { + mockReportService.isUserReportAdmin = jest.fn().mockReturnValue(false); + component.prepareTable = jest.fn(); + component.datasetTable = null; + expect(component.prepareTable).not.toHaveBeenCalled(); + }); + + it('should render tags correctly when data is an array', () => { + // Arrange + const data = ['tag1', 'tag2', 'tag3']; + // Act + const renderedTags = component['renderTags'](data); + // Assert + const expectedHtml = `
Tag 1 Tag 2 Tag 3
` + expect(renderedTags).toEqual(expectedHtml); + }); + + it('should render single tag correctly when data is not an array', () => { + // Arrange + const data = 'tag'; + // Act + const renderedTags = component['renderTags'](data); + // Assert + const expectedHtml = 'Tag'; + expect(renderedTags).toEqual(expectedHtml); + }); + + it('should return telemetry interact data with default id when only type is provided', () => { + // Arrange + const type = 'some-type'; + // Act + const telemetryData = component.setTelemetryInteractEdata({ type }); + // Assert + expect(telemetryData).toEqual({ + id: 'reports-list', + type, + pageid: 'test-pageid' + }); + }); + + it('should return telemetry interact data with provided id and type', () => { + // Arrange + const type = 'another-type'; + const id = 'custom-id'; + // Act + const telemetryData = component.setTelemetryInteractEdata({ type, id }); + // Assert + expect(telemetryData).toEqual({ + id, + type, + pageid: 'test-pageid' + }); + }); + + + it('should log telemetry correctly', () => { + // Arrange + const type = 'testType'; + const cdata = [{ id: 'testId', type: 'testType' }]; + const id = 'testId'; + // Act + component['logTelemetry']({ type, cdata, id }); + // Assert + expect(mockTelemetryService.interact).toHaveBeenCalledWith({ + context: { + env: 'test-env', + cdata + }, + edata: Object({ + id: 'reports-list', + type: 'testType', + pageid: 'test-pageid' + }), + object: Object({ + type: 'Report', + ver: "1.0", + id: "testId", + rollup: Object({}), + }) + }); + }); + it('should return materialized child rows if user is super admin', () => { + // Arrange + mockReportService.isUserSuperAdmin = jest.fn().mockReturnValue(true); + const reports = [{ id: 1 }, { id: 2 }]; + // Act + const result = component['filterReportsBasedOnRoles'](reports); + // Assert + expect(result).toEqual(mockReportService.getMaterializedChildRows(reports)); + }); + +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts b/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts index 4bcf22b7b64..7c9c2f7d158 100644 --- a/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts +++ b/src/app/client/src/app/modules/dashboard/components/list-all-reports/list-all-reports.component.ts @@ -252,7 +252,7 @@ export class ListAllReportsComponent implements OnInit { $(el).on('click', 'tbody tr td:not(.details-control)', (event) => { const rowData = masterTable && masterTable.row(event?.currentTarget).data(); - if (_.get(rowData, 'reportid') && _.get(rowData, 'hashed_val') && rowData.hasOwnProperty('materialize')) { + if (_.get(rowData, 'reportid') && _.get(rowData, 'hashed_val') || (this.reportService.isUserSuperAdmin() && rowData?.hasOwnProperty('materialize'))) { const reportid = _.get(rowData,'reportid'); const hashed_val = _.get(rowData,'hashed_val'); const materialize = _.get(rowData,'materialize'); diff --git a/src/app/client/src/app/modules/dial-code-search/components/get/get.component.spec.ts b/src/app/client/src/app/modules/dial-code-search/components/get/get.component.spec.ts new file mode 100644 index 00000000000..56efca96e9b --- /dev/null +++ b/src/app/client/src/app/modules/dial-code-search/components/get/get.component.spec.ts @@ -0,0 +1,109 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { ResourceService, NavigationHelperService, LayoutService } from '@sunbird/shared'; +import { Router, ActivatedRoute } from '@angular/router'; +import { _ } from 'lodash-es'; +import { GetComponent } from './get.component'; +import { of } from 'rxjs'; + +describe('GetComponent', () => { + let component: GetComponent; + + const resourceService: Partial = {}; + const router: Partial = { + navigate: jest.fn() + + }; + const activatedRoute: Partial = { + queryParams: of({ + type: 'edit', + courseId: 'do_456789', + batchId: '124631256' + }), + params: of({ collectionId: "123" }), + snapshot: { + data: { + telemetry: { + env: 'certs', + pageid: 'certificate-configuration', + type: 'view', + subtype: 'paginate', + ver: '1.0' + } + } + } as any + }; + const navigationhelperService: Partial = { + getPageLoadTime :jest.fn() + }; + const layoutService: Partial = { + initlayoutConfig: jest.fn(), + switchableLayout: jest.fn(), + + }; + + beforeAll(() => { + component = new GetComponent( + resourceService as ResourceService, + router as Router, + activatedRoute as ActivatedRoute, + navigationhelperService as NavigationHelperService, + layoutService as LayoutService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should call ngOnInit', () => { + Object.defineProperty(window, 'EkTelemetry', { value: { config: {} } }); + layoutService.switchableLayout = jest.fn(() => of([{ data: '' }])); + component.ngOnInit() + expect(layoutService.switchableLayout).toHaveBeenCalled(); + }); + + it('should set values on ngAfterViewInit',(done) =>{ + component.ngAfterViewInit(); + setTimeout(() => { + expect(component.telemetryImpression).toEqual({ + context: { + env: activatedRoute.snapshot.data.telemetry.env + }, + edata: { + type: activatedRoute.snapshot.data.telemetry.type, + pageid: activatedRoute.snapshot.data.telemetry.pageid, + uri: activatedRoute.snapshot.data.telemetry.uri, + duration: navigationhelperService.getPageLoadTime() + } + }); + done() + }); + }); + + it('should call ngOnInit', () => { + component.searchKeyword='test' + component.navigateToSearch() + expect(router.navigate).toHaveBeenCalled(); + + }); + + it('should unsubscribe from subscriptions on destroy', () => { + const mockResourceDataSubscription = { + unsubscribe: jest.fn(), + }; + component.unsubscribe$ = { + next: jest.fn(), + complete: jest.fn() + } as any; + + component.ngOnDestroy(); + expect(component.unsubscribe$.next).toHaveBeenCalled(); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.html b/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.html index 5e14735e46b..8f0ab0294dc 100644 --- a/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.html +++ b/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.html @@ -47,7 +47,7 @@

-

{{resourceService?.frmelmnts?.lbl?.hi}} {{userProfile?.firstName +

{{resourceService?.frmelmnts?.lbl?.hi}} {{userProfile?.firstName | titlecase}} {{userProfile?.lastName | titlecase}}

{{resourceService?.frmelmnts?.lbl?.yourPreferences}} @@ -57,8 +57,8 @@

{{ (resourceService?.frmelmnts?.lbl[category?.code] | transposeTerms: resourceService?.frmelmnts?.lbl[category?.code] : resourceService?.selectedLang) || category?.labels }}: - {{category?.values[0]}} ...+ {{category?.values?.length-1}} - {{category?.values[0]}} + {{category?.values[0]}} ...+ {{category?.values?.length-1}} + {{category?.values[0]}}

@@ -81,7 +81,7 @@

-
{{getBannerTitle(section?.section?.title)}} +
{{getBannerTitle(section?.section?.title)}}
diff --git a/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.scss b/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.scss index ff32d69c35a..cd195a418a8 100644 --- a/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.scss +++ b/src/app/client/src/app/modules/explore-page/components/explore-page/explore-page.component.scss @@ -23,6 +23,11 @@ flex: 1; .header { font-size: calculateRem(16px); + font-weight: 500; + } + + .value { + font-weight: 500; } .preference-icon{ position: relative; @@ -62,6 +67,9 @@ display: block !important; } } +.featured-text { + font-weight: 500; +} .home-container { padding:0; } diff --git a/src/app/client/src/app/modules/groups/components/activity/add-activity-content-types/add-activity-content-types.component.spec.ts b/src/app/client/src/app/modules/groups/components/activity/add-activity-content-types/add-activity-content-types.component.spec.ts index 0fd79a9e65d..171a3e1bd23 100644 --- a/src/app/client/src/app/modules/groups/components/activity/add-activity-content-types/add-activity-content-types.component.spec.ts +++ b/src/app/client/src/app/modules/groups/components/activity/add-activity-content-types/add-activity-content-types.component.spec.ts @@ -35,6 +35,9 @@ describe('AddActivityContentTypesComponent', () => { } } } as any, + queryParams: of({groupName:'test', + createdBy:'test'}), + }; const mockRouter :Partial ={ url: '/mock-url', @@ -75,6 +78,13 @@ describe('AddActivityContentTypesComponent', () => { expect(component).toBeTruthy(); }); + it('should call ngOnInit', () => { + mockLayoutService.switchableLayout = jest.fn(() => of([{ data: '' }])); + mockGroupService.getSupportedActivityList = jest.fn(() => of([{ data: '' }])); + component.ngOnInit() + expect(mockLayoutService.switchableLayout).toHaveBeenCalled(); + }); + it('should destroy activity-content', () => { component.unsubscribe$ = { next: jest.fn(), diff --git a/src/app/client/src/app/modules/groups/services/groups/groups.service.spec.ts b/src/app/client/src/app/modules/groups/services/groups/groups.service.spec.ts new file mode 100644 index 00000000000..d4875e6f401 --- /dev/null +++ b/src/app/client/src/app/modules/groups/services/groups/groups.service.spec.ts @@ -0,0 +1,628 @@ +import { Router } from '@angular/router'; +import { CsGroupAddActivitiesRequest, CsGroupRemoveActivitiesRequest, CsGroupSearchCriteria, CsGroupUpdateActivitiesRequest, CsGroupUpdateMembersRequest, CsGroupUpdateGroupGuidelinesRequest, CsGroupSupportedActivitiesFormField } from '@project-sunbird/client-services/services/group/interface'; +import { UserService, LearnerService, TncService } from '@sunbird/core'; +import { NavigationHelperService, ResourceService, ConfigService } from '@sunbird/shared'; +import { TelemetryService } from '@sunbird/telemetry'; +import { _ } from 'lodash-es'; +import { IGroupCard, IGroupUpdate, IMember, MY_GROUPS } from '../../interfaces'; +import { CsLibInitializerService } from './../../../../service/CsLibInitializer/cs-lib-initializer.service'; +import { CsGroup } from '@project-sunbird/client-services/models'; +import { GroupsService } from './groups.service'; +jest.mock('@project-sunbird/client-services', () => { + return { + CsModule: { + instance: { + config: { + core: { + api: { + authentication: { + userToken: '' + } + } + } + }, + groupService: { + updateById: jest.fn(), + create: jest.fn(), + search: jest.fn(), + getById: jest.fn(), + deleteById: jest.fn(), + addMembers: jest.fn(), + updateMembers: jest.fn(), + removeMembers: jest.fn(), + addActivities: jest.fn(), + updateActivities: jest.fn(), + removeActivities: jest.fn(), + suspendById: jest.fn(), + reactivateById: jest.fn(), + updateGroupGuidelines: jest.fn(), + + activityService: { + getDataAggregation: jest.fn(), + getDataForDashlets: jest.fn() + } + }, + userService: { + checkUserExists: jest.fn(), + userProfile: { + + } + + }, + updateConfig: jest.fn().mockImplementation(() => { + }) + }, + updateById: {} + } + }; +}); +describe('GroupsService', () => { + let service: GroupsService; + const csLibInitializerService: Partial = { + initializeCs: jest.fn() + }; + const userService: Partial = { + userid: 'mocked-userid', + userProfile: { + _userData: { + allTncAccepted: { + groupsTnc: { + version: 1 + } + } + } + + }, + }; + const resourceService: Partial = { + languageSelected$: { + pipe: jest.fn().mockReturnValueOnce({ + subscribe: jest.fn((callback: any) => { + setTimeout(() => { + callback({ value: 'en' }); + }, 600); + }) + }) + } as any, + frmelmnts: { + lbl: { + you: 'You' + } + } + }; + const telemetryService: Partial = { + interact: jest.fn() + }; + const navigationhelperService: Partial = { + goBack: jest.fn(), + getPageLoadTime: jest.fn() + }; + const router: Partial = { + navigate: jest.fn() + }; + const configService: Partial = { + urlConFig: { + URLS: { + SYSTEM_SETTING: { + GOOGLE_RECAPTCHA: 'mocked-url' + } + } + }, + }; + const learnerService: Partial = { + + get: jest.fn() + }; + const tncService: Partial = {}; + beforeAll(() => { + service = new GroupsService( + csLibInitializerService as CsLibInitializerService, + userService as UserService, + resourceService as ResourceService, + telemetryService as TelemetryService, + navigationhelperService as NavigationHelperService, + router as Router, + configService as ConfigService, + learnerService as LearnerService, + tncService as TncService + + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + + }); + it('should create a instance of service', () => { + expect(service).toBeTruthy(); + }); + + it('should set current user role correctly', () => { + const members = [ + { userId: '1', role: 'admin' }, + { userId: '2', role: 'member' }, + ]; + service['userService'] = { userid: '2' } as any + service['groupData'] = { createdBy: '1' } as any; + service.setCurrentUserRole(members); + expect(service.isCurrentUserAdmin).toBe(false); + expect(service.isCurrentUserCreator).toBe(false); + }); + + it('should assign random colors to each group in the provided groupList array', () => { + const groupList = [ + { id: 1, name: 'Group 1' }, + { id: 2, name: 'Group 2' }, + { id: 3, name: 'Group 3' } + ] as any + + const result = service.addGroupPaletteList(groupList); + + expect(result).toHaveLength(groupList.length); + result.forEach(group => { + expect(group).toHaveProperty('cardBgColor'); + expect(group).toHaveProperty('cardTitleColor'); + }); + }); + + it('should return an empty array if groupList is null', () => { + const result = service.addGroupPaletteList(null); + + expect(result).toEqual([]); + }); + + it('should call learnerService.get with the constructed systemSetting object', () => { + service.getRecaptchaSettings(); + + expect(learnerService.get).toHaveBeenCalledWith({ + url: configService.urlConFig.URLS.SYSTEM_SETTING.GOOGLE_RECAPTCHA + }); + }); + + it('should call groupCservice.updateById with the provided groupId and updateRequest', () => { + service['groupCservice'].updateById = jest.fn() + const groupId = 'group1'; + const updateRequest: IGroupUpdate = { + } as any + service.updateGroup(groupId, updateRequest); + expect(service['groupCservice'].updateById).toHaveBeenCalledWith(groupId, updateRequest); + }); + it('should call groupCservice.create with the provided groupData', () => { + service['groupCservice'].create = jest.fn() + const groupData: IGroupCard = { + } as any; + + service.createGroup(groupData); + + expect(service['groupCservice'].create).toHaveBeenCalledWith(groupData); + }); + + it('should call groupCservice.search with the provided search request', () => { + service['groupCservice'].search = jest.fn() + const searchRequest: CsGroupSearchCriteria = { + } as any; + service.searchUserGroups(searchRequest); + expect(service['groupCservice'].search).toHaveBeenCalledWith(searchRequest); + }); + + it('should call groupCservice.getById with the provided groupId and options', () => { + service['groupCservice'].getById = jest.fn() + const groupId = 'group1'; + const includeMembers = true; + const includeActivities = false; + const groupActivities = true; + service.getGroupById(groupId, includeMembers, includeActivities, groupActivities); + expect(service['groupCservice'].getById).toHaveBeenCalledWith(groupId, { + includeMembers, + includeActivities, + groupActivities + }); + }); + + it('should add fields to the member object based on the defined logic', () => { + const member = { + name: 'John', + userName: 'john_doe', + userId: 'user123', + identifier: 'identifier123', + role: 'admin', + isSelf: 'pkg', + isMenu: "test" + }; + service.isCurrentUserCreator = true + const result = service.addFields(member); + + expect(result.title).toBe('John'); + expect(result.initial).toBe('J'); + expect(result.identifier).toBe('user123'); + expect(result.isAdmin).toBe(true); + expect(result.isCreator).toBe(false); + expect(result.isMenu).toBe(true); + }); + it('should call groupCservice.deleteById with the provided groupId', () => { + service['groupCservice'].deleteById = jest.fn() + service.deleteGroupById('groupId123'); + expect(service['groupCservice'].deleteById).toHaveBeenCalledWith('groupId123'); + }); + + it('should call groupCservice.addMembers with the provided groupId and members', () => { + service['groupCservice'].addMembers = jest.fn(); + const members: IMember = { + } as any; + service.addMemberById('groupId123', members); + expect(service['groupCservice'].addMembers).toHaveBeenCalledWith('groupId123', members); + }); + + it('should call groupCservice.updateMembers with the provided groupId and updateMembersRequest', () => { + service['groupCservice'].updateMembers = jest.fn(); + const updateMembersRequest: CsGroupUpdateMembersRequest = { + } as any; + service.updateMembers('groupId123', updateMembersRequest); + expect(service['groupCservice'].updateMembers).toHaveBeenCalledWith('groupId123', updateMembersRequest); + }); + + it('should call groupCservice.removeMembers with the provided groupId and userIds', () => { + service['groupCservice'].removeMembers = jest.fn() + const userIds: string[] = ['user1', 'user2']; + service.removeMembers('groupId123', userIds); + expect(service['groupCservice'].removeMembers).toHaveBeenCalledWith('groupId123', { userIds }); + }); + + it('should call groupCservice.addActivities with the provided groupId and addActivitiesRequest', () => { + service['groupCservice'].addActivities = jest.fn(); + const addActivitiesRequest: CsGroupAddActivitiesRequest = { + } as any; + + service.addActivities('groupId123', addActivitiesRequest); + + expect(service['groupCservice'].addActivities).toHaveBeenCalledWith('groupId123', addActivitiesRequest); + }); + + it('should call groupCservice.updateActivities with the provided groupId and updateActivitiesRequest', () => { + service['groupCservice'].updateActivities = jest.fn(); + const updateActivitiesRequest: CsGroupUpdateActivitiesRequest = { + activities: { + id: 'string', + type: 'test', + status: { + ACTIVE: "active", + INACTIVE: "inactive", + SUSPENDED: "suspended" + } + } as any + }; + + service.updateActivities('groupId123', updateActivitiesRequest); + + expect(service['groupCservice'].updateActivities).toHaveBeenCalledWith('groupId123', updateActivitiesRequest); + }); + + it('should call groupCservice.removeActivities with the provided groupId and removeActivitiesRequest', () => { + service['groupCservice'].removeActivities = jest.fn(); + const removeActivitiesRequest: CsGroupRemoveActivitiesRequest = { + activityIds: ['test'] + }; + + service.removeActivities('groupId123', removeActivitiesRequest); + + expect(service['groupCservice'].removeActivities).toHaveBeenCalledWith('groupId123', removeActivitiesRequest); + }); + + it('should call userCservice.checkUserExists with the provided memberId and captchaToken', () => { + service['userCservice'].checkUserExists = jest.fn(); + const captchaToken = {}; + service.getUserData('memberId123', captchaToken); + expect(service['userCservice'].checkUserExists).toHaveBeenCalledWith({ key: 'userName', value: 'memberId123' }, captchaToken); + }); + + it('should call groupCservice.activityService.getDataAggregation with the provided groupId, activity, mergeGroup, and leafNodesCount', () => { + service['groupCservice'].activityService.getDataAggregation = jest.fn(); + const groupId = 'groupId123'; + const activity = 'activity123'; + const mergeGroup = true; + const leafNodesCount = 5; + service.getActivity(groupId, activity, mergeGroup, leafNodesCount); + expect(service['groupCservice'].activityService.getDataAggregation).toHaveBeenCalledWith(groupId, activity, mergeGroup, leafNodesCount); + }); + + it('should call telemetryService.interact with the correct interactData object', () => { + const eid = { + id: 'eventId123', + edata: { + type: 'eventType', + subtype: 'eventSubtype' + }, + extra: { + key1: 'value1', + key2: 'value2' + } + }; + const routeData = { + params: { + groupId: 'groupId123' + }, + data: { + telemetry: { + env: 'testEnvironment', + pageid: 'testPageId' + } + } + }; + const cdata = []; + const groupId = 'groupId123'; + const obj = { + key: 'value' + }; + service.addTelemetry(eid, routeData, cdata, groupId, obj); + expect(telemetryService.interact).toHaveBeenCalledWith({ + context: { + env: 'testEnvironment', + cdata: [{ id: 'groupId123', type: 'Group' }] + }, + edata: { + id: 'eventId123', + type: 'eventType', + subtype: 'eventSubtype', + extra: { + key1: 'value1', + key2: 'value2' + }, + pageid: 'testPageId' + }, + object: { + key: 'value' + } + }); + }); + + it('should handle empty activitiesGrouped', () => { + const showList = false; + const groupData = {}; + + const result = service.groupContentsByActivityType(showList, groupData); + + expect(result.showList).toBe(false); + expect(result.activities).toEqual({}); + }); + + it('should emit showActivateModal event with the provided name and eventName', () => { + const name = 'testName'; + const eventName = 'testEvent'; + jest.spyOn(service.showActivateModal, 'emit') + service.emitActivateEvent(name, eventName); + expect(service.showActivateModal.emit).toHaveBeenCalledWith({ name, eventName }); + }); + + it('should call groupCservice.suspendById with the provided groupId', () => { + service['groupCservice'].suspendById = jest.fn(); + const groupId = 'groupId123'; + service.deActivateGroupById(groupId); + expect(service['groupCservice'].suspendById).toHaveBeenCalledWith(groupId); + }); + + it('should call groupCservice.reactivateById with the provided groupId', () => { + service['groupCservice'].reactivateById = jest.fn() + const groupId = 'groupId123'; + service.activateGroupById(groupId); + expect(service['groupCservice'].reactivateById).toHaveBeenCalledWith(groupId); + }); + + it('should emit updateEvent with the provided value', () => { + const value = 'testValue'; + jest.spyOn(service.updateEvent, 'emit'); + service.emitUpdateEvent(value); + expect(service.updateEvent.emit).toHaveBeenCalledWith(value); + }); + + it('should update the group status and return whether the group is active', () => { + const group = new CsGroup(); + const status = + { + ACTIVE: "active", + } as any; + const isActive = service.updateGroupStatus(group, status); + expect(group.status).toBe(status); + expect(isActive).toBe(group.isActive()); + }); + + + it('should emit the showMenu event with the provided visibility parameter', () => { + const visibility = true; + jest.spyOn(service.showMenu, 'emit') + service.emitMenuVisibility(visibility); + expect(service.showMenu.emit).toHaveBeenCalledWith(visibility); + }); + it('should emit the closeForm event', () => { + jest.spyOn(service.closeForm, 'emit') + service.emitCloseForm(); + expect(service.closeForm.emit).toHaveBeenCalled(); + }); + + it('should emit the membersList event with the provided members', () => { + const members = [{}, {}] as any; + jest.spyOn(service.membersList, 'emit') + service.emitMembers(members); + expect(service.membersList.emit).toHaveBeenCalledWith(members); + }); + + it('should emit the showLoader event with the provided value', () => { + const value = true; + jest.spyOn(service.showLoader, 'emit') + service.emitShowLoader(value); + expect(service.showLoader.emit).toHaveBeenCalledWith(value); + }); + + + it('should construct the impression object with default edata properties when edata is not provided', () => { + const routeData = { + data: { + telemetry: { + type: 'defaultType', + subtype: 'defaultSubtype', + env: 'defaultEnv', + pageid: 'defaultPageId', + } + }, + params: {} + }; + const url = 'testUrl'; + + const impressionObj = service.getImpressionObject(routeData, url); + + expect(impressionObj).toEqual({ + context: { + env: 'defaultEnv' + }, + edata: { + type: 'defaultType', + pageid: 'defaultPageId', + subtype: 'defaultSubtype', + uri: 'testUrl', + } + }); + }); + it('should include object information in the impression object if groupId is present in routeData', () => { + const routeData = { + data: { + telemetry: { + type: 'defaultType', + subtype: 'defaultSubtype', + env: 'defaultEnv', + pageid: 'defaultPageId' + } + }, + params: { + groupId: 'testGroupId' + } + }; + const url = 'testUrl'; + const impressionObj = service.getImpressionObject(routeData, url); + expect(impressionObj).toEqual({ + context: { + env: 'defaultEnv' + }, + edata: { + type: 'defaultType', + pageid: 'defaultPageId', + subtype: 'defaultSubtype', + uri: 'testUrl', + }, + object: { + id: 'testGroupId', + type: 'Group', + ver: '1.0' + } + }); + }); + + + it('should return false if the groups TNC version is equal to or greater than the latest version', () => { + + const result = service.isTncUpdated(); + + expect(result).toBe(false); + }); + it('should return an empty array if members array is falsy', () => { + const result = service.addFieldsToMember(null); + expect(result).toEqual([]); + }); + + it('should correctly add fields to each member and sort the array based on criteria', () => { + const members = [ + { userId: 1, name: 'John', role: 'admin' }, + { userId: 2, name: 'Alice', role: 'member' } + ]; + + const result = service.addFieldsToMember(members); + + expect(result).toEqual([ + { userId: 1, name: 'John', role: 'admin', indexOfMember: 0, isAdmin: true, isSelf: false, isMenu: false, title: 'John', initial: 'J', identifier: 1, isCreator: false, }, + { userId: 2, name: 'Alice', role: 'member', indexOfMember: 1, isAdmin: false, isSelf: false, isMenu: false, title: 'Alice', initial: 'A', identifier: 2, isCreator: false, } + ]); + }); + it('should call getDataForDashlets method of activityService with the provided data', () => { + service['groupCservice'].activityService.getDataForDashlets = jest.fn() + const courseHeirarchyData = {}; + const aggData = {}; + service.getDashletData(courseHeirarchyData, aggData); + expect(service['groupCservice'].activityService.getDataForDashlets).toHaveBeenCalledWith(courseHeirarchyData, aggData); + }); + it('should call updateGroupGuidelines method of groupCService with the provided request', () => { + service['groupCservice'].updateGroupGuidelines = jest.fn(); + const request = {} as any; + service.updateGroupGuidelines(request); + expect(service['groupCservice'].updateGroupGuidelines).toHaveBeenCalledWith(request); + }); + + it('should navigate to MY_GROUPS if _history has only one item', () => { + navigationhelperService['_history'] = ['someRoute']; + service.goBack(); + expect(router.navigate).toHaveBeenCalledWith([MY_GROUPS]); + }); + it('should call navigationhelperService.goBack if _history has more than one item', () => { + navigationhelperService['_history'] = ['someRoute1', 'someRoute2']; + + service.goBack(); + + expect(navigationhelperService.goBack).toHaveBeenCalled(); + }); + it('should return the latestTnc value when using the getter method', () => { + const groupsTnc = {}; + service['_groupsTnc'] = groupsTnc; + const result = service.latestTnc; + expect(result).toEqual(groupsTnc); + }); + + it('should set the userData value when using the setter method', () => { + const userData = {}; + service.userData = userData; + expect(service['_userData']).toEqual(userData); + }); + it('should return true if user has accepted TNC and groupsTnc is not empty', () => { + service['_userData'] = { + allTncAccepted: { + groupsTnc: { + version: 1 + } + } + }; + const result = service.isUserAcceptedTnc(); + expect(result).toBe(true); + }); + + it('should return false if user has not accepted TNC or groupsTnc is empty', () => { + service['_userData'] = { + allTncAccepted: { + groupsTnc: { + + } + } + }; + const resultEmptyGroupsTnc = service.isUserAcceptedTnc(); + + expect(resultEmptyGroupsTnc).toBe(false); + + service['_userData'] = { + allTncAccepted: {} + }; + const resultNoGroupsTnc = service.isUserAcceptedTnc(); + expect(resultNoGroupsTnc).toBe(false); + }); + + it('should parse groupsTnc value if it is a string before setting', () => { + const groupsTnc = { + value: '{"key": "value"}' + }; + service.groupsTncDetails = groupsTnc; + expect(service['_groupsTnc']).toEqual({ value: { key: 'value' } }); + }); + + it('should set groupsTnc value as is if it is not a string', () => { + const groupsTnc = { + value: { key: 'value' } + }; + service.groupsTncDetails = groupsTnc; + expect(service['_groupsTnc']).toEqual(groupsTnc); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html b/src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html index 01f38a439d7..7020ed904d7 100644 --- a/src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html +++ b/src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.html @@ -95,7 +95,6 @@
- {{resourceService?.frmelmnts?.lbl?.startdate}} @@ -110,7 +109,6 @@
- {{resourceService?.frmelmnts?.lbl?.enddate}} @@ -124,7 +122,6 @@
- {{resourceService?.frmelmnts?.lbl?.enrollmentenddate}} diff --git a/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.spec.ts b/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.spec.ts index 7be892ed5d2..36caca70b99 100644 --- a/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.spec.ts +++ b/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.spec.ts @@ -1,11 +1,11 @@ import { takeUntil } from 'rxjs/operators'; -import { Component,OnInit,Input,AfterViewInit,ChangeDetectorRef,OnDestroy } from '@angular/core'; -import { CourseConsumptionService,CourseProgressService } from './../../../services'; -import { ActivatedRoute,Router } from '@angular/router'; +import { Component, OnInit, Input, AfterViewInit, ChangeDetectorRef, OnDestroy } from '@angular/core'; +import { CourseConsumptionService, CourseProgressService } from './../../../services'; +import { ActivatedRoute, Router } from '@angular/router'; import { _ } from 'lodash-es'; -import { CoursesService,PermissionService,CopyContentService,OrgDetailsService,UserService,GeneraliseLabelService } from '@sunbird/core'; -import { ResourceService,ToasterService,ContentData,ContentUtilsServiceService,ITelemetryShare,ExternalUrlPreviewService,UtilService,ConnectionService,OfflineCardService,ServerResponse } from '@sunbird/shared'; -import { IInteractEventObject,TelemetryService } from '@sunbird/telemetry'; +import { CoursesService, PermissionService, CopyContentService, OrgDetailsService, UserService, GeneraliseLabelService } from '@sunbird/core'; +import { ResourceService, ToasterService, ContentData, ContentUtilsServiceService, ITelemetryShare, ExternalUrlPreviewService, UtilService, ConnectionService, OfflineCardService, ServerResponse } from '@sunbird/shared'; +import { IInteractEventObject, TelemetryService } from '@sunbird/telemetry'; import dayjs from 'dayjs'; import { GroupsService } from '../../../../groups/services/groups/groups.service'; import { NavigationHelperService } from '@sunbird/shared'; @@ -17,91 +17,138 @@ import { ContentManagerService } from '../../../../public/module/offline/service import { DiscussionTelemetryService } from './../../../../shared/services/discussion-telemetry/discussion-telemetry.service'; import { CourseConsumptionHeaderComponent } from './course-consumption-header.component'; import { of, throwError } from 'rxjs'; +import { MockResponseData } from './course-consumption-header.spec.data'; +import { json } from 'body-parser'; describe('CourseConsumptionHeaderComponent', () => { - let component: CourseConsumptionHeaderComponent; + let component: CourseConsumptionHeaderComponent; - const mockActivatedRoute :Partial ={ - snapshot:{ - params:{ - courseId: 'mock-course-id', + const mockActivatedRoute: Partial = { + snapshot: { + params: { + courseId: 'mock-course-id', }, - data:{ - telemetry:{ + data: { + telemetry: { env: 'mock-env', pageid: 'page-id', } } } as any, }; - const mockCourseConsumptionService :Partial ={ + const mockCourseConsumptionService: Partial = { getContentRollUp: jest.fn(), getRollUp: jest.fn(), + setCoursePagePreviousUrl: jest.fn(), + isTrackableCollection: jest.fn(), + canViewDashboard: jest.fn() }; - const mockResourceService :Partial ={ + const mockResourceService: Partial = { messages: { - fmsg:{ + fmsg: { m0090: 'mock-error-message', + m0004: 'Could not fetch data, try again later' }, stmsg: { - desktop: { - deleteCourseSuccessMessage: 'Course deleted successfully' - } + desktop: { + deleteCourseSuccessMessage: 'Course deleted successfully' + }, + m0140: 'Downloading' }, etmsg: { - desktop: { - deleteCourseErrorMessage: 'Error deleting course' - } + desktop: { + deleteCourseErrorMessage: 'Error deleting course' + } }, - smsg:{ - m0059: 'mock-error-message' + smsg: { + m0059: 'mock-error-message', + m0056: 'You should be online to update the {contentName}' }, } - + }; - const mockRouter :Partial ={ + const mockRouter: Partial = { navigate: jest.fn(), }; - const mockPermissionService :Partial ={}; - const mockToasterService :Partial ={ + const mockPermissionService: Partial = { + checkRolesPermissions: jest.fn(() => { + return true; + }) as any + }; + const mockToasterService: Partial = { success: jest.fn(), - error: jest.fn(), + error: jest.fn(), + }; + const mockCopyContentService: Partial = {}; + const mockChangeDetectorRef: Partial = {}; + const mockCourseProgressService: Partial = {}; + const mockContentUtilsServiceService: Partial = {}; + const mockExternalUrlPreviewService: Partial = {}; + const mockCoursesService: Partial = {}; + const mockUserService: Partial = { + loggedIn: true, + slug: jest.fn().mockReturnValue('tn') as any, + userData$: of({ + userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: { + rootOrgId: 'sample-root-id' + }, + hashTagIds: ['id'] + } as any + }) as any, + setIsCustodianUser: jest.fn(), + setGuestUser: jest.fn(), + userid: 'sample-uid', + userProfile: { + rootOrg: { + rootOrgId: 'sample-root-id' + } + }, + appId: 'sample-id', + getServerTimeDiff: '', }; - const mockCopyContentService :Partial ={}; - const mockChangeDetectorRef :Partial ={}; - const mockCourseProgressService :Partial ={}; - const mockContentUtilsServiceService :Partial ={}; - const mockExternalUrlPreviewService :Partial ={}; - const mockCoursesService :Partial ={}; - const mockUserService :Partial ={}; - const mockTelemetryService :Partial ={ + const mockTelemetryService: Partial = { interact: jest.fn(), }; - const mockGroupService :Partial ={}; - const mockNavigationHelperService :Partial ={}; - const mockOrgDetailsService :Partial ={}; - const mockGeneraliseLabelService :Partial ={}; - const mockConnectionService :Partial ={}; - const mockCourseBatchService :Partial ={}; - const mockUtilService :Partial ={}; - const mockContentManagerService :Partial ={ + const mockGroupService: Partial = {}; + const mockNavigationHelperService: Partial = {}; + const mockOrgDetailsService: Partial = { + + }; + const mockGeneraliseLabelService: Partial = {}; + const mockConnectionService: Partial = { + monitor: jest.fn(() => of(true)) + }; + const mockCourseBatchService: Partial = { + getAllBatchDetails: jest.fn(), + }; + const mockUtilService: Partial = { + getPlayerDownloadStatus: jest.fn(), + //isDesktopApp:true + }; + const mockContentManagerService: Partial = { downloadContentId: '', - downloadContentData: {}, - failedContentName: '', - startDownload: jest.fn(), - deleteContent: jest.fn(), + downloadContentData: {}, + failedContentName: '', + startDownload: jest.fn(), + deleteContent: jest.fn(), exportContent: jest.fn(), + updateContent: jest.fn(), + }; + const mockFormService: Partial = { + getFormConfig: jest.fn(), }; - const mockFormService :Partial ={}; - const mockOfflineCardService :Partial ={ + const mockOfflineCardService: Partial = { isYoutubeContent: jest.fn(), }; - const mockDiscussionService :Partial ={}; - const mockDiscussionTelemetryService :Partial ={}; + const mockDiscussionService: Partial = {}; + const mockDiscussionTelemetryService: Partial = {}; - beforeAll(() => { - component = new CourseConsumptionHeaderComponent( - mockActivatedRoute as ActivatedRoute, + beforeAll(() => { + component = new CourseConsumptionHeaderComponent( + mockActivatedRoute as ActivatedRoute, mockCourseConsumptionService as CourseConsumptionService, mockResourceService as ResourceService, mockRouter as Router, @@ -127,27 +174,27 @@ describe('CourseConsumptionHeaderComponent', () => { mockOfflineCardService as OfflineCardService, mockDiscussionService as DiscussionService, mockDiscussionTelemetryService as DiscussionTelemetryService - ) - }); + ) + }); - beforeEach(() => { + beforeEach(() => { jest.mock('dayjs', () => jest.fn(date => ({ isBefore: jest.fn(() => true) // Mocking always true for simplicity }))); - jest.clearAllMocks(); - jest.resetAllMocks(); - }); - - it('should create a instance of component', () => { - expect(component).toBeTruthy(); - }); + jest.clearAllMocks(); + jest.resetAllMocks(); + }); - it('should return enrollmentEndDate on isValidEnrollmentEndDate',() =>{ + it('should create a instance of component', () => { + expect(component).toBeTruthy(); + }); + + it('should return enrollmentEndDate on isValidEnrollmentEndDate', () => { const result = component.isValidEnrollmentEndDate(true); expect(result).toEqual(true); }); - - describe('isEnrollmentAllowed',() => { + + describe('isEnrollmentAllowed', () => { it('should return true if enrollment end date is before today', () => { const enrollmentEndDate = '2024-03-26'; expect(component.isEnrollmentAllowed(enrollmentEndDate)).toBeTruthy(); @@ -157,55 +204,55 @@ describe('CourseConsumptionHeaderComponent', () => { const enrollmentEndDate = '2024-03-27'; expect(component.isEnrollmentAllowed(enrollmentEndDate)).toBeTruthy(); }); - + it('should return false if enrollment end date is after today', () => { const enrollmentEndDate = '2024-03-28'; expect(component.isEnrollmentAllowed(enrollmentEndDate)).toBeTruthy(); }); - }); - - it('should navigate to discussion forum with correct query parameters', () => { + }); + + it('should navigate to discussion forum with correct query parameters', () => { const routerData = { - forumIds: [123, 456], - userId: 'user123' + forumIds: [123, 456], + userId: 'user123' }; component.assignForumData(routerData); - + expect(mockRouter.navigate).toHaveBeenCalledWith(['/discussion-forum'], { - queryParams: { - categories: JSON.stringify({ result: routerData.forumIds }), - userId: routerData.userId - } + queryParams: { + categories: JSON.stringify({ result: routerData.forumIds }), + userId: routerData.userId + } }); }); - - describe('deleteCollection',() =>{ + + describe('deleteCollection', () => { it('should delete collection successfully', () => { - jest.spyOn(mockContentManagerService as any,'deleteContent').mockReturnValue(of({})); + jest.spyOn(mockContentManagerService as any, 'deleteContent').mockReturnValue(of({})); component.deleteCollection({ identifier: 'collection_id' }); - + expect(component.disableDelete).toBeTruthy(); expect(mockContentManagerService.deleteContent).toHaveBeenCalledWith({ request: { contents: ['collection_id'] } }); expect(mockToasterService.success).toHaveBeenCalledWith('Course deleted successfully'); }); it('should handle error while deleting collection', () => { - jest.spyOn(mockContentManagerService,'deleteContent').mockReturnValue(throwError({})); + jest.spyOn(mockContentManagerService, 'deleteContent').mockReturnValue(throwError({})); component.deleteCollection({ identifier: 'collection_id' }); - + expect(component.disableDelete).toBeFalsy(); // disableDelete should be set to false due to error expect(mockContentManagerService.deleteContent).toHaveBeenCalledWith({ request: { contents: ['collection_id'] } }); expect(mockToasterService.error).toHaveBeenCalledWith('Error deleting course'); }); - }); - - describe('downloadCollection',() =>{ + }); + + describe('downloadCollection', () => { it('should set download status and call startDownload method', () => { const collection = { - identifier: '123', - name: 'Sample Collection' + identifier: '123', + name: 'Sample Collection' }; - jest.spyOn(component.contentManagerService as any,'startDownload' as any).mockReturnValue(of({})); + jest.spyOn(component.contentManagerService as any, 'startDownload' as any).mockReturnValue(of({})); component.downloadCollection(collection); expect(component.showDownloadLoader).toBe(false); @@ -215,12 +262,12 @@ describe('CourseConsumptionHeaderComponent', () => { expect(component.contentManagerService.failedContentName).toBe('Sample Collection'); expect(component.contentManagerService.startDownload).toHaveBeenCalled(); }); - + it('should handle error if download fails due to low disk space', () => { - jest.spyOn(component.contentManagerService as any,'startDownload' as any).mockReturnValue(throwError({ error: { params: { err: 'LOW_DISK_SPACE' } } })); + jest.spyOn(component.contentManagerService as any, 'startDownload' as any).mockReturnValue(throwError({ error: { params: { err: 'LOW_DISK_SPACE' } } })); const collection = { - identifier: '123', - name: 'Sample Collection' + identifier: '123', + name: 'Sample Collection' }; component.downloadCollection(collection); expect(component.showDownloadLoader).toBe(false); @@ -228,47 +275,56 @@ describe('CourseConsumptionHeaderComponent', () => { }); it('should handle error if download fails due to other reasons', () => { - jest.spyOn(component.contentManagerService as any,'startDownload' as any).mockReturnValue(throwError({})); + jest.spyOn(component.contentManagerService as any, 'startDownload' as any).mockReturnValue(throwError({ error: { params: { err: 'SOME_OTHER_REASON' } } })); const collection = { - identifier: '123', - name: 'Sample Collection' + identifier: '123', + name: 'Sample Collection' }; component.downloadCollection(collection); expect(component.showDownloadLoader).toBe(false); expect(component.disableDelete).toBe(true); }); - }); - - it('should set values and call methods on isYoutubeContentPresent',() =>{ - const mockCollection = {data: 'mock-data'}; - jest.spyOn(component,'logTelemetry'); + }); + + it('should set values and call methods on isYoutubeContentPresent', () => { + const mockCollection = { data: 'mock-data' }; + jest.spyOn(component, 'logTelemetry'); component.showModal = false; - jest.spyOn(component.contentManagerService as any,'startDownload').mockReturnValue(of({})); - jest.spyOn(component,'downloadCollection') + jest.spyOn(component.contentManagerService as any, 'startDownload').mockReturnValue(of({})); + jest.spyOn(component, 'downloadCollection') component.isYoutubeContentPresent(mockCollection); - expect(component.logTelemetry).toHaveBeenCalledWith('is-youtube-in-collection'); + expect(component.logTelemetry).toHaveBeenCalledWith('is-youtube-in-collection'); expect(component['offlineCardService'].isYoutubeContent).toHaveBeenCalledWith(mockCollection); expect(component.downloadCollection).toHaveBeenCalledWith(mockCollection); }); - - describe('exportCollection',() => { + it('should call getFormData for the gloabal menubar', () => { + jest.spyOn(mockFormService, 'getFormConfig').mockReturnValue(of(MockResponseData.menubar.data.fields)); + component.getFormData(); + expect(component.batchEndCounter).toBe(4); + }); + it('should call getFormData for the gloabal menubar and no batchEndCounter', () => { + jest.spyOn(mockFormService, 'getFormConfig').mockReturnValue(of(MockResponseData.menubarNew.data.fields)); + component.getFormData(); + expect(component.batchEndCounter).toBe(null); + }); + describe('exportCollection', () => { it('should call exportContent method and show success message on successful export', () => { const collection = { - identifier: '123' + identifier: '123' }; - jest.spyOn(component.contentManagerService as any,'exportContent').mockReturnValue(of({})); + jest.spyOn(component.contentManagerService as any, 'exportContent').mockReturnValue(of({})); component.exportCollection(collection); expect(component.showExportLoader).toBe(false); expect(component.contentManagerService.exportContent).toHaveBeenCalledWith('123'); expect(component.toasterService.success).toHaveBeenCalledWith(component.resourceService.messages.smsg.m0059); expect(component.showExportLoader).toBe(false); }); - + it('should call exportContent method and show error message on failed export with responseCode other than NO_DEST_FOLDER', () => { - jest.spyOn(mockContentManagerService as any,'exportContent').mockReturnValue(throwError({ error: { responseCode: 'SOME_ERROR' } })); + jest.spyOn(mockContentManagerService as any, 'exportContent').mockReturnValue(throwError({ error: { responseCode: 'SOME_ERROR' } })); const collection = { - identifier: '123' + identifier: '123' }; component.exportCollection(collection); expect(component.showExportLoader).toBe(false); @@ -278,9 +334,9 @@ describe('CourseConsumptionHeaderComponent', () => { }); it('should call exportContent method and show no destination folder error message on failed export with responseCode NO_DEST_FOLDER', () => { - jest.spyOn(mockContentManagerService as any,'exportContent').mockReturnValue(throwError({ error: { responseCode: 'NO_DEST_FOLDER' } })); + jest.spyOn(mockContentManagerService as any, 'exportContent').mockReturnValue(throwError({ error: { responseCode: 'NO_DEST_FOLDER' } })); const collection = { - identifier: '123' + identifier: '123' }; component.exportCollection(collection); expect(component.showExportLoader).toBe(false); @@ -288,5 +344,125 @@ describe('CourseConsumptionHeaderComponent', () => { expect(component.toasterService.error).not.toHaveBeenCalled(); expect(component.showExportLoader).toBe(false); }); - }); -}); \ No newline at end of file + }); + describe('getAllBatchDetails', () => { + it('should call the getAllBatchDetails method with the course id', () => { + component.courseId = 'do_213878753577951232165'; + jest.spyOn(mockCourseBatchService as any, 'getAllBatchDetails').mockReturnValue((of(MockResponseData.batchList))); + component.getAllBatchDetails(); + expect(JSON.stringify(component.batchList)).toBe(JSON.stringify(MockResponseData.batchList.result.response.content)) + }); + + it('should call the getAllBatchDetails method with the course id and should throw error', () => { + component.courseId = 'do_213878753577951232165'; + jest.spyOn(mockCourseBatchService as any, 'getAllBatchDetails').mockReturnValue(throwError({ error: { params: { err: 'SOME_OTHER_REASON' } } })); + component.getAllBatchDetails(); + expect(component.showError).toBeTruthy(); + expect(mockToasterService.error).toBeCalled(); + expect(mockToasterService.error).toHaveBeenCalledWith('Could not fetch data, try again later'); + }); + }); + describe('updateCollection', () => { + it('should call the updateCollection method ', () => { + jest.spyOn(mockContentManagerService as any, 'updateContent').mockReturnValue(of({ data: 1234 })); + const collection = { + identifier: 'do_213878753577951232165' + } + component.updateCollection(collection); + expect(component.showUpdate).toBeFalsy(); + }); + it('should call the updateCollection method with error ', () => { + jest.spyOn(mockContentManagerService as any, 'updateContent').mockReturnValue(throwError({ error: { params: { err: '123' } } })); + const collection = { + identifier: 'do_213878753577951232165' + } + component.updateCollection(collection); + expect(component.showUpdate).toBeTruthy(); + }); + it('should call the updateCollection method with error and isConnected as false', () => { + component.isConnected = false; + jest.spyOn(mockContentManagerService as any, 'updateContent').mockReturnValue(throwError({ error: { params: { err: '123' } } })); + const collection = { + identifier: 'do_213878753577951232165', + name: 'ABCD' + } + component.updateCollection(collection); + expect(component.showUpdate).toBeTruthy(); + expect(mockToasterService.error).toHaveBeenCalledWith('You should be online to update the ABCD'); + }); + + + }); + describe('checkStatus and checkDownloadStatus', () => { + it('should call the checkStatus method ', () => { + jest.spyOn(component, 'checkDownloadStatus'); + component.courseHierarchy = MockResponseData.contentHeaderData.downloadList + const value = component.checkStatus({}); + expect(component.checkDownloadStatus).toBeCalled(); + }); + }); + describe('generateDataForDF', () => { + it('should call the generateDataForDF method isCreator is true ', () => { + component.generateDataForDF(); + component.courseHierarchy = MockResponseData.contentHeaderData.downloadList + expect(JSON.stringify(component.fetchForumIdReq)).toBe(JSON.stringify({ type: 'course', identifier: ['do_213878753577951232165'] })); + }); + it('should call the generateDataForDF method ', () => { + component.courseHierarchy = MockResponseData.contentHeaderData.contentList + component.enrolledCourse = true; + component.batchId = '1234567890123'; + component.generateDataForDF(); + expect(JSON.stringify(component.fetchForumIdReq)).toBe(JSON.stringify({ type: 'batch', identifier: ['1234567890123'] })); + }); + it('should call the generateDataForDF method with the mentor as true ', () => { + component.courseHierarchy = MockResponseData.contentHeaderData.contentList + jest.spyOn(mockPermissionService, 'checkRolesPermissions').mockReturnValue(true); + component.enrolledCourse = false; + component.generateDataForDF(); + expect(JSON.stringify(component.fetchForumIdReq)).toBe(JSON.stringify({ type: 'course', identifier: ['do_213878753577951232165'] })); + }); + }); + describe("ngOnDestroy", () => { + it('should destroy sub', () => { + component.unsubscribe = { + next: jest.fn(), + complete: jest.fn() + } as any; + component.ngOnDestroy(); + expect(component.unsubscribe.next).toHaveBeenCalled(); + expect(component.unsubscribe.complete).toHaveBeenCalled(); + }); + }); + describe("getCustodianOrgUser", () => { + it('should call the getCustodianOrgUser method', () => { + const custodianOrg = { + result: { response: { value: 'ROOT_ORG' } } + } + mockOrgDetailsService.getCustodianOrgDetails = jest.fn().mockReturnValue(of(custodianOrg)) as any; + component['getCustodianOrgUser'](); + expect(component.isCustodianOrgUser).toBeFalsy(); + }); + it('should call the getCustodianOrgUser method', () => { + const custodianOrg = { + result: { response: { value: 'sample-root-id' } } + } + mockOrgDetailsService.getCustodianOrgDetails = jest.fn().mockReturnValue(of(custodianOrg)) as any; + component['getCustodianOrgUser'](); + expect(component.isCustodianOrgUser).toBeTruthy(); + }); + }); + xdescribe("ngOnInit", () => { + it('should call the ngOnInit method ', () => { + const custodianOrg = { + result: { response: { value: 'sample-root-id' } } + } + mockConnectionService.monitor = jest.fn().mockReturnValue(of(true)) as any; + mockOrgDetailsService.getCustodianOrgDetails = jest.fn().mockReturnValue(of(custodianOrg)) as any; + mockConnectionService.monitor = jest.fn().mockReturnValue(of(true)) as any; + component.ngOnInit(); + + }); + }); +}); + + diff --git a/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.spec.data.ts b/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.spec.data.ts index fd4f847a95e..aa11219a200 100644 --- a/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.spec.data.ts +++ b/src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.spec.data.ts @@ -54,6 +54,39 @@ export const MockResponseData = { contentHeaderData: { downloadList: { + 'id': 'api.content.download.list', + 'ver': '1.0', + 'ts': '2020-01-09T09:36:46.405Z', + 'createdBy':'sample-uid', + 'params': { + 'resmsgid': '3580f558-7f76-4fc2-8b8a-4c568f321e27', + 'msgid': '7669e658-9248-459c-be11-c9f83efc9e1a', + 'status': 'successful', + 'err': null, + 'errmsg': null + }, + 'responseCode': 'OK', + 'result': { + 'response': { + 'contents': [ + { + 'id': '264c47da-2436-4652-9214-b89ad11778f0', + 'contentId': 'do_31276385539644620815652', + 'identifier': 'do_31276385539644620815652', + 'resourceId': 'do_31275241153060864018150', + 'mimeType': 'application/vnd.ekstep.content-collection', + 'name': '10 ವಿಜ್ಞಾನ ಭಾಗ 2', + 'status': 'completed', + 'createdOn': 1578562459472, + 'pkgVersion': 3, + 'contentType': 'TextBook', + 'addedUsing': 'download' + } + ] + } + } + }, + contentList:{ 'id': 'api.content.download.list', 'ver': '1.0', 'ts': '2020-01-09T09:36:46.405Z', @@ -633,5 +666,234 @@ export const MockResponseData = { } }, + }, + batchList: { + "result": { + "response": { + "count": 1, + "content": [ + { + + "endDate": null, + "description": "", + "oldCreatedDate": null, + "updatedDate": null, + "batchId": "0138805854730977280", + "cert_templates": { + "do_213878753577951232165": { + "identifier": "do_213878753577951232165", + "previewUrl": "https://obj.stage.sunbirded.org/sunbird-content-staging/content/do_213878753577951232165/artifact/do_213878753577951232165_1694183793991_certificate_2023-09-08_20_06.svg", + "criteria": { + "assessment": { + "score": { + ">=": 20 + } + }, + "enrollment": { + "status": 2 + } + }, + "name": "New Training certificate", + "issuer": { + "name": "Gujarat Council of Educational Research and Training", + "url": "https://gcert.gujarat.gov.in/gcert/" + }, + "url": "https://obj.stage.sunbirded.org/sunbird-content-staging/content/do_213878753577951232165/artifact/do_213878753577951232165_1694183793991_certificate_2023-09-08_20_06.svg", + + } + }, + "oldEndDate": null, + "oldEnrollmentEndDate": null, + "id": "0138805854730977280", + "courseId": "do_21387643435365171217", + "collectionId": "do_21387643435365171217", + "identifier": "0138805854730977280", + "createdFor": [ + "01269878797503692810" + ], + "oldUpdatedDate": null, + "tandc": null, + "createdDate": "2023-09-11T04:27:28.749Z", + "createdBy": "4cd4c690-eab6-4938-855a-447c7b1b8ea9", + "mentors": [], + "name": "Title Content", + "oldStartDate": null, + "enrollmentType": "open", + "enrollmentEndDate": null, + "startDate": "2023-09-11T00:00:00.000Z", + "status": 1 + } + ] + } + } + }, + menubar:{ + "data": { + "action": "list", + "fields": [ + { + "index": 6, + "search": { + "fields": [ + "name", + "appIcon", + "mimeType", + "cropcategory", + + ], + "facets": [ + "croptype", + "creator", + "organisation" + ], + "filters": { + "status": [ + "Live" + ], + "contentType": [ + "Course" + ], + "primaryCategory": [ + "Course", + "Course Assessment" + ] + } + }, + "contentType": "course", + "title": "frmelmnts.tab.courses", + "isLoginMandatory": false, + "isEnabled": true, + "anonumousUserRoute": { + "route": "/explore", + "queryParam": "course" + }, + "loggedInUserRoute": { + "route": "/resources", + "queryParam": "course" + }, + "theme": { + "className": "courses", + "baseColor": "", + "textColor": "", + "supportingColor": "", + "imageName": "courses-banner-img.svg" + }, + "batchEndCounter": 4, + "desc": "frmelmnts.tab.courses", + "isOnlineOnly": true, + "menuType": "Content", + "metaData": { + "defaultFilters": { + "farmingtype": [], + "board": [ + "agriculture_framework_20" + ], + "cropcategory": [ + "Class 10" + ] + }, + "cacheTimeout": 86400000, + "groupByKey": "croptype", + "filters": [ + "board", + "cropcategory", + "croptype", + "farmingtype", + "publisher", + "audience", + "channel", + "creator", + "organisation" + ], + + } + }, + ], + "templateName": "menuConfig" + } + }, + menubarNew:{ + "data": { + "action": "list", + "fields": [ + { + "index": 6, + "search": { + "fields": [ + "name", + "appIcon", + "mimeType", + "cropcategory", + + ], + "facets": [ + "croptype", + "creator", + "organisation" + ], + "filters": { + "status": [ + "Live" + ], + "contentType": [ + "Course" + ], + "primaryCategory": [ + "Course", + "Course Assessment" + ] + } + }, + "contentType": "course", + "title": "frmelmnts.tab.courses", + "isLoginMandatory": false, + "isEnabled": true, + "anonumousUserRoute": { + "route": "/explore", + "queryParam": "course" + }, + "loggedInUserRoute": { + "route": "/resources", + "queryParam": "course" + }, + "theme": { + "className": "courses", + "baseColor": "", + "textColor": "", + "supportingColor": "", + "imageName": "courses-banner-img.svg" + }, + "desc": "frmelmnts.tab.courses", + "isOnlineOnly": true, + "menuType": "Content", + "metaData": { + "defaultFilters": { + "farmingtype": [], + "board": [ + "agriculture_framework_20" + ], + "cropcategory": [ + "Class 10" + ] + }, + "cacheTimeout": 86400000, + "groupByKey": "croptype", + "filters": [ + "board", + "cropcategory", + "croptype", + "farmingtype", + "publisher", + "audience", + "channel", + "creator", + "organisation" + ], + + } + }, + ], + "templateName": "menuConfig" + } } }; diff --git a/src/app/client/src/app/modules/learn/services/assessment/assessment-score.service.spec.ts b/src/app/client/src/app/modules/learn/services/assessment/assessment-score.service.spec.ts new file mode 100644 index 00000000000..4835a739952 --- /dev/null +++ b/src/app/client/src/app/modules/learn/services/assessment/assessment-score.service.spec.ts @@ -0,0 +1,269 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ +import { CourseProgressService } from '../courseProgress/course-progress.service'; +import { _ } from 'lodash-es'; +import { AssessmentScoreService } from './assessment-score.service'; +import { of } from 'rxjs'; + +describe('AssessmentScoreService', () => { + let service: AssessmentScoreService; + + const courseProgressService: Partial = { + sendAssessment: jest.fn().mockReturnValue(of()) + }; + + beforeAll(() => { + service = new AssessmentScoreService( + courseProgressService as CourseProgressService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of service', () => { + expect(service).toBeTruthy(); + }); + + it('should process telemetry events if initialized', () => { + service['initialized'] = true; + const event = { + detail: { + telemetryData: { + eid: 'END', + object: { id: 'sample-content-id' } + } + } + }; + service.receiveTelemetryEvents(event) + expect(service['initialized']).toBeTruthy() + }) + + it('should not process telemetry events if not initialized', () => { + service['initialized'] = false; + const event = { + detail: { + telemetryData: { + eid: 'END', + object: { id: 'sample-content-id' } + } + } + }; + service.receiveTelemetryEvents(event) + expect(service['initialized']).toBeFalsy(); + }) + + describe('handleReviewButtonClickEvent', () => { + it('should clear assess events', () => { + service['_assessEvents'] = ['event1', 'event2', 'event3']; + service.handleReviewButtonClickEvent(); + expect(service['_assessEvents']).toEqual([]); + }); + }); + it('initilize the assessment service', () => { + let batchDetails = { + batchId: 1234 + } + let courseDetails = { + courseId: 1234 + } + let contentDetails = { + contentId: 1234 + } + service['_batchDetails'] = batchDetails + service['_courseDetails'] = courseDetails + service['_contentDetails'] = contentDetails + + service.init({ batchDetails, courseDetails, contentDetails }); + service['checkContentForAssessment'] + }) + + it('handles submit button clicked in course player', () => { + const clicked = true; + service['_startEvent'] = true; + service['initialized'] = true; + service['processAssessEvents'] = jest.fn(); + service.handleSubmitButtonClickEvent(clicked); + expect(service['processAssessEvents']).toHaveBeenCalled(); + + }) + + it('process the telemetry Events for eid as END', () => { + const event = { + detail: { + telemetryData: { + eid: 'END', + edata: "edata", + object: { id: 'sample-content-id' } + } + } + }; + const eventData = event.detail.telemetryData; + const eid = eventData.eid; + const edata = eventData.edata + + service['processTelemetryEvents'](event) + }) + + it('process the telemetry Events for eid as START', () => { + const event = { + detail: { + telemetryData: { + eid: 'START', + edata: "edata", + ets: 'ets', + actor: { + id: '123' + }, + object: { id: 'sample-content-id' } + } + } + }; + const eventData = event.detail.telemetryData; + const eid = eventData.eid; + const edata = eventData.edata + service['_startEvent'] = eventData + service['._assessmentTs'] = eventData.ets + service['_userId'] = eventData.actor.id + service['_assessEvents'] = [] + + service['processTelemetryEvents'](event) + }) + + it('process the telemetry Events for eid as INTERACT', () => { + const event = { + detail: { + telemetryData: { + eid: 'INTERACT', + edata: { + id: 'Review_button' + }, + ets: 'ets', + actor: { + id: '123' + }, + object: { id: 'sample-content-id' } + } + } + }; + service['_assessEvents'] = [] + + service['processTelemetryEvents'](event) + }) + + it('process the telemetry Events for eid as ASSESS', () => { + const event = { + detail: { + telemetryData: { + eid: 'ASSESS', + edata: { + id: 'Review_button' + }, + ets: 'ets', + actor: { + id: '123' + }, + object: { id: 'sample-content-id' } + } + } + }; + service['_assessEvents'] = [event] + service['processTelemetryEvents'](event) + }) + + it('checks if the course has assessment or not', () => { + let batchDetails = { + batchId: 1234, + courseId: 'c123' + } + let courseDetails = { + courseId: 1234 + } + let contentDetails = { + identifier: 1234 + } + service['_batchDetails'] = batchDetails + service['_courseDetails'] = courseDetails + service['_contentDetails'] = contentDetails + service['initialized'] = true + service['checkContentForAssessment']() + expect(service['_batchDetails']).toBeDefined(); + expect(service['_courseDetails']).toBeDefined(); + expect(service['_contentDetails']).toBeDefined(); + expect(service['initialized']).toBeTruthy(); + }) + describe('updateAssessmentScore', () => { + it('should call courseProgressService.sendAssessment with the correct arguments', () => { + const mockRequest = {}; + service['updateAssessmentScore'](mockRequest); + expect(courseProgressService.sendAssessment).toHaveBeenCalledWith({ requestBody: mockRequest, methodType: 'PATCH' }); + + }); + }); + + describe('prepareRequestObject', () => { + it('should construct the request object with the correct properties', () => { + const attemptId = 'attempt123'; + const request = service['prepareRequestObject'](attemptId); + expect(request).toEqual({ + request: { + userId: '123', + contents: [{ + contentId: 1234, + batchId: 1234, + status: 2, + courseId: 'c123', + lastAccessTime: expect.any(String) + }], + assessments: [{ + assessmentTs: 'ets', + batchId: 1234, + courseId: 'c123', + userId: "123", + attemptId: 'attempt123', + contentId: 1234, + events: [ + { + detail: { + telemetryData: { + actor: { + id: "123", + }, + edata: { + id: "Review_button", + }, + eid: "ASSESS", + ets: "ets", + object: { + "id": "sample-content-id", + }, + }, + }, + }, + { + actor: { + id: "123", + }, + edata: { + id: "Review_button", + }, + eid: "ASSESS", + ets: "ets", + object: { + id: "sample-content-id", + }, + }, + ] + }] + } + + }); + }) + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.data.ts b/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.data.ts new file mode 100644 index 00000000000..040706b01b8 --- /dev/null +++ b/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.data.ts @@ -0,0 +1,179 @@ +export const mockData = { + batchData: { + 'id': 'api.course.batch.read', + 'ver': 'v1', + 'ts': '2020-08-24 11:08:46:289+0000', + 'params': { + 'resmsgid': null, + 'msgid': '8dc7dc3d-82b9-311b-f610-8ccefded4460', + 'err': null, + 'status': 'success', + 'errmsg': null + }, + 'responseCode': 'OK', + 'result': { + 'response': { + 'identifier': '01307963745936998440', + 'createdFor': [ + '0124784842112040965' + ], + 'endDate': null, + 'description': '', + 'cert_templates': { + 'template_21': { + 'identifier': 'mock_cert_identifier', + 'data' : `{'artifactUrl': 'https://cert.svg',}`, + 'criteria': { + 'user': { + 'rootOrgId': '0124784842112040965' + }, + 'enrollment': { + 'status': 2 + }, + 'score': { + '>=': 40 + } + }, + 'name': 'Course completion certificate', + 'notifyTemplate': { + 'emailTemplateType': 'defaultCertTemp', + 'subject': 'Completion certificate', + 'stateImgUrl': 'https://s.png', + 'regards': 'Minister of Gujarat', + 'regardsperson': 'Chairperson' + }, + 'issuer': { + 'name': 'Research and Training', + 'url': 'https://gcert/' + }, + 'signatoryList': [ + { + 'image': 'https://signature-523237__340.jpg', + 'name': 'CEO', + 'id': 'CEO', + 'designation': 'CEO' + } + ] + } + }, + 'batchId': '01307963745936998440', + 'createdDate': '2020-08-05 13:37:52:083+0000', + 'createdBy': 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e', + 'mentors': [], + 'name': 'Sudip Mukherjee', + 'id': '01307963745936998440', + 'enrollmentType': 'open', + 'courseId': 'do_21307528604532736012398', + 'enrollmentEndDate': null, + 'startDate': '2020-08-05', + 'status': 1 + } + } + }, + batchDataNew: { + 'id': 'api.course.batch.read', + 'ver': 'v1', + 'ts': '2020-08-24 11:08:46:289+0000', + 'params': { + 'resmsgid': null, + 'msgid': '8dc7dc3d-82b9-311b-f610-8ccefded4460', + 'err': null, + 'status': 'success', + 'errmsg': null + }, + 'responseCode': 'OK', + 'result': { + 'response': { + 'identifier': '01307963745936998440', + 'createdFor': [ + '0124784842112040965' + ], + 'endDate': null, + 'description': '', + 'cert_templates': { + 'template_21': { + 'identifier': 'mock_cert_identifier', + 'data' : `{'artifactUrl': 'https://cert.svg',}`, + 'description':'certificate for completion', + 'criteria': { + 'user': { + 'rootOrgId': '0124784842112040965' + }, + 'enrollment': { + 'status': 2 + }, + 'score': { + '>=': 40 + } + }, + 'name': 'Course completion certificate', + 'notifyTemplate': { + 'emailTemplateType': 'defaultCertTemp', + 'subject': 'Completion certificate', + 'stateImgUrl': 'https://s.png', + 'regards': 'Minister of Gujarat', + 'regardsperson': 'Chairperson' + }, + 'issuer': { + 'name': 'Research and Training', + 'url': 'https://gcert/' + }, + 'signatoryList': [ + { + 'image': 'https://signature-523237__340.jpg', + 'name': 'CEO', + 'id': 'CEO', + 'designation': 'CEO' + } + ] + } + }, + 'batchId': '01307963745936998440', + 'createdDate': '2020-08-05 13:37:52:083+0000', + 'createdBy': 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e', + 'mentors': [], + 'name': 'Sudip Mukherjee', + 'id': '01307963745936998440', + 'enrollmentType': 'open', + 'courseId': 'do_21307528604532736012398', + 'enrollmentEndDate': null, + 'startDate': '2020-08-05', + 'status': 1 + } + } + }, + userProfile: { + 'maskedPhone': '******2507', + 'rootOrgName': 'CustROOTOrg10', + 'roleOrgMap':{ + 'CONTENT_CREATOR':'CustROOTOrg10' + }, + 'identifier': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'thumbnail': null, + 'profileVisibility': {}, + 'rootOrgId': '01285019302823526477', + 'prevUsedEmail': '', + 'firstName': 'dev-user13', + 'userName': 'devuser13', + 'userId': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'promptTnC': false, + 'emailVerified': true + }, + userProfileNew: { + 'maskedPhone': '******2507', + 'id': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'recoveryEmail': '', + 'roleOrgMap':{ + 'CONTENT_CREATOR':['01285019302823526477'] + }, + 'identifier': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'thumbnail': null, + 'profileVisibility': {}, + 'rootOrgId': '01285019302823526477', + 'userName': 'devuser13', + 'userId': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'promptTnC': false, + 'emailVerified': true + }, + +}; \ No newline at end of file diff --git a/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.ts b/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.ts new file mode 100644 index 00000000000..c3eeaad9bb9 --- /dev/null +++ b/src/app/client/src/app/modules/learn/services/course-batch/course-batch.service.spec.ts @@ -0,0 +1,242 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { Observable, observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Injectable, EventEmitter } from '@angular/core'; +import { ConfigService, ServerResponse } from '@sunbird/shared'; +import { SearchParam, LearnerService, UserService, ContentService, SearchService } from '@sunbird/core'; +import { _ } from 'lodash-es'; +import { CourseBatchService } from './course-batch.service'; +import { mockData } from './course-batch.service.spec.data'; +import { isNullOrUndefined } from '@swimlane/ngx-datatable'; +describe('CourseBatchService', () => { + let component: CourseBatchService; + + const searchService: Partial = {}; + const userService: Partial = { + loggedIn: true, + slug: jest.fn().mockReturnValue('tn') as any, + userData$: of({userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: {}, + roleOrgMap:{ + CONTENT_CREATOR:'CONTENT_CREATOR' + }, + hashTagIds: ['id'] + } as any}) as any, + setIsCustodianUser: jest.fn(), + setGuestUser: jest.fn(), + userid: 'sample-uid', + appId: 'sample-id', + getServerTimeDiff: '', + }; + const content: Partial = {}; + const configService: Partial = { + urlConFig: { + URLS: { + BATCH: { + GET_BATCHS: 'course/v1/batch/list', + GET_DETAILS:'course/v1/batch/read', + REMOVE_USERS:'course/v1/batch/user/remove', + ADD_USERS:'course/v1/batch/user/add', + UPDATE: 'course/v1/batch/update', + CREATE: 'course/v1/batch/create', + GET_PARTICIPANT_LIST: 'course/v1/batch/participants/list' + }, + COURSE:{ + UNENROLL_USER_COURSE:'course/v1/unenrol' + }, + ADMIN:{ + USER_SEARCH:'user/v3/search' + } + } + } + }; + const learnerService: Partial = { + post: jest.fn(), + get:jest.fn(), + patch:jest.fn() + }; + + beforeAll(() => { + component = new CourseBatchService( + searchService as SearchService, + userService as UserService, + content as ContentService, + configService as ConfigService, + learnerService as LearnerService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of component', () => { + expect(component).toBeTruthy(); + }); + it('should create a instance of component and call the getBatchDetails method', () => { + jest.spyOn(component.learnerService, 'get').mockReturnValue(of(mockData.batchData)); + const batchId = '123456'; + component.getBatchDetails(batchId); + expect(component.learnerService.get).toBeCalled(); + }); + it('should create a instance of component and call the removeUsersFromBatch method', () => { + const batchId = '123456'; + const request = {user:'remove'} + component.removeUsersFromBatch(batchId,request); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the addUsersToBatch method', () => { + const batchId = '123456'; + const request = {user:'add'} + component.addUsersToBatch(batchId,request); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the updateBatch method', () => { + const request = {update:'true'} + component.updateBatch(request); + expect(component.learnerService.patch).toBeCalled(); + }); + it('should create a instance of component and call the createBatch method', () => { + const request = {update:'true'} + component.createBatch(request); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the unenrollFromCourse method', () => { + const data = {unenrollFromCourse:'true'} + component.unenrollFromCourse(data); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the enrollToCourse method', () => { + const data = {enrollToCourse:'true'} + component.enrollToCourse(data); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the getParticipantList method', () => { + jest.spyOn(component.learnerService, 'post').mockReturnValue(of(mockData.batchData)); + const data = {participentList:'get'} + component.getParticipantList(data).subscribe(obj=>{}); + expect(component.learnerService.post).toBeCalled(); + }); + it('should create a instance of component and call the getUpdateBatchDetails method', () => { + component['_updateBatchDetails'] = mockData.batchDataNew.result.response + const value = component.getUpdateBatchDetails(mockData.batchDataNew.result.response.batchId).subscribe(obj=>{ + expect(JSON.stringify(obj)).toEqual(JSON.stringify(of(mockData.batchDataNew.result.response))); + }); + + }); + it('should create a instance of component and call the getUpdateBatchDetails method without _updateBatchDetails', () => { + component['_updateBatchDetails'] = null; + jest.spyOn(component,'getBatchDetails').mockReturnValue(of(mockData.batchData)); + const value = component.getUpdateBatchDetails(mockData.batchDataNew.result.response.batchId).subscribe(obj=>{}); + expect(component.getBatchDetails).toBeCalledWith(mockData.batchDataNew.result.response.batchId); + }); + it('should create a instance of component and call the getEnrollToBatchDetails method', () => { + component['_enrollToBatchDetails'] = mockData.batchDataNew.result.response + const value = component.getEnrollToBatchDetails(mockData.batchDataNew.result.response.batchId).subscribe(obj=>{ + expect(JSON.stringify(obj)).toEqual(JSON.stringify(of(mockData.batchDataNew.result.response))); + }); + + }); + it('should create a instance of component and call the getEnrollToBatchDetails method without _updateBatchDetails', () => { + component['_enrollToBatchDetails'] = null; + jest.spyOn(component,'getBatchDetails').mockReturnValue(of(mockData.batchData)); + const value = component.getEnrollToBatchDetails(mockData.batchDataNew.result.response.batchId).subscribe(obj=>{}); + expect(component.getBatchDetails).toBeCalledWith(mockData.batchDataNew.result.response.batchId); + }); + it('should create a instance of component and call the setUpdateBatchDetails method', () => { + component['_updateBatchDetails'] = null; + const value = component.setUpdateBatchDetails(mockData.batchDataNew); + expect(component['_updateBatchDetails']).toEqual(mockData.batchDataNew); + }); + it('should create a instance of component and call the setEnrollToBatchDetails method', () => { + component['_enrollToBatchDetails'] = null; + const value = component.setEnrollToBatchDetails(mockData.batchDataNew); + expect(component['_enrollToBatchDetails']).toEqual(mockData.batchDataNew); + }); + it('should create a instance of component and call the getUserList method', () => { + component['defaultUserList'] = [{user1:'abcd'},{user2:'mnop'}] + const value = component.getUserList({}); + expect(JSON.stringify(value)).toEqual(JSON.stringify(of([{user1:'abcd'},{user2:'mnop'}]))); + }); + it('should create a instance of component and call the getUserList method with requestBody having value', () => { + component['defaultUserList'] = null; + jest.spyOn(component.learnerService,'post').mockReturnValue(of(mockData.userProfile as any)as any) as any; + component.userService = { + userProfile: mockData.userProfile as any + } as any; + const requestBody = { + filters: { 'status': '1' }, + query:'newUser', + limit:100 + }; + const value = component.getUserList(requestBody).subscribe(data=>{ + expect(data).toEqual(mockData.userProfile); + }); + + }); + it('should create a instance of component and call the getUserList method with requestBody having no value', () => { + component['defaultUserList'] = null; + jest.spyOn(component.learnerService,'post').mockReturnValue(of(mockData.userProfileNew as any)as any) as any; + component.userService = { + rootOrgId:'01285019302823526477', + userProfile: mockData.userProfileNew as any + } as any; + const value = component.getUserList().subscribe(data=>{ + expect(data).toEqual(mockData.userProfileNew); + }); + + }); + + + describe('getAllBatchDetails', () => { + it('should create a instance and call the getAllBatchDetails method', () => { + jest.spyOn(learnerService, 'post'); + const searchParams: any = { + filters: { + courseId: 'do_213878753577951232165', + status: ['1'] + } + } + const value = component.getAllBatchDetails(searchParams); + expect(learnerService.post).toBeCalled(); + }); + + }); + describe('getcertificateDescription', () => { + it('should create a instance and call the getcertificateDescription method', () => { + const value = component.getcertificateDescription(mockData.batchData.result.response); + const obj = { isCertificate: true, description: '' } + expect(JSON.stringify(value)).toEqual(JSON.stringify(obj)) + }); + it('should create a instance and call the getcertificateDescription method with description', () => { + const value = component.getcertificateDescription(mockData.batchDataNew.result.response); + const obj = { isCertificate: true, description: 'certificate for completion' } + expect(JSON.stringify(value)).toEqual(JSON.stringify(obj)) + }); + }); + describe('getEnrolledBatchDetails', () => { + it('should create a instance and call the getEnrolledBatchDetails method', () => { + jest.spyOn(learnerService,'get').mockReturnValue(of(mockData.batchData)); + jest.spyOn(component,'getBatchDetails').mockReturnValue(of(mockData.batchData)); + const value = component.getEnrolledBatchDetails(mockData.batchData.result.response.batchId).subscribe(data =>{ + }); + expect(component.getBatchDetails).toBeCalled(); + }); + it('should create a instance and call the getEnrolledBatchDetails method with _enrolledBatchDetails', () => { + component['_enrolledBatchDetails'] = mockData.batchDataNew.result.response + const value = component.getEnrolledBatchDetails(mockData.batchDataNew.result.response.batchId).subscribe(data =>{ + expect(JSON.stringify(data)).toEqual(JSON.stringify(of(mockData.batchDataNew.result.response))) + }); + + }); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.spec.ts b/src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.spec.ts new file mode 100644 index 00000000000..e8c56c84a82 --- /dev/null +++ b/src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.spec.ts @@ -0,0 +1,435 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ +import { PlayerService, PermissionService, UserService, GeneraliseLabelService } from '@sunbird/core'; +import { ResourceService, ToasterService } from '@sunbird/shared'; +import { CourseProgressService } from '../courseProgress/course-progress.service'; +import { _ } from 'lodash-es'; +import { Router } from '@angular/router'; +import { NavigationHelperService } from '@sunbird/shared'; +import dayjs from 'dayjs'; +import { CourseConsumptionService } from './course-consumption.service'; +import { of } from 'rxjs'; + +describe('CourseConsumptionService', () => { + let service: CourseConsumptionService; + + const playerService: Partial = { + getConfigByContent: jest.fn(), + getCollectionHierarchy: jest.fn().mockReturnValue(of({ + result: { + content: { + leafNodesCount: 2, + children: [] + } + } + })) + }; + const courseProgressService: Partial = { + getContentState: jest.fn(), + updateContentsState: jest.fn(), + }; + const toasterService: Partial = { + error: jest.fn() + }; + const resourceService: Partial = {}; + const router: Partial = {}; + const navigationHelperService: Partial = { + getPreviousUrl: jest.fn().mockReturnValue({ url: '/some/previous/url' }) + }; + const permissionService: Partial = { + checkRolesPermissions: jest.fn() + }; + const userService: Partial = { + userid: 'user1' + }; + const generaliselabelService: Partial = { + messages: { + emsg: { + m0003: "Error message here", + + } + }, + }; + beforeAll(() => { + service = new CourseConsumptionService( + playerService as PlayerService, + courseProgressService as CourseProgressService, + toasterService as ToasterService, + resourceService as ResourceService, + router as Router, + navigationHelperService as NavigationHelperService, + permissionService as PermissionService, + userService as UserService, + generaliselabelService as GeneraliseLabelService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of component', () => { + expect(service).toBeTruthy(); + }); + + it('should return course hierarchy from cache if available', () => { + const courseId = 'some-course-id'; + service.courseHierarchy = { identifier: courseId /* mock the rest of the structure as needed */ }; + const result$ = service.getCourseHierarchy(courseId); + result$.subscribe((result) => { + expect(result).toEqual(service.courseHierarchy); + }); + expect(playerService.getCollectionHierarchy).not.toHaveBeenCalled(); + }); + + it('should call getConfigByContent with provided contentId and options', () => { + const contentId = '123456'; + const options = { id: 123 }; + service.getConfigByContent(contentId, options); + expect(playerService.getConfigByContent).toHaveBeenCalledWith(contentId, options); + }); + + it('should call getContentState with the provided request', () => { + const req = { status: 'live' }; + service.getContentState(req); + expect(courseProgressService.getContentState).toHaveBeenCalledWith(req); + }); + + it('should call updateContentsState with the provided request', () => { + const req = { status: 'live' }; + service.updateContentsState(req); + expect(courseProgressService.updateContentsState).toHaveBeenCalledWith(req); + }); + + + it('should parse the course hierarchy and return content identifiers of leaf nodes with specific MIME types', () => { + const courseHierarchy = { + result: { + content: { + leafNodesCount: 2, + children: [] + } + } + }; + const mimeTypeCount = 2 + const contentIds = service.parseChildren(courseHierarchy); + expect(contentIds).toEqual([undefined]); + expect(mimeTypeCount).toEqual(2); + }); + + describe('getRollUp', () => { + it('should return an empty object if rollup is empty', () => { + // Arrange + const rollup = []; + // Act + const result = service.getRollUp(rollup); + // Assert + expect(result).toEqual({}); + }); + + it('should return an object with keys "l1", "l2", etc., corresponding to elements of rollup array', () => { + // Arrange + const rollup = ['value1', 'value2', 'value3']; + // Act + const result = service.getRollUp(rollup); + // Assert + expect(result).toEqual({ l1: 'value1', l2: 'value2', l3: 'value3' }); + }); + + it('should handle an undefined rollup', () => { + // Arrange + const rollup = undefined + // Act + const result = service.getRollUp(rollup); + // Assert + expect(result).toEqual({}); + }); + }) + + describe('getContentRollUp', () => { + const tree = { + identifier: 'root', + children: [ + { + identifier: 'child1', + children: [ + { + identifier: 'grandchild1', + children: [] + } + ] + }, + { + identifier: 'child2', + children: [ + { + identifier: 'grandchild2', + children: [ + { + identifier: 'greatGrandchild', + children: [] + } + ] + } + ] + } + ] + }; + + it('should return the rollup for the specified identifier', () => { + const identifier = 'greatGrandchild'; + const result = service.getContentRollUp(tree, identifier); + expect(result).toEqual(['root', 'child2', 'grandchild2', 'greatGrandchild']); + }); + + it('should return an empty array if the identifier is not found', () => { + const identifier = 'nonExistentChild'; + const result = service.getContentRollUp(tree, identifier); + expect(result).toEqual([]); + }); + + it('should return an empty array for an empty tree', () => { + const emptyTree = {}; + const identifier = 'someIdentifier'; + const result = service.getContentRollUp(emptyTree, identifier); + expect(result).toEqual([]); + }); + }); + + describe('Permissions', () => { + const permissionService = { + checkRolesPermissions: jest.fn(), + }; + const contentCreatorHierarchy = { + createdBy: 'user123', + }; + const courseMentorHierarchy = {}; + const nonTrackableCollection = { + trackable: { + enabled: 'no', + }, + }; + const trackableCollectionWithCertificates = { + createdBy: 'user123', + contentType: 'course', + credentials: { + enabled: 'yes', + }, + }; + describe('canCreateBatch', () => { + it('should return true if user is a content creator and created the course', () => { + expect(service.canCreateBatch(contentCreatorHierarchy)).toBe(false); + }); + it('should return false if user is not a content creator', () => { + permissionService.checkRolesPermissions.mockReturnValueOnce(false); + expect(service.canCreateBatch(courseMentorHierarchy)).toBe(false); + }); + + it('should return false if user did not create the course', () => { + const hierarchy = { createdBy: 'otherUser' }; + expect(service.canCreateBatch(hierarchy)).toBe(false); + }); + }); + + describe('canViewDashboard', () => { + it('should return true if user can create a batch or is a course mentor', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(true); + expect(service.canViewDashboard({})).toBe(true); + }); + + it('should return true if user is a course mentor', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(false); + permissionService.checkRolesPermissions.mockReturnValueOnce(true); + expect(service.canViewDashboard({})).toBe(undefined); + }); + + it('should return false if user cannot create a batch and is not a course mentor', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(false); + permissionService.checkRolesPermissions.mockReturnValueOnce(false); + expect(service.canViewDashboard({})).toBe(undefined); + }); + }); + + describe('canAddCertificates', () => { + it('should return true if user can create a batch, course is trackable, and certificates are enabled', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(true); + service.isTrackableCollection = jest.fn().mockReturnValueOnce(true); + expect(service.canAddCertificates(trackableCollectionWithCertificates)).toBe(true); + }); + + it('should return false if user cannot create a batch', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(false); + expect(service.canAddCertificates(trackableCollectionWithCertificates)).toBe(false); + }); + + it('should return false if course is not trackable', () => { + service.isTrackableCollection = jest.fn().mockReturnValueOnce(false); + expect(service.canAddCertificates(trackableCollectionWithCertificates)).toBe(undefined); + }); + + it('should return false if certificates are not enabled', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(true); + service.isTrackableCollection = jest.fn().mockReturnValueOnce(true); + const collectionWithoutCertificates = { ...trackableCollectionWithCertificates, credentials: { enabled: 'no' } }; + expect(service.canAddCertificates(collectionWithoutCertificates)).toBe(false); + }); + + it('should return false if course is not a trackable collection', () => { + service.canCreateBatch = jest.fn().mockReturnValueOnce(true); + service.isTrackableCollection = jest.fn().mockReturnValueOnce(false); + expect(service.canAddCertificates(nonTrackableCollection)).toBe(false); + }); + }); + + + }); + describe('CoursePagePreviousUrl', () => { + it('should return the correct previous URL', () => { + const previousUrl = 'https://example.com/previous'; + service.coursePagePreviousUrl = previousUrl; + expect(service.getCoursePagePreviousUrl).toEqual(previousUrl); + }); + }); + + describe('emitBatchList', () => { + it('should emit visibility based on mentor batches', () => { + const batches = [ + { id: 1, createdBy: 'user1', mentors: ['user2', 'user3'] }, + { id: 2, createdBy: 'user2', mentors: ['user1'] }, + { id: 3, createdBy: 'user3', mentors: ['user1', 'user2'] } + ]; + service.userCreatedAnyBatch.emit = jest.fn(); + service.emitBatchList(batches); + expect(service.userCreatedAnyBatch.emit).toHaveBeenCalledWith(true); + }); + + }); + + it('should set coursePagePreviousUrl if navigationHelperService returns valid url', () => { + service.setCoursePagePreviousUrl(); + expect(service.coursePagePreviousUrl).toEqual("https://example.com/previous"); + }); + + it('should not set coursePagePreviousUrl if navigationHelperService returns invalid url', () => { + navigationHelperService.getPreviousUrl = jest.fn().mockReturnValue({ url: '/enroll/batch/123' }); + service.setCoursePagePreviousUrl(); + expect(service.coursePagePreviousUrl).toEqual("https://example.com/previous"); + }); + + + describe('getAllOpenBatches', () => { + it('should emit false if there are no open batches and display an error message', () => { + jest.spyOn(service.enableCourseEntrollment, 'emit'); + service.getAllOpenBatches({ content: [] }); + expect(service.enableCourseEntrollment.emit).toHaveBeenCalledWith(false); + expect(toasterService.error).toHaveBeenCalledWith('Error message here'); + }); + + it('should emit true if there is at least one open batch', () => { + const currentDate = dayjs().format('YYYY-MM-DD'); + const futureDate = dayjs().add(1, 'day').format('YYYY-MM-DD'); + jest.spyOn(service.enableCourseEntrollment, 'emit'); + service.getAllOpenBatches({ content: [{ enrollmentType: 'open', enrollmentEndDate: currentDate }] }); + expect(service.enableCourseEntrollment.emit).toHaveBeenCalledWith(true); + service.getAllOpenBatches({ content: [{ enrollmentType: 'open', enrollmentEndDate: futureDate }] }); + expect(service.enableCourseEntrollment.emit).toHaveBeenCalledTimes(2); + }); + + it('should emit true if there is an open batch with no end date', () => { + jest.spyOn(service.enableCourseEntrollment, 'emit'); + service.getAllOpenBatches({ content: [{ enrollmentType: 'open' }] }); + expect(service.enableCourseEntrollment.emit).toHaveBeenCalledWith(true); + }); + + it('should emit true if there are multiple open batches with at least one having no end date', () => { + const currentDate = dayjs().format('YYYY-MM-DD'); + const futureDate = dayjs().add(1, 'day').format('YYYY-MM-DD'); + jest.spyOn(service.enableCourseEntrollment, 'emit'); + service.getAllOpenBatches({ + content: [ + { enrollmentType: 'open' }, + { enrollmentType: 'open', enrollmentEndDate: futureDate } + ] + }); + expect(service.enableCourseEntrollment.emit).toHaveBeenCalledWith(true); + }); + }) + + it('should return previous and next modules correctly', () => { + const courseHierarchy = { + children: [ + { identifier: 'module1' }, + { identifier: 'module2' }, + { identifier: 'module3' } + ] + }; + const collectionId = 'module2'; + const result = service.setPreviousAndNextModule(courseHierarchy, collectionId); + expect(result).toEqual({ + prev: { identifier: 'module1' }, + next: { identifier: 'module3' } + }); + }); + + it('should handle when there are no children in courseHierarchy', () => { + const courseHierarchy = {}; + const collectionId = 'module1'; + const result = service.setPreviousAndNextModule(courseHierarchy, collectionId); + expect(result).toEqual(undefined); + }); + + it('should handle when collectionId is not found in children', () => { + const courseHierarchy = { + children: [ + { identifier: 'module1' }, + { identifier: 'module2' }, + { identifier: 'module3' } + ] + }; + const collectionId = 'moduleX'; + const result = service.setPreviousAndNextModule(courseHierarchy, collectionId); + expect(result).toEqual({ + prev: undefined, + next: { + identifier: 'module1', + } + + }); + }); + + it('should flatten a nested array of objects into a single-dimensional array', () => { + const contents = [ + { id: 1, children: [{ id: 2 }, { id: 3 }] }, + { id: 4, children: [{ id: 5 }, { id: 6, children: [{ id: 7 }, { id: 8 }] }] } + ]; + const flattened = service.flattenDeep(contents); + const expected = [ + { id: 1, children: [{ id: 2 }, { id: 3 }] }, + { id: 2 }, + { id: 3 }, + { id: 4, children: [{ id: 5 }, { id: 6, children: [{ id: 7 }, { id: 8 }] }] }, + { id: 5 }, + { id: 6, children: [{ id: 7 }, { id: 8 }] }, + { id: 7 }, + { id: 8 } + ]; + expect(flattened).toEqual(expected); + }); + + it('should return an empty array if contents is undefined', () => { + const contents = undefined; + const flattened = service.flattenDeep(contents); + expect(flattened).toEqual(undefined); + }); + + it('should return an empty array if contents is an empty array', () => { + const contents = []; + const flattened = service.flattenDeep(contents); + expect(flattened).toEqual([]); + }); +}); diff --git a/src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.scss b/src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.scss index be4bb7d9b93..e63083fde09 100644 --- a/src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.scss +++ b/src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.scss @@ -3,4 +3,8 @@ .sb-merged-account-body-para.sb-color-success{ color:var(--success-color); +} + +.sb-certificatePage-logo { + width: calculateRem(150px); } \ No newline at end of file diff --git a/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.spec.ts b/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.spec.ts index 804754de5ad..4fd6fae8193 100644 --- a/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.spec.ts +++ b/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.spec.ts @@ -150,6 +150,7 @@ describe('ObservationListingComponent', () => { }); it('should call playcontent component', () => { + component.categoryKeys = [{code:'solution'}, {code:'solution_type'}, {code:'program'}, {code:'entityType'},{code:'programName'}] const mockEvent = { data: { programId: 'mock-program-id', @@ -167,7 +168,7 @@ describe('ObservationListingComponent', () => { solutionId: data.solutionId, observationId: data._id, solutionName: data.name, - programName: data.subject[0], + programName: data[component.categoryKeys[4].code], entityType: data.entityType }) expect(component.router.navigate).toHaveBeenCalledWith(['observation/details'], { diff --git a/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.ts b/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.ts index efc4fde7d70..81d6be52c20 100644 --- a/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.ts +++ b/src/app/client/src/app/modules/observation/components/observation-listing/observation-listing.component.ts @@ -338,7 +338,7 @@ export class ObservationListingComponent solutionId: data.solutionId, observationId: data._id, solutionName: data.name, - programName: data.subject[0], + programName: data[this.categoryKeys[4].code], entityType:data.entityType }; this.router.navigate(['observation/details'], { diff --git a/src/app/client/src/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts b/src/app/client/src/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts index fcc845d3063..10c15ecfa65 100644 --- a/src/app/client/src/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts +++ b/src/app/client/src/app/modules/player-helper/components/contentplayer-page/contentplayer-page.component.ts @@ -118,7 +118,7 @@ export class ContentPlayerPageComponent implements OnInit, OnDestroy, OnChanges this.playerService.getContent(this.contentId, params) .pipe(takeUntil(this.unsubscribe$)) .subscribe(response => { - this.contentDetails = _.get(response, 'result.content') || _.get(response, 'result.questionset'); + this.contentDetails = _.get(response, 'result.content') || _.get(response, 'result.questionset') || _.get(response, 'result.questionSet'); const status = !_.has(this.contentDetails, 'desktopAppMetadata.isAvailable') ? false : !_.get(this.contentDetails, 'desktopAppMetadata.isAvailable'); this.isContentDeleted.next({value: status}); diff --git a/src/app/client/src/app/modules/player-helper/components/player/player.component.scss b/src/app/client/src/app/modules/player-helper/components/player/player.component.scss index 0e2ff2c9cf2..95f8c9e434a 100644 --- a/src/app/client/src/app/modules/player-helper/components/player/player.component.scss +++ b/src/app/client/src/app/modules/player-helper/components/player/player.component.scss @@ -132,3 +132,6 @@ overflow: hidden; position: relative; } +.contentViewerIframeShadow.player-fullscreen .custom-web-player{ + height: calc(100vh - 4rem); +} \ No newline at end of file diff --git a/src/app/client/src/app/modules/player-helper/components/player/player.component.spec.ts b/src/app/client/src/app/modules/player-helper/components/player/player.component.spec.ts index 444dd42be52..1664407d04c 100644 --- a/src/app/client/src/app/modules/player-helper/components/player/player.component.spec.ts +++ b/src/app/client/src/app/modules/player-helper/components/player/player.component.spec.ts @@ -1008,7 +1008,7 @@ describe('PlayerComponent', () => { jest.useFakeTimers(); const spy = jest.spyOn(component, 'videoPlayerConfig'); component.ngAfterViewInit(); - jest.advanceTimersByTime(200); + jest.advanceTimersByTime(500); expect(spy).toHaveBeenCalled(); }); @@ -1017,7 +1017,7 @@ describe('PlayerComponent', () => { component.playerType = "audio-player"; jest.useFakeTimers(); component.ngAfterViewInit(); - jest.advanceTimersByTime(200); + jest.advanceTimersByTime(500); expect(playerService.getQuestionSetRead).not.toHaveBeenCalled(); }); @@ -1038,7 +1038,7 @@ describe('PlayerComponent', () => { jest.useFakeTimers(); const spy = jest.spyOn(component, 'pdfPlayerConfig'); component.ngAfterViewInit(); - jest.advanceTimersByTime(200); + jest.advanceTimersByTime(500); expect(spy).toHaveBeenCalled(); }); it('should call epubPlayerConfig after 200ms if playerType is "epub-player"', () => { @@ -1058,7 +1058,7 @@ describe('PlayerComponent', () => { jest.useFakeTimers(); const spy = jest.spyOn(component, 'epubPlayerConfig'); component.ngAfterViewInit(); - jest.advanceTimersByTime(200); + jest.advanceTimersByTime(500); expect(spy).toHaveBeenCalled(); }); @@ -1079,7 +1079,7 @@ describe('PlayerComponent', () => { jest.useFakeTimers(); const spy = jest.spyOn(component, 'qumlPlayerConfig'); component.ngAfterViewInit(); - jest.advanceTimersByTime(200); + jest.advanceTimersByTime(500); expect(spy).toHaveBeenCalled(); }); it('should not call any player config method for unknown playerType', () => { diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html index ea8533a6cca..9b15f8ae670 100644 --- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html +++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html @@ -56,26 +56,25 @@

{{reso -
-
-
+ +
+
- - - {{resourceService?.frmelmnts?.lbl?.programLbl}} + + - - {{program.name}} - + [placeholder]="resourceService?.frmelmnts?.lbl?.program" (selectionChange)="programSelection($event)"> + {{program.name}} - +
- - + {{resourceService?.frmelmnts?.lbl?.solutionLbl}} + + [placeholder]="resourceService?.frmelmnts?.lbl?.solution" (selectionChange)="selectSolution($event)"> {{solution.name}} @@ -83,8 +82,8 @@

{{reso

- - + {{ resourceService?.frmelmnts?.lbl?.dashboarddistrictLbl }} + @@ -94,8 +93,8 @@

{{reso

- - + {{ resourceService?.frmelmnts?.lbl?.block }} + @@ -105,8 +104,8 @@

{{reso

- - + {{ resourceService?.frmelmnts?.lbl?.dashboardOrgLbl }} + @@ -116,22 +115,22 @@

{{reso

-
- - +
+ {{resourceService?.frmelmnts?.lbl?.startdate | titlecase }} + - + *{{this.resourceService?.frmelmnts?.msg?.invalidDateMsg | interpolate:'{type}': (resourceService?.frmelmnts?.lbl?.startdate | lowercase)}}
-
- - +
+ {{resourceService?.frmelmnts?.lbl?.enddate | titlecase }} + - + @@ -143,12 +142,10 @@

{{reso - -

-
- - +
+ + {{option}} @@ -169,7 +166,7 @@

{{reso
*{{errorMessage}}
-
+
@@ -178,10 +175,10 @@

{{reso
- + - + {{report?.name}} @@ -215,7 +212,7 @@

{{reso
*{{errorMessage}}
-
@@ -266,143 +263,119 @@

{{reso - + -
-
-
-
- - {{resourceService?.frmelmnts?.lbl?.confirmReportRequest}} -
-
-
-
-
- -
-
-

- {{resourceService?.frmelmnts?.lbl?.pswdRule}} -

-
-
-
- - -
-
+ +
+
+ {{resourceService?.frmelmnts?.lbl?.confirmReportRequest}} +
+ +
+ +
+
+ + + +

+ {{resourceService?.frmelmnts?.lbl?.pswdRule}} +

+
+
+ +
- -
-
-
-
+
- {{resourceService?.frmelmnts?.lbl?.datasetRequestSuccess}} -
-
- -
-
+
+ + {{resourceService?.frmelmnts?.lbl?.datasetRequestSuccess}} +
+
+
+
- -
-
-
-
-
- {{ resourceService?.frmelmnts?.lbl?.confirmReportRequest }} -
-
-
- - -
+
+
+
+ {{ resourceService?.frmelmnts?.lbl?.confirmReportRequest }}
+
+ + +
- + -
-
-
-
-
-
- info -
-
{{resourceService?.frmelmnts?.lbl?.modalNote}}
-
- highlight_off -
-
- - -
- -
- - - - {{program.name}} - - - -
- -
-
- -
+
+
+
+
+ info +
+
{{resourceService?.frmelmnts?.lbl?.modalNote}}
+
+ highlight_off +
+
+
+
+ {{resourceService?.frmelmnts?.lbl?.programLbl }} + + + + {{program.name}} + + +
+
+ +
- +
-
-
-
-
-
- -
-
-
+
+
+
diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss index 98499654903..a3874a8616b 100644 --- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss +++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.scss @@ -1,40 +1,13 @@ @use "@project-sunbird/sb-styles/assets/mixins/mixins" as *; -.sb-modal-actions { - display: flex; - align-items: center; - justify-content: center; -} - -.sb-modal .ui.modal { - margin-top: 15% !important; -} - .ngx-datatable.fixed-header .datatable-header { padding: 0.625rem; } -.sidebar-block { - min-height: 25rem; -} - .ngx-datatable.datatable-header { background: var(--mat-accordion-tab-body-active-bg) !important; } - -/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ -/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ -.custom_mat_dd .mat-mdc-select-arrow-wrapper { - vertical-align: bottom !important; -} - -.reset-filter{ - color: var(--primary); - background-color: var(--brand-header-tail-text); - width: fit-content; -} - .newData{ color:var(--ck-color-base-error); margin-left: 1.875rem; @@ -53,39 +26,20 @@ color: var(--ck-color-button-cancel); } -.ppFilter{ - margin-top: 1.25rem; -} - .col-gap{ - gap:2rem; -} - -.btn-col{ - flex-grow: 1; - margin-left: 5rem !important; -} - -.modalNote{ - line-height: initial; + gap:1rem; } .infoIcon{ width: 1.125rem; } .sb-graph-section{ - box-shadow: 0 calculateRem(2px) calculateRem(7px) 0 rgba(var(--rc-rgba-black), 0.16); background: var(--sb-graph-section-bg); border: 0.0625rem solid var(--rc-dddddd); } -.sb-last-update-status { - font-size: calculateRem(12px); - font-weight: bold; -} - .sb-label-name { font-size: 1rem; } @@ -107,13 +61,6 @@ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .exportBtn .mat-form-field-wrapper { - float: right; - } - - .cdk-overlay-container{ - z-index: 9 !important; - } .customTable{ sb-dashlets-filters{ @@ -126,10 +73,26 @@ justify-content: flex-end !important; } .chart-title{ - font-weight: 700; + font-weight: 700 !important; + color: var(--primary-color); } - table{ - width: 100% !important; + .export-btn { + position: absolute; + top: -3rem !important; + right: 0 !important; + } + div.dt-container .dt-length, div.dt-container .dt-search, div.dt-container .dt-info, div.dt-container .dt-processing, div.dt-container .dt-paging{ + display: flex; + align-items: center; + flex-direction: row-reverse; + gap: 1rem; + label{ + margin: 0; + text-transform: capitalize; + } + } + div.dt-container div.dt-layout-row.dt-layout-table, div.dt-container div.dt-layout-row.dt-layout-table div.dt-layout-cell{ + overflow: auto; } } .customGraph{ @@ -142,13 +105,6 @@ } } - .customDate{ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix{ - width: 8.75rem !important; - } } .chart-title { font-size: 1rem; @@ -157,52 +113,3 @@ padding-top: 0.5rem; } - - .custom_mat_dd{ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-flex{ - display: flex; - align-items: center !important; - box-sizing: border-box; - width: 100%; - - input::placeholder{ - color: rgba(0,0,0,.42) !important; - font-weight: bold !important; - } - } - /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ - .mat-select-arrow-wrapper { - vertical-align: unset !important; - } - - } - .mat-mdc-select-panel .mat-mdc-option { - white-space: normal !important; - display: inline-table !important; - width: 100% !important; - line-height: 1.5em !important; - padding: 0.625rem 1.5em; - } - /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ - .mat-option-text{ - display: flex !important; - } - - .mat-dropdown__options span { - position: unset !important; - } - .mat-dropdown__options span:before { - display: flex !important; - align-self: flex-end !important; - } - .custom_mat_multi.mat-mdc-option{ - display: flex !important; - } -} \ No newline at end of file diff --git a/src/app/client/src/app/modules/public/module/signup/components/otp/otp.component.spec.data.ts b/src/app/client/src/app/modules/public/module/signup/components/otp/otp.component.spec.data.ts index ca8916861a3..45586a73c9d 100644 --- a/src/app/client/src/app/modules/public/module/signup/components/otp/otp.component.spec.data.ts +++ b/src/app/client/src/app/modules/public/module/signup/components/otp/otp.component.spec.data.ts @@ -117,10 +117,10 @@ export const OtpComponentMockResponse = { }, 'status': 400, 'statusText': 'Bad Request', - 'url': 'http://localhost:3000/learner/otp/v1/verify', + 'url': 'http://localhost:3000/learner/otp/v2/verify', 'ok': false, 'name': 'HttpErrorResponse', - 'message': 'Http failure response for http://localhost:3000/learner/otp/v1/verify: 400 Bad Request', + 'message': 'Http failure response for http://localhost:3000/learner/otp/v2/verify: 400 Bad Request', 'error': { 'id': 'api.otp.verify', 'ver': 'v1', diff --git a/src/app/client/src/app/modules/public/module/signup/services/signup/signup.service.spec.ts b/src/app/client/src/app/modules/public/module/signup/services/signup/signup.service.spec.ts index dcec148016d..64ba84f225e 100644 --- a/src/app/client/src/app/modules/public/module/signup/services/signup/signup.service.spec.ts +++ b/src/app/client/src/app/modules/public/module/signup/services/signup/signup.service.spec.ts @@ -15,15 +15,15 @@ describe("SignupService", () => { urlConFig: { URLS: { OTP: { - GENERATE: "otp/v1/generate", - VERIFY: "otp/v1/verify", + GENERATE: "otp/v2/generate", + VERIFY: "otp/v2/verify", ANONYMOUS: { - GENERATE: "anonymous/otp/v1/generate", + GENERATE: "anonymous/otp/v2/generate", }, }, USER: { - GET_USER_BY_KEY: "user/v1/get", - CHECK_USER_EXISTS: "user/v1/exists", + GET_USER_BY_KEY: "user/v2/get", + CHECK_USER_EXISTS: "user/v2/exists", CREATE_V2: "user/v2/create", SIGN_UP_V1: "user/v2/signup", TNC_ACCEPT_LOGIN: "user/v2/accept/tnc", @@ -53,7 +53,7 @@ describe("SignupService", () => { it("should call generate API ", () => { const params = { request: { key: "1242142", type: "phone" } }; jest.spyOn(mockLearnerService, "post").mockReturnValue(of(mock.mockRes.generateOtpData)); - const options = { url: "otp/v1/generate", data: params }; + const options = { url: "otp/v2/generate", data: params }; component.generateOTP(params); expect(mockLearnerService.post).toHaveBeenCalledWith(options); }); @@ -64,7 +64,7 @@ describe("SignupService", () => { .spyOn(mockLearnerService, "post") .mockReturnValue(of(mock.mockRes.generateAnonymousOtpData)); const options = { - url: "anonymous/otp/v1/generate" + "?captchaResponse=" + "G-cjkdjflsfkja", + url: "anonymous/otp/v2/generate" + "?captchaResponse=" + "G-cjkdjflsfkja", data: params, }; component.generateOTPforAnonymousUser(params, "G-cjkdjflsfkja"); @@ -77,7 +77,7 @@ describe("SignupService", () => { .spyOn(mockLearnerService, "post") .mockReturnValue(of(mock.mockRes.verifyOtpData)); const options = { - url: "otp/v1/verify", + url: "otp/v2/verify", data: params, }; component.verifyOTP(params); @@ -87,7 +87,7 @@ describe("SignupService", () => { it("should call get User By Key API", () => { const params = { request: { key: "1242142", type: "phone" } }; jest.spyOn(mockLearnerService, "get").mockReturnValue(of(mock.mockRes.getUserData)); - const options = { url: "user/v1/get" }; + const options = { url: "user/v2/get" }; component.getUserByKey(params); expect(mockLearnerService.get).toHaveBeenCalled(); }); @@ -95,7 +95,7 @@ describe("SignupService", () => { it("should call check user exists API", () => { const params = { request: { key: "1242142", type: "phone" } }; jest.spyOn(mockLearnerService, "get").mockReturnValue(of(mock.mockRes.verifyUserData)); - const options = { url: "user/v1/exists" }; + const options = { url: "user/v2/exists" }; component.checkUserExists(params); expect(mockLearnerService.get).toHaveBeenCalled(); }); diff --git a/src/app/client/src/app/modules/recover-account/services/recover-account/recover-account.service.spec.ts b/src/app/client/src/app/modules/recover-account/services/recover-account/recover-account.service.spec.ts index 865aca661fb..d8dd27c01bc 100644 --- a/src/app/client/src/app/modules/recover-account/services/recover-account/recover-account.service.spec.ts +++ b/src/app/client/src/app/modules/recover-account/services/recover-account/recover-account.service.spec.ts @@ -21,10 +21,10 @@ describe('RecoverAccountService', () => { RESET_PASSWORD: "user/v1/password/reset" }, OTP: { - GENERATE: "otp/v1/generate", - VERIFY: "otp/v1/verify", + GENERATE: "otp/v2/generate", + VERIFY: "otp/v2/verify", ANONYMOUS: { - GENERATE: "anonymous/otp/v1/generate", + GENERATE: "anonymous/otp/v2/generate", }, }, } @@ -61,7 +61,7 @@ describe('RecoverAccountService', () => { const params = { 'request': { 'type': 'user', 'key': 'testKey', 'userId': 'testUserId' } }; jest.spyOn(mockLearnerService, 'post'); component.generateOTP(params); - const options = { url: 'anonymous/otp/v1/generate?captchaResponse=undefined', data: params }; + const options = { url: 'anonymous/otp/v2/generate?captchaResponse=undefined', data: params }; expect(mockLearnerService.post).toHaveBeenCalledWith(options); }); @@ -69,7 +69,7 @@ describe('RecoverAccountService', () => { const params = { 'request': { 'type': 'user', 'key': 'testKey', 'userId': 'testUserId' } }; jest.spyOn(mockLearnerService, 'post'); component.verifyOTP(params); - const options = { url: 'otp/v1/verify', data: params }; + const options = { url: 'otp/v2/verify', data: params }; expect(mockLearnerService.post).toHaveBeenCalledWith(options); }); diff --git a/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html b/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html index 1506208bb0f..8c5aa0b7df1 100644 --- a/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html +++ b/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.html @@ -1,29 +1,25 @@ - + -
+
-
-

{{ resourceService.frmelmnts?.lbl?.selectEntity }}

-
+

{{ resourceService.frmelmnts?.lbl?.selectEntity }}

-
-
-
-
- - -
-
-
-
- +
+
+ + + {{ entity.name }} + +
+
+ +
diff --git a/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.scss b/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.scss index cee92da7cd3..ea07346ca29 100644 --- a/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.scss +++ b/src/app/client/src/app/modules/report/components/entity-list/entity-list.component.scss @@ -1,84 +1,13 @@ @use "@project-sunbird/sb-styles/assets/mixins/mixins" as *; -.add-entity-modal{ - .content{ - max-height: 60vh; - label{ - color: var(--sb-prominent-filter-title); - } - label:hover{ - cursor: pointer; - } - } - .footer{ - width: 100%; - text-align: center; - background: var(--sb-card-bg); - border-top: none; - } - .search-box{ - margin-top: calculateRem(15px); - } -} - -.sb-onboard { - &__header { - width: 100%; - margin: calculateRem(20px) 0px; - padding-left : calculateRem(15px); - } - - &__content { - width: calculateRem(648px); - max-width: 100%; - margin-bottom: auto; - overflow: hidden; - overflow-y: auto; - } - - &__footer { - margin-top: calculateRem(16px); - width: 100%; - text-align: center; - } -} - ::ng-deep { - .sb-onbrd-modal { - @include respond-below(sm) { - .ui.modal { - margin: 0 0 0 0; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - } - - .ui.modal.scroll { - position: fixed !important; - top: 0; - width: 100%; - left: 0px; - right: 0px; - margin: 0 !important; + .mat-mdc-radio-group{ + .mat-mdc-radio-button{ + .mdc-form-field{ + label{ + margin: 0 !important; + } } } } -} - .sbt-search-box{ - box-shadow: none; - margin: 0; - } - .load-mr-btn{ - height: 2rem; - font-size: 1rem; - padding: 0.5rem 2rem; - } - .load-mr-bt-center{ - text-align:center -} - - .checked-box{ - background: none; } diff --git a/src/app/client/src/app/modules/report/report.module.ts b/src/app/client/src/app/modules/report/report.module.ts index 9962eb4cb64..8c76bafd14d 100644 --- a/src/app/client/src/app/modules/report/report.module.ts +++ b/src/app/client/src/app/modules/report/report.module.ts @@ -11,7 +11,7 @@ import { ReportRoutingModule } from './report-routing.module'; import { SolutionListingComponent, EntityListComponent, ReportViewComponent, AllEvidenceComponent } from './components'; import { DataTablesModule } from 'angular-datatables'; import { DashletModule } from '@project-sunbird/sb-dashlet'; -// import { SlReportsLibraryModule } from '@shikshalokam/sl-reports-library'; +import { SlReportsLibraryModule } from '@shikshalokam/sl-reports-library'; import { MatTabsModule } from '@angular/material/tabs'; @@ -35,7 +35,7 @@ import { MatTabsModule } from '@angular/material/tabs'; ReportRoutingModule, DataTablesModule, DashletModule.forRoot(), - // SlReportsLibraryModule, + SlReportsLibraryModule, MatTabsModule ], providers: [], diff --git a/src/app/client/src/app/modules/shared-feature/components/collection-player/collection-player.component.ts b/src/app/client/src/app/modules/shared-feature/components/collection-player/collection-player.component.ts index 976406b2027..296bdbf271f 100644 --- a/src/app/client/src/app/modules/shared-feature/components/collection-player/collection-player.component.ts +++ b/src/app/client/src/app/modules/shared-feature/components/collection-player/collection-player.component.ts @@ -220,7 +220,7 @@ export class CollectionPlayerComponent implements OnInit, OnDestroy, AfterViewIn this.playerConfig = this.getPlayerConfig(id).pipe(map((content:any) => { if(this.activeContent.mimeType === this.configService.appConfig.PLAYER_CONFIG.MIME_TYPE.questionset) { - const contentDetails = {contentId: id, contentData: content.questionset }; + const contentDetails = { contentId: id, contentData: content.questionset || content.questionSet }; content = this.playerServiceReference.getConfig(contentDetails); this.publicPlayerService.getQuestionSetRead(id).subscribe((data: any) => { _.merge(content.metadata, this.publicPlayerService.getProperties(data.questionset, this.configService.editorConfig.QUESTIONSET_EDITOR.additionalProperties)) diff --git a/src/app/client/src/app/modules/shared-feature/components/global-consent-pii/global-consent-pii.component.ts b/src/app/client/src/app/modules/shared-feature/components/global-consent-pii/global-consent-pii.component.ts index 3c9705b95c6..ae2e9676e2b 100644 --- a/src/app/client/src/app/modules/shared-feature/components/global-consent-pii/global-consent-pii.component.ts +++ b/src/app/client/src/app/modules/shared-feature/components/global-consent-pii/global-consent-pii.component.ts @@ -89,7 +89,7 @@ export class GlobalConsentPiiComponent implements OnInit { getUserInformation() { this.userInformation['name'] = this.usersProfile.lastName ? - `${this.usersProfile.firstName} ${this.usersProfile.lastName}` : this.usersProfile.firstName; + `${this.usersProfile.firstName} ${this.usersProfile.lastName}` : this.usersProfile.firstName; this.userInformation['userid'] = this.usersProfile.userId; this.userInformation['emailId'] = this.usersProfile.email; this.userInformation['phone'] = this.usersProfile.phone; @@ -193,7 +193,7 @@ export class GlobalConsentPiiComponent implements OnInit { if (this.type === 'course-consent') { request.consumerId = this.collection ? this.collection.channel : ''; request.objectId = this.collection ? this.collection.identifier : ''; - } else if ( this.type === 'global-consent') { + } else if (this.type === 'global-consent') { request.consumerId = this.userService.channel; request.objectId = this.userService.channel; const declReq = []; @@ -201,11 +201,11 @@ export class GlobalConsentPiiComponent implements OnInit { declReq.push(this.getDeclarationReqObject(this.usersProfile)); this.updateUserDeclaration(declReq); } - } else if(this.type === 'program-consent'){ + } else if (this.type === 'program-consent') { request.consumerId = this.collection.rootOrganisations; request.objectId = this.collection.programId } - this.csUserService.getConsent(request, { apiPath: '/learner/user/v1' }) + this.csUserService.getConsent(request, { apiPath: '/learner/user/v2' }) .pipe(takeUntil(this.unsubscribe)) .subscribe(res => { if (this.type === 'global-consent') { @@ -239,11 +239,11 @@ export class GlobalConsentPiiComponent implements OnInit { request.consumerId = this.collection ? this.collection.channel : ''; request.objectId = this.collection ? this.collection.identifier : ''; request.objectType = 'Collection'; - } else if ( this.type === 'global-consent') { + } else if (this.type === 'global-consent') { request.consumerId = this.userService.channel; request.objectId = this.userService.channel; request.objectType = 'Organisation'; - } else if(this.type === 'program-consent'){ + } else if (this.type === 'program-consent') { request.consumerId = this.collection.rootOrganisations; request.objectId = this.collection.programId; request.objectType = 'Program' @@ -251,8 +251,8 @@ export class GlobalConsentPiiComponent implements OnInit { this.csUserService.updateConsent(request, { apiPath: '/learner/user/v1' }) .pipe(takeUntil(this.unsubscribe)) .subscribe(() => { - if(this.type === 'program-consent'){ - this.consentShare.emit({consent:true}) + if (this.type === 'program-consent') { + this.consentShare.emit({ consent: true }) } this.type !== 'program-consent' && this.toasterService.success(_.get(this.resourceService, 'messages.smsg.dataSettingSubmitted')); this.getUserConsent(); @@ -262,8 +262,8 @@ export class GlobalConsentPiiComponent implements OnInit { this.isTncAgreed = false; this.toasterService.error(_.get(this.resourceService, 'messages.emsg.m0005')); console.error('Error while updating user consent', error); - if(this.type === 'program-consent'){ - this.consentShare.emit({consent:false}) + if (this.type === 'program-consent') { + this.consentShare.emit({ consent: false }) } }); } @@ -281,9 +281,9 @@ export class GlobalConsentPiiComponent implements OnInit { .pipe(takeUntil(this.unsubscribe)) .subscribe(() => { this.toasterService.success(_.get(this.resourceService, 'messages.smsg.m0037')); - }, err => { - this.toasterService.error(this.resourceService.messages.emsg.m0052); - }); + }, err => { + this.toasterService.error(this.resourceService.messages.emsg.m0052); + }); } getDeclarationReqObject(usersProfile) { let userExternalId = null; @@ -301,7 +301,7 @@ export class GlobalConsentPiiComponent implements OnInit { }; const declarationObj = { operation: 'add', - userId : usersProfile.userId, + userId: usersProfile.userId, orgId: usersProfile.rootOrgId, info: info }; diff --git a/src/app/client/src/app/modules/shared-feature/components/onboarding-user-selection/onboarding-user-selection.component.html b/src/app/client/src/app/modules/shared-feature/components/onboarding-user-selection/onboarding-user-selection.component.html index 07e84e414db..0ce6a4ae82b 100644 --- a/src/app/client/src/app/modules/shared-feature/components/onboarding-user-selection/onboarding-user-selection.component.html +++ b/src/app/client/src/app/modules/shared-feature/components/onboarding-user-selection/onboarding-user-selection.component.html @@ -12,7 +12,7 @@

{{resourceService?.frmelmnts?.lbl?.welcomeToInstance | interpol
-
+

{{resourceService?.frmelmnts?.lbl?.youAre}}

- + @@ -7,7 +7,7 @@
  • - {{ listItem }} + {{ listItem }}
diff --git a/src/app/client/src/app/modules/shared/components/material-auto-complete/material-auto-complete.component.scss b/src/app/client/src/app/modules/shared/components/material-auto-complete/material-auto-complete.component.scss index 7aef5d58b5b..a1e74105aa5 100644 --- a/src/app/client/src/app/modules/shared/components/material-auto-complete/material-auto-complete.component.scss +++ b/src/app/client/src/app/modules/shared/components/material-auto-complete/material-auto-complete.component.scss @@ -7,7 +7,7 @@ &__list { position: absolute; - top: 100%; + top: 0; background: var(--sb-dropdown-menu-bg); border-radius: calculateRem(4px); z-index: 1; @@ -40,11 +40,13 @@ ::ng-deep { .mat-mdc-form-field { width: 100%; - height: calculateRem(32px); - padding: 0 calculateRem(20px); - border: calculateRem(1px) solid var(--gray-100); - background: var(--sb-dropdown-menu-bg); - border-radius: calculateRem(4px); + height: 3rem; + padding: 0 1.25rem; + border-radius: .25rem; + border-radius: 0; + border: none; + padding: 0; + margin: 0; &.mat-form-field-appearance-legacy { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ @@ -92,21 +94,24 @@ } ::ng-deep { - html[layout="joy"] .sb-autocomp-dropdown .mat-mdc-form-field, .sb-autocomp-dropdown__list { - border-radius: calculateRem(24px); - } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ html[data-mode="darkmode"] .sb-mat__checkbox.sb-mat__checkbox--primary .mat-checkbox-frame { border-color: var(--gray-100); } .sb-autocomp-dropdown__list { - top: 0px !important; + .cdk-text-field-autofill-monitored:not(:-webkit-autofill){ + border-radius: 1.5rem; + border: .0625rem solid var(--gray-100); + width: 100%; + padding: 0.5rem 1.5rem; + margin-top: 0.5rem; + } + } + .mdc-text-field--no-label:not(.mdc-text-field--textarea) .mat-mdc-form-field-input-control.mdc-text-field__input, .mat-mdc-text-field-wrapper .mat-mdc-form-field-input-control{ + padding: 0; + margin: 0; } .sb-autocomp-dropdown__list ul { list-style: none !important } - .sb-autocomp-dropdown .mat-mdc-form-field { - height: 2.5rem !important; - } } diff --git a/src/app/client/src/app/modules/shared/components/network-status/network-status.component.spec.ts b/src/app/client/src/app/modules/shared/components/network-status/network-status.component.spec.ts index 4846e525492..dc99b6a7936 100644 --- a/src/app/client/src/app/modules/shared/components/network-status/network-status.component.spec.ts +++ b/src/app/client/src/app/modules/shared/components/network-status/network-status.component.spec.ts @@ -29,6 +29,12 @@ describe('NetworkStatusComponent', () => { expect(component).toBeTruthy(); }); + it('should create a instance of component and call the ngOnInit', () => { + connectionService.monitor = jest.fn(() => of(true)) + component.ngOnInit(); + console.log(component.isConnected); + expect(component.isConnected).toBeTruthy(); + }); it('should unsubscribe from observables on ngOnDestroy', () => { const unsubscribeSpy = jest.spyOn(component.unsubscribe$, 'next'); const unsubscribeCompleteSpy = jest.spyOn(component.unsubscribe$, 'complete'); diff --git a/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.data.ts b/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.data.ts index f5cb049a91d..9828df24644 100644 --- a/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.data.ts +++ b/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.data.ts @@ -118,7 +118,7 @@ export const TableData = { { name: 'District', isSortable: true, prop: 'district' }, { name: 'No. of Enrollment', isSortable: true, prop: 'noofEnrollments'}, { name: 'No. of Completions', isSortable: true, prop: 'noofCompletions' }], - searchFields : ['state', 'district'], + searchFields : ['0','1','state', 'district'], telemetryDataForDownload: { context: { env: 'reports', diff --git a/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.ts b/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.ts new file mode 100644 index 00000000000..06743fa8fae --- /dev/null +++ b/src/app/client/src/app/modules/shared/components/sb-datatable/sb-datatable.component.spec.ts @@ -0,0 +1,110 @@ +import { Component, OnInit, Input, OnChanges, EventEmitter, Output } from '@angular/core'; +import { ExportToCsv } from 'export-to-csv'; +import * as _ from 'lodash-es'; +import dayjs from 'dayjs'; +import { ResourceService } from '../../services/resource/resource.service'; +import { Observable, Subject } from 'rxjs'; +import { TelemetryService } from '@sunbird/telemetry'; +import { SbDatatableComponent, multiFilter } from './sb-datatable.component'; +import { TableData } from './sb-datatable.component.spec.data'; + +describe('SbDatatableComponent', () => { + let component: SbDatatableComponent; + const mockResourceService: Partial = {}; + const mockTelemetryService: Partial = { + interact: jest.fn() + }; + beforeAll(() => { + component = new SbDatatableComponent( + mockResourceService as ResourceService, + mockTelemetryService as TelemetryService + ) + }); + beforeEach(() => { + jest.clearAllMocks(); + component.keyUp = new Subject() as any; + //component.keyUp.next({ key: 'A', keyCode: 65 }) + }); + + it('should be create a instance of SbDatatableComponent', () => { + expect(component).toBeTruthy(); + }); + it('should be create a instance of SbDatatableComponent and call onColumnFilter method with key but no value', () => { + const key = 'state'; + const value = null; + component.data = TableData.responseData; + component.listFilter = TableData.searchFields; + jest.spyOn(component, 'filterDataTable'); + component.onColumnFilter(key, value); + expect(component.filterDataTable).toBeCalled(); + }); + it('should be create a instance of SbDatatableComponent and call onColumnFilter method with key and value', () => { + const key = 'state'; + const value = 'abcd'; + component.data = TableData.responseData; + component.listFilter = TableData.sortData_DESC; + jest.spyOn(component, 'filterDataTable'); + component.onColumnFilter(key, value); + expect(component.filterDataTable).toBeCalled(); + }); + describe('ngOnInit', () => { + it('should initialize the component and call the ngOnInit method ', () => { + const keyUpSubject = new Subject(); + component.keyUp = keyUpSubject; + component.ngOnInit(); + //expect(component.keyUp.subscribe).toHaveBeenCalled(); + }); + }) + it("should call ngOnChanges method", () => { + component.message = 'table data will be displayed here'; + component.columns = ['A', 'B', 'C']; + component.ngOnChanges(); + const obj = { + emptyMessage: component.message + } + expect(component.tableMessage).toEqual(obj); + }); + it("should call downloadUrl method", () => { + window.open = jest.fn(); + const prop = 'downloadUrls'; + const row = { + expiresAt: '1234567890', + downloadUrls: [ + 'www.sunbirded.com', 'www.sunbird.com' + ] + }; + component.downloadUrl(prop, row); + expect(window.open).toHaveBeenCalledWith('www.sunbirded.com', '_blank'); + }); + it("should call downloadUrl method with downloadLink emit called", () => { + jest.spyOn(component.downloadLink, 'emit'); + const prop = 'downloadUrls'; + const row = { + expiresAt: '2009-05-23', + downloadUrls: [ + 'www.sunbirded.com', 'www.sunbird.com' + ] + }; + component.downloadUrl(prop, row); + expect(component.downloadLink.emit).toHaveBeenCalled(); + }); + it('should be create a instance and call the method clearSearch', () => { + component.searchData = 'I am trying to search'; + component.clearSearch() + expect(component.searchData).toEqual(''); + }); + it('should set Interact Event Data', () => { + jest.spyOn(mockTelemetryService, 'interact'); + component.setInteractEventData(); + expect(component.telemetryService.interact).toBeCalled(); + }); + it('should call the method downloadCSVFile', () => { + jest.spyOn(component,'setInteractEventData'); + component.name = 'fileName'; + component.columns = [{name:'A'},{name:'B'},{name:'C'}]; + const mockGenerateCsv = jest.fn(); + jest.spyOn(ExportToCsv.prototype, 'generateCsv').mockImplementation(mockGenerateCsv); + component.downloadCSVFile(); + expect(component.setInteractEventData).toBeCalled(); + }); +}); diff --git a/src/app/client/src/app/modules/shared/components/share-link/share-link.component.html b/src/app/client/src/app/modules/shared/components/share-link/share-link.component.html index 1e6067500dc..3c0f5537550 100644 --- a/src/app/client/src/app/modules/shared/components/share-link/share-link.component.html +++ b/src/app/client/src/app/modules/shared/components/share-link/share-link.component.html @@ -12,14 +12,14 @@ -
- {{resourceService?.frmelmnts?.lbl?.sharelink}} + @@ -159,5 +160,6 @@
{{resourceService?.frmelmnts?.lbl?.lin {{resourceService?.frmelmnts?.btn?.close}} + diff --git a/src/app/client/src/app/modules/workspace/components/all-textbooks/all-textbooks.component.html b/src/app/client/src/app/modules/workspace/components/all-textbooks/all-textbooks.component.html index 94d8bed37e6..617170af859 100644 --- a/src/app/client/src/app/modules/workspace/components/all-textbooks/all-textbooks.component.html +++ b/src/app/client/src/app/modules/workspace/components/all-textbooks/all-textbooks.component.html @@ -124,6 +124,7 @@
+
@@ -159,6 +160,7 @@
{{resourceService?.frmelmnts?.lbl?.lin {{resourceService?.frmelmnts?.btn?.close}} + diff --git a/src/app/client/src/app/modules/workspace/components/bulk-upload-content/bulk-upload-content.component.html b/src/app/client/src/app/modules/workspace/components/bulk-upload-content/bulk-upload-content.component.html index 4b8f7850b37..84b9954eeb9 100644 --- a/src/app/client/src/app/modules/workspace/components/bulk-upload-content/bulk-upload-content.component.html +++ b/src/app/client/src/app/modules/workspace/components/bulk-upload-content/bulk-upload-content.component.html @@ -4,6 +4,7 @@ @use 'components/metadata' as *; --> +
Upload .CSV file
@@ -70,4 +71,5 @@
+ \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/components/content-creation-default-template/content-creation-default-template.component.html b/src/app/client/src/app/modules/workspace/components/content-creation-default-template/content-creation-default-template.component.html index 372305d1b42..42de90e2934 100644 --- a/src/app/client/src/app/modules/workspace/components/content-creation-default-template/content-creation-default-template.component.html +++ b/src/app/client/src/app/modules/workspace/components/content-creation-default-template/content-creation-default-template.component.html @@ -1,15 +1,15 @@
+ {{field.label}} * - {{field.label}} * - +
+ {{field.label}} * - {{field.label}} *
+ {{field.label}} * - {{field.label}} *
+ {{field.label}} * - {{field.label}} * +
{{resourceService?.frmelmnts?.lbl[creationFormLable]}}
@@ -12,11 +13,12 @@ [categoryMasterList]="categoryMasterList"> - + + diff --git a/src/app/client/src/app/modules/workspace/components/published-popup/published-popup.component.html b/src/app/client/src/app/modules/workspace/components/published-popup/published-popup.component.html index a19144cc1cc..d1026881325 100644 --- a/src/app/client/src/app/modules/workspace/components/published-popup/published-popup.component.html +++ b/src/app/client/src/app/modules/workspace/components/published-popup/published-popup.component.html @@ -1,4 +1,5 @@ +
{{resourceService.frmelmnts.btn.checkListPublish}}
@@ -52,4 +53,5 @@
{{checkListData.publish.title}}
+ \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/components/published/published.component.html b/src/app/client/src/app/modules/workspace/components/published/published.component.html index 78ee94faf66..bbdd6f6ec2b 100644 --- a/src/app/client/src/app/modules/workspace/components/published/published.component.html +++ b/src/app/client/src/app/modules/workspace/components/published/published.component.html @@ -92,6 +92,7 @@ +
@@ -129,4 +130,5 @@
{{resourceService?.frmelmnts?.lbl?.lin {{resourceService?.frmelmnts?.btn?.close}} + diff --git a/src/app/client/src/app/modules/workspace/components/request-changes-popup/request-changes-popup.component.html b/src/app/client/src/app/modules/workspace/components/request-changes-popup/request-changes-popup.component.html index f94e7621e2e..e6ab9a202d9 100644 --- a/src/app/client/src/app/modules/workspace/components/request-changes-popup/request-changes-popup.component.html +++ b/src/app/client/src/app/modules/workspace/components/request-changes-popup/request-changes-popup.component.html @@ -7,6 +7,7 @@ #modal *ngIf="showModal" > +
{{resourceService.frmelmnts.btn.checkListRequestChanges}}
@@ -67,5 +68,5 @@
- + \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/components/update-batch/update-batch.component.html b/src/app/client/src/app/modules/workspace/components/update-batch/update-batch.component.html index 50372c30833..8d64c099ff7 100644 --- a/src/app/client/src/app/modules/workspace/components/update-batch/update-batch.component.html +++ b/src/app/client/src/app/modules/workspace/components/update-batch/update-batch.component.html @@ -2,6 +2,7 @@ +
{{resourceService?.frmelmnts?.intxt?.t0007}} {{resourceService?.frmelmnts?.intxt?.t0015}} @@ -181,4 +182,5 @@ + diff --git a/src/app/client/src/app/modules/workspace/components/upforreview-contentplayer/upforreview-contentplayer.component.html b/src/app/client/src/app/modules/workspace/components/upforreview-contentplayer/upforreview-contentplayer.component.html index b8af950f74b..b28de3f4e93 100644 --- a/src/app/client/src/app/modules/workspace/components/upforreview-contentplayer/upforreview-contentplayer.component.html +++ b/src/app/client/src/app/modules/workspace/components/upforreview-contentplayer/upforreview-contentplayer.component.html @@ -86,6 +86,7 @@

+
@@ -116,6 +117,7 @@

{{resourceService?.frmelmnts?.lbl?.publhwarng}}

{{resourceService?.frmelmnts?.btn?.no}} + diff --git a/src/app/client/src/app/modules/workspace/services/batch/batch.service.spec.ts b/src/app/client/src/app/modules/workspace/services/batch/batch.service.spec.ts new file mode 100644 index 00000000000..97d6a2ec1b4 --- /dev/null +++ b/src/app/client/src/app/modules/workspace/services/batch/batch.service.spec.ts @@ -0,0 +1,173 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { ConfigService, ServerResponse } from '@sunbird/shared'; +import { SearchParam, LearnerService, UserService, PlayerService } from '@sunbird/core'; +import { _ } from 'lodash-es'; +import { BatchService } from './batch.service'; +import { of } from 'rxjs'; +import * as data from './batch.service.spec.data' +describe('BatchService', () => { + let component: BatchService; + + const userService: Partial = { + rootOrgId: '123', + userProfile: { + userId: 'sample-uid', + rootOrgId: 'sample-root-id', + rootOrg: {}, + hashTagIds: ['id'], + roleOrgMap: { + COURSE_MENTOR: ['COURSE_MENTOR'] + }, + } as any + }; + const playerService: Partial = {}; + const configService: Partial = { + urlConFig: { + URLS: { + BATCH: { + CREATE: "course/v1/batch/create", + UPDATE: "course/v1/batch/update", + ADD_USERS: "course/v1/batch/user/add", + GET_DETAILS: "course/v1/batch/read", + GET_PARTICIPANT_LIST: "course/v1/batch/participants/list", + GET_BATCHS: "course/v1/batch/list", + REMOVE_USERS: "course/v1/batch/user/remove" + }, + ADMIN: { + USER_SEARCH: "user/v3/search", + } + } + } + }; + const learnerService: Partial = { + post: jest.fn().mockImplementation(() => { }), + get: jest.fn(), + patch: jest.fn() + }; + + beforeAll(() => { + component = new BatchService( + userService as UserService, + playerService as PlayerService, + configService as ConfigService, + learnerService as LearnerService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of component', () => { + expect(component).toBeTruthy(); + }); + + it('should call getParticipantList', () => { + learnerService.post = jest.fn().mockReturnValue(of({})) as any; + component.getParticipantList({}).subscribe((data) => expect(learnerService.post).toHaveBeenCalled()); + }); + + it('should call removeUsersFromBatch', () => { + learnerService.post = jest.fn().mockReturnValue(of({})) as any; + component.removeUsersFromBatch('123', {}); + expect(learnerService.post).toHaveBeenCalled() + }); + + it('should set and get contextDetails correctly', () => { + const batchData = { identifier: '123' }; + component.setBatchData(batchData) + expect(component.batchDetails).toEqual(batchData); + }); + + it('should call updateBatch', () => { + const mockRequest = { someData: 'value' }; + component.updateBatch(mockRequest); + expect(learnerService.patch).toHaveBeenCalledTimes(1) + }); + + it('should call getBatchDetails with existing batch details', () => { + learnerService.get = jest.fn().mockReturnValue(of(data.Response.getbatchDetailSucess)) as any; + component.getBatchDetails('123'); + expect(learnerService.get).not.toHaveBeenCalled() + }); + + it('should call getBatchDetails without existing batch details', () => { + learnerService.get = jest.fn().mockReturnValue(of(data.Response.getbatchDetailSucess)) as any; + component.batchDetails = null + component.getBatchDetails('123').subscribe(data => expect(learnerService.get).toHaveBeenCalled()); + }); + + it('should call updateBatchDetails ', () => { + learnerService.patch = jest.fn().mockReturnValue(of(data.Response.updateSucess)) as any; + component.updateBatchDetails({ + name: 'test', + description: 'test', + enrollmentType: 'test', + startDate: '', + endDate: '', + createdFor: 'test', + id: '123', + mentors: 'test', + }) + expect(learnerService.patch).toHaveBeenCalled() + }); + + + it('should call addUsersToBatch ', () => { + learnerService.post = jest.fn().mockReturnValue(of(data.Response.addUserSucess)) as any; + component.addUsersToBatch({ + name: 'test', + description: 'test', + enrollmentType: 'test', + startDate: '', + endDate: '', + createdFor: 'test', + id: '123', + mentors: 'test', + }, '123') + expect(learnerService.post).toHaveBeenCalled() + }); + + it('should call getUpdateBatchDetails without existing batch details', () => { + learnerService.get = jest.fn().mockReturnValue(of(data.Response.getbatchDetailSucess)) as any; + component.batchDetails = null + component.getUpdateBatchDetails('123').subscribe(data => expect(learnerService.get).toHaveBeenCalled()); + }); + + it('should call getCourseHierarchy without existing course', () => { + playerService.getCollectionHierarchy = jest.fn().mockReturnValue(of(data.Response.getbatchDetailSucess)) as any; + component.getCourseHierarchy('123').subscribe(data => expect(playerService.getCollectionHierarchy).toHaveBeenCalled()); + }); + + it('should call getCourseHierarchy with existing course', () => { + component.courseHierarchy = { + identifier: '123' + } + playerService.getCollectionHierarchy = jest.fn().mockReturnValue(of(data.Response.getbatchDetailSucess)) as any; + component.getCourseHierarchy('123').subscribe(data => expect(playerService.getCollectionHierarchy).not.toHaveBeenCalled()); + }); + + it('should call for ro', () => { + learnerService.post = jest.fn().mockReturnValue(of({})) as any; + component.getUserList({}).subscribe((data) => expect(learnerService.post).toHaveBeenCalled()); + }); + + + it('should call getUserList without request params', () => { + learnerService.post = jest.fn().mockReturnValue(of({})) as any; + component.getUserList({}).subscribe((data) => expect(learnerService.post).toHaveBeenCalled()); + }); + + it('should call getUserList with request params', () => { + learnerService.post = jest.fn().mockReturnValue(of({})) as any; + userService.userProfile.roleOrgMap = { COURSE_MENTOR: ['COURSE_MENTOR', '123'] } + component.getUserList({ 'abc': 'test' } as any).subscribe((data) => expect(learnerService.post).toHaveBeenCalled()); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.data.ts b/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.data.ts index 00e803fea6b..aecbbf83d5d 100644 --- a/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.data.ts +++ b/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.data.ts @@ -22,5 +22,375 @@ export const mockRes = { qs: { fields: 'createdBy,status,mimeType', mode: 'edit' - } + }, + userProfile: { + 'maskedPhone': '******2507', + 'rootOrgName': 'CustROOTOrg10', + 'subject': [], + 'channel': 'custchannel', + 'language': [], + 'updatedDate': '2020-09-07 10:20:22:122+0000', + 'managedBy': null, + 'flagsValue': 3, + 'id': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'recoveryEmail': '', + 'identifier': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'thumbnail': null, + 'profileVisibility': {}, + 'rootOrgId': '01285019302823526477', + 'prevUsedEmail': '', + 'firstName': 'dev-user13', + 'tncAcceptedOn': '2020-08-12T06:36:35.914Z', + 'phone': '******2507', + 'userType': 'OTHER', + 'lastName': 'usr', + 'externalIds': [ + { + 'idType': 'custchannel', + 'provider': 'custchannel', + 'id': 'umesha32@yopmail.com' + } + ], + 'organisations': [ + { + 'updatedBy': null, + 'organisationId': '01285019302823526477', + 'orgName': 'CustROOTOrg10', + 'addedByName': null, + 'addedBy': null, + 'roles': [ + 'PUBLIC' + ], + 'approvedBy': null, + 'channel': 'custchannel', + 'locationIds': [], + 'updatedDate': null, + 'userId': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'approvaldate': null, + 'isDeleted': false, + 'parentOrgId': null, + 'hashTagId': '01285019302823526477', + 'isRejected': null, + 'locations': [], + 'position': null, + 'id': '013084382587002880578', + 'orgjoindate': '2020-08-12 06:35:21:366+0000', + 'isApproved': null, + 'orgLeftDate': null + } + ], + 'maskedEmail': 'de*********@yopmail.com', + 'tempPassword': null, + 'email': 'de*********@yopmail.com', + 'userLocations': [ + { + 'code': '2822', + 'name': 'ANANTAPUR', + 'id': 'f3e5b768-9008-4073-baf5-1dffc3c12b0b', + 'type': 'district', + 'parentId': '1222633c-bef9-4be8-a42d-edffa5a9c7ab' + }, + { + 'code': '28', + 'name': 'Andhra Pradesh', + 'id': '1222633c-bef9-4be8-a42d-edffa5a9c7ab', + 'type': 'state' + }, + { + 'code': '282211', + 'name': 'Block1', + 'id': '1222633c-bef9-4be8-a42d-aabbccdd12', + 'type': 'block', + 'parentId': 'f3e5b768-9008-4073-baf5-1dffc3c12b0b' + }, + { + 'id': '1222633c-bef9-4be8-a42d-bbccddee13', + 'type': 'school', + 'parentId': '1222633c-bef9-4be8-a42d-aabbccdd12' + } + ], + 'userName': 'devuser13', + 'userId': 'd8bfe598-21c8-4c9c-b335-a3f75a97a988', + 'declarations': [ + { + 'persona': 'teacher', + 'errorType': null, + 'orgId': '01298047944855552059', + 'status': null, + 'info': { + 'declared-email': 'de*********@yopmail.com', + 'declared-ext-id': '123', + 'declared-phone': '******2507', + 'declared-school-udise-code': '123', + 'declared-school-name':'school1' + } + } + ], + 'promptTnC': false, + 'emailVerified': true + }, + formData : { + 'id': 'api.form.read', + 'params': { + 'resmsgid': 'ae51c734-5a0c-431b-b9bd-d3cf6730ce95', + 'msgid': '0ee0a165-d289-4264-8e20-f057af4485ae', + 'status': 'successful' + }, + 'responseCode': 'OK', + 'result': { + 'form': { + 'type': 'customresourcebundles', + 'subtype': 'global', + 'action': 'list', + 'component': 'portal', + 'framework': 'tn_k-12_5', + 'data': { + 'defaultLanguage': 'en', + 'en': { + 'frameworkCategory1': 'Board', + 'frameworkCategory2': 'Medium', + 'frameworkCategory3': 'Class', + 'frameworkCategory4': 'Subject' + } + }, + 'created_on': '2024-04-24T12:43:28.542Z', + 'last_modified_on': null, + 'rootOrgId': '01269878797503692810' + } + }, + 'ts': '2024-05-08T15:24:18.934Z', + 'ver': '1.0' + }, + formDataWithFields:{ + 'id': 'api.form.read', + 'params': { + 'resmsgid': 'ae51c734-5a0c-431b-b9bd-d3cf6730ce95', + 'msgid': '0ee0a165-d289-4264-8e20-f057af4485ae', + 'status': 'successful' + }, + 'responseCode': 'OK', + 'result': { + 'form': { + 'type': 'customresourcebundles', + 'subtype': 'global', + 'action': 'list', + 'component': 'portal', + 'framework': 'tn_k-12_5', + 'data': { + fields:[{ + ownershipType:'admin' + } + ] + }, + 'created_on': '2024-04-24T12:43:28.542Z', + 'last_modified_on': null, + 'rootOrgId': '01269878797503692810' + } + }, + 'ts': '2024-05-08T15:24:18.934Z', + 'ver': '1.0' + }, + successData: { + 'id': 'api.v3.read', + 'ver': '1.0', + 'ts': '2020-04-18T04:13:46.475Z', + 'params': { + 'resmsgid': 'ff9473b0-812a-11ea-833f-1565f5d5bc45', + 'msgid': 'ff902df0-812a-11ea-833f-1565f5d5bc45', + 'status': 'successful', + 'err': null, + 'errmsg': null + }, + 'responseCode': 'OK', + 'result': { + 'content': { + 'ownershipType': [ + 'createdBy' + ], + 'copyright': '345 org, Sunbird QA Tenant, SunbirdQA 3', + 'keywords': [ + 'test', + 'nadiya' + ], + 'year': '2005', + 'subject': [ + 'Mathematics' + ], + 'channel': '0124511394914140160', + // tslint:disable-next-line: max-line-length + 'downloadUrl': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_212925261140451328114/rf-book-3_1577791108524_do_212925261140451328114_1.0_spine.ecar', + 'organisation': [ + '345 org', + 'Sunbird QA Tenant', + 'SunbirdQA 3' + ], + 'language': [ + 'English' + ], + 'mimeType': 'application/vnd.ekstep.content-collection', + 'variants': { + 'online': { + // tslint:disable-next-line: max-line-length + 'ecarUrl': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_212925261140451328114/rf-book-3_1577791108897_do_212925261140451328114_1.0_online.ecar', + 'size': 10604 + }, + 'spine': { + // tslint:disable-next-line: max-line-length + 'ecarUrl': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_212925261140451328114/rf-book-3_1577791108524_do_212925261140451328114_1.0_spine.ecar', + 'size': 78911 + } + }, + 'leafNodes': [ + 'do_2125678785313259521740', + 'do_2125734955775508481459', + 'do_212915144844754944118', + 'do_212910965326520320112', + 'do_21291449719969382411', + 'do_2125678797343047681742' + ], + 'objectType': 'Content', + 'gradeLevel': [ + 'Class 9' + ], + // tslint:disable-next-line: max-line-length + 'appIcon': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_212925261140451328114/artifact/0fef6edb-7cd4-4388-9237-36a5331ed00e_1571034457477.thumb.jpg', + 'children': [ + { + 'identifier': 'do_21291449719969382411', + 'name': '16 Dec', + 'description': 'Enter description for Resource', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + }, + { + 'identifier': 'do_212915144844754944118', + 'name': '17_Dece_Resource', + 'description': 'Enter description for Resource', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + }, + { + 'identifier': 'do_2125678797343047681742', + 'name': 'PDF content', + 'description': 'by um', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + }, + { + 'identifier': 'do_2125734955775508481459', + 'name': 'Resource_test55', + 'description': 'Untitled Collection', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + }, + { + 'identifier': 'do_2125678785313259521740', + 'name': 'EPUB content', + 'description': 'by um', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + }, + { + 'identifier': 'do_212910965326520320112', + 'name': 'Nadiya_L', + 'description': 'Sample', + 'objectType': 'Content', + 'relation': 'hasSequenceMember', + 'status': 'Live' + } + ], + 'appId': 'staging.diksha.portal', + 'contentEncoding': 'gzip', + 'lockKey': 'c55a6cd8-4a79-420c-8241-7927381853d3', + 'totalCompressedSize': 2486409, + // tslint:disable-next-line: max-line-length + 'mimeTypesCount': '{"application/pdf":1,"application/epub":1,"application/vnd.ekstep.content-collection":4,"application/vnd.ekstep.ecml-archive":4}', + 'sYS_INTERNAL_LAST_UPDATED_ON': '2019-12-31T11:18:29.123+0000', + 'contentType': 'TextBook', + 'identifier': 'do_212925261140451328114', + 'lastUpdatedBy': '25827334-616f-41fc-bc13-b4a1b0b4d7f5', + 'audience': [ + 'Learner' + ], + // tslint:disable-next-line: max-line-length + 'toc_url': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_212925261140451328114/artifact/do_212925261140451328114_toc.json', + 'visibility': 'Default', + 'contentTypesCount': '{"TextBookUnit":4,"Resource":6}', + 'consumerId': '56ff6913-abcc-4a88-b247-c976e47cbfb4', + 'childNodes': [ + 'do_2129252615893401601110', + 'do_2125678785313259521740', + 'do_2125734955775508481459', + 'do_2129252615893401601111', + 'do_212915144844754944118', + 'do_2129252615893319681109', + 'do_212910965326520320112', + 'do_21291449719969382411', + 'do_2129252615893565441112', + 'do_2125678797343047681742' + ], + 'mediaType': 'content', + 'osId': 'org.ekstep.quiz.app', + 'languageCode': [ + 'en' + ], + 'lastPublishedBy': '00c3affc-6988-4b38-9d61-c7bd23ac6cec', + 'version': 2, + 'rejectReasons': [ + 'Incorrect Board, Grade, Subject or Medium' + ], + 'license': 'CC BY-NC-SA 4.0', + 'prevState': 'Review', + 'size': 78911, + 'lastPublishedOn': '2019-12-31T11:18:28.403+0000', + 'name': 'RF Book 3', + 'rejectComment': 'nolt correct', + 'publisher': 'Juthika', + 'status': 'Live', + 'code': 'org.sunbird.zPXGMQ', + 'description': 'Enter description for TextBook', + 'medium': [ + 'Hindi' + ], + // tslint:disable-next-line: max-line-length + 'posterImage': 'https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2128699142366658561506/artifact/0fef6edb-7cd4-4388-9237-36a5331ed00e_1571034457477.jpg', + 'idealScreenSize': 'normal', + 'createdOn': '2019-12-31T11:11:06.567+0000', + 'copyrightYear': 2019, + 'contentDisposition': 'inline', + 'lastUpdatedOn': '2019-12-31T11:18:28.124+0000', + 'dialcodeRequired': 'No', + 'lastStatusChangedOn': '2019-12-31T11:18:29.112+0000', + 'createdFor': [ + '0124511394914140160', + '01245114878763827244', + '01231711180382208027' + ], + 'creator': 'Book Creator', + 'os': [ + 'All' + ], + 'pkgVersion': 1, + 'versionKey': '1577791108124', + 'idealScreenDensity': 'hdpi', + 'framework': 'rj_k-12_1', + 'dialcodes': [ + 'T4S6T3' + ], + 'depth': 0, + 's3Key': 'ecar_files/do_212925261140451328114/rf-book-3_1577791108524_do_212925261140451328114_1.0_spine.ecar', + 'lastSubmittedOn': '2019-12-31T11:17:30.705+0000', + 'createdBy': '25827334-616f-41fc-bc13-b4a1b0b4d7f5', + 'compatibilityLevel': 1, + 'leafNodesCount': 6, + 'board': 'State (Rajasthan)', + 'resourceType': 'Book' + } + } + } }; diff --git a/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.ts b/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.ts new file mode 100644 index 00000000000..d5987fa852b --- /dev/null +++ b/src/app/client/src/app/modules/workspace/services/editors/editor.service.spec.ts @@ -0,0 +1,156 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { ContentService, PublicDataService, UserService } from '@sunbird/core'; +import { Injectable } from '@angular/core'; +import { Observable, of, throwError } from 'rxjs'; +import { ConfigService, ServerResponse } from '@sunbird/shared'; +import { map, catchError } from 'rxjs/operators'; +import { _ } from 'lodash-es'; +import { WorkSpaceService } from './../work-space/workspace.service'; +import { EditorService } from './editor.service'; +import { mockRes } from './editor.service.spec.data' +describe('EditorService', () => { + let component: EditorService; + + const configService: Partial = { + urlConFig: { + URLS: { + CONTENT_PREFIX: '/content/', + CONTENT: { + GET: 'content/v1/read', + CREATE:'content/v1/create' + } + } + }, + editorConfig: { + rules: { + 'levels': 7, + 'objectTypes': [] + }, + 'publishMode': false, + 'isFlagReviewer': false, + DEFAULT_PARAMS_FIELDS: 'createdBy,status,mimeType,contentType,resourceType,collaborators,contentDisposition,primaryCategory,framework,targetFWIds,qumlVersion', + } + }; + const contentService: Partial = { + post:jest.fn() + }; + const publicDataService: Partial = { + get: jest.fn() + }; + const workspaceService: Partial = { + getFormData: jest.fn() + }; + const userService: Partial = { + loggedIn: true, + slug: jest.fn().mockReturnValue('tn') as any, + userData$: of({ + userProfile: { + userId: 'sample-uid', + rootOrgId: 'test_001', + rootOrg: {}, + hashTagIds: ['id'] + } as any + }) as any, + setIsCustodianUser: jest.fn(), + setGuestUser: jest.fn(), + userid: 'sample-uid', + appId: 'sample-id', + getServerTimeDiff: '', + }; + + beforeAll(() => { + component = new EditorService( + configService as ConfigService, + contentService as ContentService, + publicDataService as PublicDataService, + workspaceService as WorkSpaceService, + userService as UserService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should create a instance of component', () => { + expect(component).toBeTruthy(); + }); + it('should create a instance of component and call the getOwnershipType method', () => { + //workspaceService.getFormData = jest.fn(()=> of(mockRes.formData) as any) as any; + jest.spyOn(workspaceService, 'getFormData').mockReturnValueOnce(of(mockRes.formData as any) as any) as any; + component.userService = { + userProfile: mockRes.userProfile as any + } as any; + component.getOwnershipType().subscribe(data => { + expect(data).toEqual(['createdBy']) + }); + expect(component.workspaceService.getFormData).toBeCalled(); + }); + it('should create a instance of component and call the getOwnershipType method with field Data', () => { + jest.spyOn(workspaceService, 'getFormData').mockReturnValueOnce(of(mockRes.formDataWithFields as any) as any) as any; + component.userService = { + userProfile: mockRes.userProfile as any + } as any; + component.getOwnershipType().subscribe(data => { + expect(data).toEqual('admin') + }); + expect(component.workspaceService.getFormData).toBeCalled(); + }); + it('should create a instance of component and call the getOwnershipType method with error Data', () => { + jest.spyOn(workspaceService, 'getFormData').mockReturnValueOnce(throwError({ error: 'true' } as any) as any) as any; + component.userService = { + userProfile: mockRes.userProfile as any + } as any; + component.getOwnershipType().subscribe(data => { + expect(data).toEqual(['createdBy']) + }); + expect(component.workspaceService.getFormData).toBeCalled(); + }); + it('should create a instance of component and call the getContent method', () => { + jest.spyOn(publicDataService, 'get').mockReturnValueOnce(of(mockRes.successData) as any) as any; + const contentId = 'do_2124791869184655361855'; + // const option = { + // params: { + // } + // } + component.getContent(contentId).subscribe(data => { + expect(data).toEqual(mockRes.successData) + }); + }); + it('should create a instance of component and call the create method', () => { + jest.spyOn(contentService, 'post') + const req = { + content:{ + subject:['subject1','subject2'] + } + } + const option ={ + 'url':'content/v1/create','data':{'request':{'content':{'subject':['subject1','subject2']}}} + } + component.create(req); + expect(component.contentService.post).toBeCalled(); + expect(component.contentService.post).toBeCalledWith(option); + }); + it('should create a instance of component and call the create method with subject and medium', () => { + jest.spyOn(contentService, 'post') + const req = { + content:{ + subject:'subject1', + medium: 'medium1' + } + } + const option ={ + 'url':'content/v1/create','data':{'request':{'content':{'subject':['subject1'],'medium':['medium1']}}} + } + component.create(req); + expect(component.contentService.post).toBeCalled(); + expect(component.contentService.post).toBeCalledWith(option); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/services/review-comments/review-comments.service.spec.ts b/src/app/client/src/app/modules/workspace/services/review-comments/review-comments.service.spec.ts new file mode 100644 index 00000000000..d87ac4f7921 --- /dev/null +++ b/src/app/client/src/app/modules/workspace/services/review-comments/review-comments.service.spec.ts @@ -0,0 +1,65 @@ + +/** +* Description. +* This spec file was created using ng-test-barrel plugin! +* +*/ + +import { ConfigService } from '@sunbird/shared'; +import { ExtPluginService } from '@sunbird/core'; +import { ReviewCommentsService } from './review-comments.service'; + +describe('ReviewCommentsService', () => { + let component: ReviewCommentsService; + + const configService: Partial = { + urlConFig: { + URLS: { + REVIEW_COMMENT: { + READ: 'review/comment/v1/read/comment', + DELETE: 'review/comment/v1/delete/comment', + CREATE: 'review/comment/v1/create/comment' + } + } + } + }; + const extPluginService: Partial = { + post: jest.fn(), + delete: jest.fn(), + + }; + + beforeAll(() => { + component = new ReviewCommentsService( + configService as ConfigService, + extPluginService as ExtPluginService + ) + }); + + beforeEach(() => { + jest.clearAllMocks(); + jest.resetAllMocks(); + }); + + it('should call getComments', () => { + component.getComments({}); + expect(extPluginService.post).toHaveBeenCalled(); + }); + + it('should call createComment', () => { + component.createComment({}); + expect(extPluginService.post).toHaveBeenCalled(); + }); + + it('should call deleteComment', () => { + component.deleteComment({}); + expect(extPluginService.delete).toHaveBeenCalled(); + }); + + it('should set and get contextDetails correctly', () => { + const contextDetails = { example: 'details' }; + component.contextDetails = contextDetails; + const retrievedContextDetails = component.contextDetails; + expect(retrievedContextDetails).toEqual(contextDetails); + }); +}); \ No newline at end of file diff --git a/src/app/client/src/app/modules/workspace/workspace.module.ts b/src/app/client/src/app/modules/workspace/workspace.module.ts index 8a28b3f97aa..c3e8bcba048 100644 --- a/src/app/client/src/app/modules/workspace/workspace.module.ts +++ b/src/app/client/src/app/modules/workspace/workspace.module.ts @@ -5,7 +5,7 @@ import { WorkspaceRoutingModule } from './workspace-routing.module'; import { SharedModule } from '@sunbird/shared'; import { SuiModule } from '@project-sunbird/ng2-semantic-ui'; import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; -import { WorkSpaceService, EditorService , BatchService, ReviewCommentsService} from './services'; +import { WorkSpaceService, EditorService, BatchService, ReviewCommentsService } from './services'; import { WorkspaceComponent, CreateContentComponent, DraftComponent, ReviewSubmissionsComponent, PublishedComponent, UploadedComponent, @@ -23,7 +23,7 @@ import { TelemetryModule } from '@sunbird/telemetry'; import { ReviewCommentsComponent } from './components/review-comments/review-comments.component'; import { PlayerHelperModule } from '@sunbird/player-helper'; import { ContentSearchModule } from '@sunbird/content-search'; -// import { CollectionEditorLibraryModule } from '@project-sunbird/sunbird-collection-editor'; +import { CollectionEditorLibraryModule } from '@project-sunbird/sunbird-collection-editor'; import { MatTooltipModule } from '@angular/material/tooltip'; import { QuestionsetEditorLibraryModule } from '@project-sunbird/sunbird-questionset-editor'; @NgModule({ @@ -38,7 +38,7 @@ import { QuestionsetEditorLibraryModule } from '@project-sunbird/sunbird-questio TelemetryModule, PlayerHelperModule, ContentSearchModule, - // CollectionEditorLibraryModule, + CollectionEditorLibraryModule, MatTooltipModule, QuestionsetEditorLibraryModule ], diff --git a/src/app/client/src/app/plugins/profile/services/profile/profile.service.ts b/src/app/client/src/app/plugins/profile/services/profile/profile.service.ts index 502335fcb22..5105f2e9cd6 100644 --- a/src/app/client/src/app/plugins/profile/services/profile/profile.service.ts +++ b/src/app/client/src/app/plugins/profile/services/profile/profile.service.ts @@ -34,7 +34,7 @@ export class ProfileService { public updatePrivateProfile(request) { const data = this.formatRequest(request); const options = { - url: 'portal/user/v2/update', + url: 'portal/user/v3/update', data: data }; return this.learnerService.patch(options); diff --git a/src/app/client/src/assets/styles/components/_pagesection.scss b/src/app/client/src/assets/styles/components/_pagesection.scss index 78154fb65cf..64bfa4373e6 100644 --- a/src/app/client/src/assets/styles/components/_pagesection.scss +++ b/src/app/client/src/assets/styles/components/_pagesection.scss @@ -12,7 +12,7 @@ .sb-pageSection-title { font-size: calculateRem(16px); display: inline; - font-weight: 600; + font-weight: 500; line-height: normal; &.sb-pageSection-sentenceCase { text-transform: lowercase; diff --git a/src/app/client/src/assets/styles/global.scss b/src/app/client/src/assets/styles/global.scss index 35475035f02..803ddbf5ad5 100644 --- a/src/app/client/src/assets/styles/global.scss +++ b/src/app/client/src/assets/styles/global.scss @@ -18,7 +18,8 @@ // @include mat.core(); @include mat.core(); -$custom-typography: mat.define-typography-config($font-family: "var(--font-stack-en) !important", +$custom-typography: mat.define-typography-config( + $font-family: "var(--font-stack-en) !important", ); @include mat.all-component-typographies($custom-typography); @@ -127,6 +128,13 @@ body { } } +.sbt-dropdown-profile-area { + .sb-avatar__img { + font-weight: 600 !important; + padding-top: 0 !important; + } +} + // don't delete this .iziModal-isAttached { body { @@ -1560,3 +1568,9 @@ html[layout="joy"] .sb-modal-content .ui.center.aligned.segment { font-weight: normal; padding: calculateRem(10px) 0; } +.mat-mdc-tab-body.mat-mdc-tab-body-active{ + margin-top: 1rem; +} +.mat-mdc-tab .mdc-tab__text-label { + font-weight: bold; +} \ No newline at end of file diff --git a/src/app/client/yarn.lock b/src/app/client/yarn.lock index 42e4bfe317e..621003ba9f7 100644 --- a/src/app/client/yarn.lock +++ b/src/app/client/yarn.lock @@ -341,7 +341,7 @@ resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06" integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2": version "7.24.2" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== @@ -397,20 +397,20 @@ semver "^6.3.1" "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717" - integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a" + integrity sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.24.2" - "@babel/generator" "^7.24.4" + "@babel/generator" "^7.24.5" "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.24.4" - "@babel/parser" "^7.24.4" + "@babel/helper-module-transforms" "^7.24.5" + "@babel/helpers" "^7.24.5" + "@babel/parser" "^7.24.5" "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/traverse" "^7.24.5" + "@babel/types" "^7.24.5" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -427,12 +427,12 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/generator@^7.22.9", "@babel/generator@^7.23.0", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498" - integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw== +"@babel/generator@^7.22.9", "@babel/generator@^7.23.0", "@babel/generator@^7.24.5", "@babel/generator@^7.7.2": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.5.tgz#e5afc068f932f05616b66713e28d0f04e99daeb3" + integrity sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA== dependencies: - "@babel/types" "^7.24.0" + "@babel/types" "^7.24.5" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" @@ -462,19 +462,19 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3" - integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ== +"@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4", "@babel/helper-create-class-features-plugin@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz#7d19da92c7e0cd8d11c09af2ce1b8e7512a6e723" + integrity sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-member-expression-to-functions" "^7.23.0" + "@babel/helper-member-expression-to-functions" "^7.24.5" "@babel/helper-optimise-call-expression" "^7.22.5" "@babel/helper-replace-supers" "^7.24.1" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-split-export-declaration" "^7.24.5" semver "^6.3.1" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5": @@ -508,10 +508,10 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-define-polyfill-provider@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" - integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== +"@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -524,7 +524,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": +"@babel/helper-function-name@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== @@ -539,30 +539,30 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" - integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== +"@babel/helper-member-expression-to-functions@^7.23.0", "@babel/helper-member-expression-to-functions@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz#5981e131d5c7003c7d1fa1ad49e86c9b097ec475" + integrity sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA== dependencies: - "@babel/types" "^7.23.0" + "@babel/types" "^7.24.5" -"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.1": +"@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3": version "7.24.3" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== dependencies: "@babel/types" "^7.24.0" -"@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0", "@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== +"@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0", "@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz#ea6c5e33f7b262a0ae762fd5986355c45f54a545" + integrity sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A== dependencies: "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-module-imports" "^7.24.3" + "@babel/helper-simple-access" "^7.24.5" + "@babel/helper-split-export-declaration" "^7.24.5" + "@babel/helper-validator-identifier" "^7.24.5" "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" @@ -571,10 +571,10 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" - integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.24.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz#a924607dd254a65695e5bd209b98b902b3b2f11a" + integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ== "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5": version "7.22.20" @@ -594,12 +594,12 @@ "@babel/helper-member-expression-to-functions" "^7.23.0" "@babel/helper-optimise-call-expression" "^7.22.5" -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== +"@babel/helper-simple-access@^7.22.5", "@babel/helper-simple-access@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz#50da5b72f58c16b07fbd992810be6049478e85ba" + integrity sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.5" "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": version "7.22.5" @@ -608,22 +608,29 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.23.4": +"@babel/helper-split-export-declaration@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz#b9a67f06a46b0b339323617c8c6213b9055a78b6" + integrity sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q== + dependencies: + "@babel/types" "^7.24.5" + +"@babel/helper-string-parser@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== +"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62" + integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA== "@babel/helper-validator-option@^7.22.5", "@babel/helper-validator-option@^7.23.5": version "7.23.5" @@ -631,37 +638,37 @@ integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== "@babel/helper-wrap-function@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" - integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz#335f934c0962e2c1ed1fb9d79e06a56115067c09" + integrity sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw== dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.15" - "@babel/types" "^7.22.19" + "@babel/helper-function-name" "^7.23.0" + "@babel/template" "^7.24.0" + "@babel/types" "^7.24.5" -"@babel/helpers@^7.22.6", "@babel/helpers@^7.23.2", "@babel/helpers@^7.24.4": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6" - integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw== +"@babel/helpers@^7.22.6", "@babel/helpers@^7.23.2", "@babel/helpers@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.5.tgz#fedeb87eeafa62b621160402181ad8585a22a40a" + integrity sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q== dependencies: "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/traverse" "^7.24.5" + "@babel/types" "^7.24.5" "@babel/highlight@^7.24.2": - version "7.24.2" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" - integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.5.tgz#bc0613f98e1dd0720e99b2a9ee3760194a704b6e" + integrity sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw== dependencies: - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-validator-identifier" "^7.24.5" chalk "^2.4.2" js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7", "@babel/parser@^7.23.0", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88" - integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7", "@babel/parser@^7.23.0", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.5.tgz#4a4d5ab4315579e5398a82dcf636ca80c3392790" + integrity sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": version "7.24.1" @@ -893,11 +900,11 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-block-scoping@^7.22.5": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012" - integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz#89574191397f85661d6f748d4b89ee4d9ee69a2a" + integrity sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-transform-class-properties@^7.22.5": version "7.24.1" @@ -917,17 +924,17 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-transform-classes@^7.22.6": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1" - integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz#05e04a09df49a46348299a0e24bfd7e901129339" + integrity sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/helper-replace-supers" "^7.24.1" - "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-split-export-declaration" "^7.24.5" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.22.5": @@ -939,11 +946,11 @@ "@babel/template" "^7.24.0" "@babel/plugin-transform-destructuring@^7.22.5": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345" - integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz#80843ee6a520f7362686d1a97a7b53544ede453c" + integrity sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.24.1" @@ -1098,14 +1105,14 @@ "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-transform-object-rest-spread@^7.22.5": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" - integrity sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz#f91bbcb092ff957c54b4091c86bda8372f0b10ef" + integrity sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA== dependencies: "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.24.1" + "@babel/plugin-transform-parameters" "^7.24.5" "@babel/plugin-transform-object-super@^7.22.5": version "7.24.1" @@ -1124,20 +1131,20 @@ "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-transform-optional-chaining@^7.22.6", "@babel/plugin-transform-optional-chaining@^7.24.1": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6" - integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz#a6334bebd7f9dd3df37447880d0bd64b778e600f" + integrity sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.22.5", "@babel/plugin-transform-parameters@^7.24.1": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510" - integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg== +"@babel/plugin-transform-parameters@^7.22.5", "@babel/plugin-transform-parameters@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz#5c3b23f3a6b8fed090f9b98f2926896d3153cc62" + integrity sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-transform-private-methods@^7.22.5": version "7.24.1" @@ -1148,13 +1155,13 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-private-property-in-object@^7.22.5": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz#756443d400274f8fb7896742962cc1b9f25c1f6a" - integrity sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz#f5d1fcad36e30c960134cb479f1ca98a5b06eda5" + integrity sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.5" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-transform-property-literals@^7.22.5": @@ -1221,11 +1228,11 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-typeof-symbol@^7.22.5": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7" - integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz#703cace5ef74155fb5eecab63cbfc39bdd25fe12" + integrity sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.5" "@babel/plugin-transform-unicode-escapes@^7.22.5": version "7.24.1" @@ -1368,9 +1375,9 @@ regenerator-runtime "^0.13.11" "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd" - integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c" + integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g== dependencies: regenerator-runtime "^0.14.0" @@ -1392,29 +1399,29 @@ "@babel/parser" "^7.24.0" "@babel/types" "^7.24.0" -"@babel/traverse@^7.22.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.24.1": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" - integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== +"@babel/traverse@^7.22.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.5.tgz#972aa0bc45f16983bf64aa1f877b2dd0eea7e6f8" + integrity sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA== dependencies: - "@babel/code-frame" "^7.24.1" - "@babel/generator" "^7.24.1" + "@babel/code-frame" "^7.24.2" + "@babel/generator" "^7.24.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/helper-split-export-declaration" "^7.24.5" + "@babel/parser" "^7.24.5" + "@babel/types" "^7.24.5" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" - integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.24.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7" + integrity sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.24.1" + "@babel/helper-validator-identifier" "^7.24.5" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -3126,9 +3133,9 @@ which "^3.0.0" "@npmcli/installed-package-contents@^2.0.1": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33" - integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz#63048e5f6e40947a3a88dcbcb4fd9b76fdd37c17" + integrity sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w== dependencies: npm-bundled "^3.0.0" npm-normalize-package-bin "^3.0.0" @@ -3245,13 +3252,13 @@ dependencies: tslib "2.0.0" -"@project-sunbird/ng2-semantic-ui@8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@project-sunbird/ng2-semantic-ui/-/ng2-semantic-ui-8.0.2.tgz#9e9d8344395bc5f873a40c53fc2001e8b8df93eb" - integrity sha512-o2aOHUDVvjN9jGI4xE8IBy9ZUaEy43yp3NnXtf3/GJm7DRI+533yKaygs3yafZkh5f2xP1hcnHfvidhhIqgBHQ== +"@project-sunbird/ng2-semantic-ui@^8.0.3": + version "8.0.3" + resolved "https://registry.yarnpkg.com/@project-sunbird/ng2-semantic-ui/-/ng2-semantic-ui-8.0.3.tgz#2877869951e92d334955576d38cf9180a4c19e87" + integrity sha512-llany4yxiqUMQnmhGVAY+XAnt1uKBBSoeYjJvGvFFkZN0jlSX2beiUUyCROesPX/sgh5rEmRs76ppTxCGCszyA== dependencies: bowser "2.11.0" - date-fns "3.6.0" + date-fns "2.0.0-alpha.1" element-closest "3.0.2" is-ua-webview "1.1.2" popper.js "^1.16.1" @@ -3295,10 +3302,10 @@ resolved "https://registry.yarnpkg.com/@project-sunbird/sb-styles/-/sb-styles-0.0.14.tgz#f682ec7c03d7f3023c50e44973592edb51d03247" integrity sha512-pq4RqXPoqcTyncLz64gHu0AFVgl4KoL3yr+ocgdO4n26BkQZBgQG0xtuYqscUPPWVBg/BS4TCsjzMO+ifunRaA== -"@project-sunbird/sb-styles@0.0.16": - version "0.0.16" - resolved "https://registry.yarnpkg.com/@project-sunbird/sb-styles/-/sb-styles-0.0.16.tgz#a885816327ef3c7ef054b1e4706778135fdff04b" - integrity sha512-bQB1ZGEdxk7/mcDMjcY9d7C2tpJpinmBzbxOPV0YDoOiZVHv1haS+yFlUbxxgDz9hhrr3u6A+vBoBUaX2We5gA== +"@project-sunbird/sb-styles@0.0.17": + version "0.0.17" + resolved "https://registry.yarnpkg.com/@project-sunbird/sb-styles/-/sb-styles-0.0.17.tgz#7fc840c108bbd4399571ed28c413ed53d32eb1e7" + integrity sha512-DZNl2esoGwj2zEaGHyTKVmUj91xwr7PhbveDh5s8/GRM/O0WtxXlvsbhe+KEnZxPHsuK6I/9G5hDgngUSDI9yQ== "@project-sunbird/sb-svg2pdf@8.0.1": version "8.0.1" @@ -3307,17 +3314,17 @@ dependencies: tslib "^2.0.0" -"@project-sunbird/sb-themes@8.0.5": - version "8.0.5" - resolved "https://registry.yarnpkg.com/@project-sunbird/sb-themes/-/sb-themes-8.0.5.tgz#76fecfbb45344381dec50381992ee2b4acc7a722" - integrity sha512-Ywk1/Wz+QyIHauIEZzILwhrh11tFSMxZtkUCL3JFpY/u6Ejlovr5FwCqzI+7XUDnfCX4DNA5Zr8cEuZpvyH3YQ== +"@project-sunbird/sb-themes@8.0.8": + version "8.0.8" + resolved "https://registry.yarnpkg.com/@project-sunbird/sb-themes/-/sb-themes-8.0.8.tgz#f9e2fec462a259225364a4d3f845555fbe8859de" + integrity sha512-D9I+5N2I4pQRi2kiak0EnsCutsI4ZKcyQTS1Q/0YztahZobnQM/qK3wj5/T+4rOz+e/B7LTSZdxsikh9bUVkbA== dependencies: "@project-sunbird/sb-styles" "0.0.14" -"@project-sunbird/sunbird-collection-editor@5.4.10": - version "5.4.10" - resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-collection-editor/-/sunbird-collection-editor-5.4.10.tgz#2722576c6f81de8cffd2964a800d7256e2f9ec3b" - integrity sha512-uwBfO5zx7QLJgYTPIzLmOp6ReieZwT9f7zrUqXn0QZGD+yp6/WEV64neFKqrD7u09C8GCr1v2UiEnfANsP/qjQ== +"@project-sunbird/sunbird-collection-editor@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-collection-editor/-/sunbird-collection-editor-6.1.0.tgz#5887912c77f78acc91ad877c993a99409f8964fa" + integrity sha512-IYrvZZNab8YTZnRCfx1d+KAfXRBrJE8NljTH2ntDk4/+8CSJ0PVWd4IduaJ9dHFUbXHb+JTq6gMeMuN1IyNpEA== dependencies: tslib "^2.0.0" @@ -3329,11 +3336,6 @@ "@project-sunbird/sunbird-player-sdk-v9" "5.1.0" tslib "^2.0.0" -"@project-sunbird/sunbird-epub-player-web-component@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-epub-player-web-component/-/sunbird-epub-player-web-component-1.2.0.tgz#92a6d4de8ed6d953093ac4d57d6da54733359da2" - integrity sha512-YeunsOyPIRkWkHqr6rGbYcjOKwTkNhrUzcSNMDh8oZ+E/LfyZ54eKtUzSR/+0wjvvOk4W8GFyG7SorSh93pAkw== - "@project-sunbird/sunbird-file-upload-library@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-file-upload-library/-/sunbird-file-upload-library-1.0.2.tgz#331465c478d4df45cdbaa813c597296609892517" @@ -3361,10 +3363,10 @@ dependencies: ally.js "1.4.1" -"@project-sunbird/sunbird-questionset-editor@8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-questionset-editor/-/sunbird-questionset-editor-8.0.1.tgz#b055e5aef220136c1aa2884acc4b884f767716c7" - integrity sha512-5g1GcZUSW4K7xoALYeWhL/n+yGVfcP9CXcEAUER7aYAUo9Zbj5p4V0iv83EZFk5jSVwwGj6Fhf2x9waR1r7irg== +"@project-sunbird/sunbird-questionset-editor@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-questionset-editor/-/sunbird-questionset-editor-7.0.4.tgz#0414564f8c1ebf1e118a1c9a27c17378f858cda8" + integrity sha512-rhxOsLNaNqutNEAfDU0W7UsVzSZBJhKLmSHTuoT940qd25YPCMtowOLKwbicMop2KrO/ozfRTJjuJQo82k3hOA== dependencies: tslib "^2.0.0" @@ -3376,11 +3378,6 @@ "@project-sunbird/sunbird-player-sdk-v9" "5.1.0" tslib "^2.2.0" -"@project-sunbird/sunbird-quml-player-web-component@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-quml-player-web-component/-/sunbird-quml-player-web-component-4.0.0.tgz#5e821887ec8c4d3c0c5139eb710bb17afa3f5012" - integrity sha512-xoNBfo4fTPBWSZ94z6hGC15exR+kd6i56E2olzmgP2r+vuo6OjT5aTPnp9J3HPCKXn/JQcEzm4fD8rgqYSITtg== - "@project-sunbird/sunbird-quml-player@7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-quml-player/-/sunbird-quml-player-7.0.3.tgz#ded7524de332e6dbefa76adc1fd8b80055039191" @@ -3389,10 +3386,10 @@ "@project-sunbird/sunbird-player-sdk-v9" "5.1.0" tslib "^2.3.0" -"@project-sunbird/sunbird-resource-library@8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-resource-library/-/sunbird-resource-library-8.0.0.tgz#a4c565ed88c690832418294fa5b9bec7552b160a" - integrity sha512-3LwQ1o0q8hGXOcm8SlPf6FWRDDYfH5zQOM5szNyLtTyGafzynW+p4WalfvxwPherq5vshkeQt8T6kldi6FZWhg== +"@project-sunbird/sunbird-resource-library@7.0.3": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@project-sunbird/sunbird-resource-library/-/sunbird-resource-library-7.0.3.tgz#16573733455b76b0903b741c705f9cbdac25584a" + integrity sha512-Q1MhBNQIVrFAqGMBHQHq+uqVAbSUAbnaPo1zqy5l1vgvVOj32tm9Xz2kVLNU8vzOnEkRlh95+qsnw/icins5wQ== dependencies: tslib "^2.0.0" @@ -3421,13 +3418,6 @@ dependencies: tslib "^2.0.0" -"@samagra-x/uci-console@6.0.3": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@samagra-x/uci-console/-/uci-console-6.0.3.tgz#5b18ff5945428061bfc84aadf42fb00045d021e1" - integrity sha512-ex52/0zRXeSA0ay5p+LuLEais+cXVb+DkunALCV7gfD+NYE9F7qq0xB9Vj86yKcQV4blwhW9KZh8DwdxY/K03Q== - dependencies: - tslib "^2.0.0" - "@schematics/angular@16.2.12": version "16.2.12" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.12.tgz#13e00e7390903cfc00eb8d5c2e74986262aff6ec" @@ -3445,16 +3435,16 @@ "@angular-slider/ngx-slider" "^16.0.1" tslib "^2.0.0" -"@shikshalokam/sl-reports-library@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@shikshalokam/sl-reports-library/-/sl-reports-library-3.0.1.tgz#d135128acb8d6b0e141a38a734f8243b57789bbc" - integrity sha512-cNmIw82Y1f47b1zwxlZlxzttCfCAt1JyLT0+VJTOjUnLHSedvl6ebjasY65ooBiA3SEIwrtWoHZMVW8uqBeJdQ== +"@shikshalokam/sl-reports-library@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@shikshalokam/sl-reports-library/-/sl-reports-library-6.0.0.tgz#21133ec8f60ff7d30fa83bd97bbc9a3b3296ac68" + integrity sha512-jWfY3U90wmypd3Lk0N6BEdF3jdrQv7yDobKymGmtzFXnBNQV5MNotuAN5ZMnkdgNnGKf+0VM5ey68IQMgVfvOg== dependencies: - chart.js "^2.9.4" - chartjs-plugin-datalabels "^0.7.0" - chartjs-plugin-stacked100 "^0.7.1" - ng2-charts "^2.4.2" - tslib "^2.0.0" + chart.js "^4.4.0" + chartjs-plugin-datalabels "^2.2.0" + chartjs-plugin-stacked100 "^1.5.3" + ng2-charts "^5.0.4" + tslib "^2.3.0" "@sideway/address@^4.1.0": version "4.1.5" @@ -3619,13 +3609,6 @@ dependencies: "@types/node" "*" -"@types/chart.js@^2.9.24": - version "2.9.41" - resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.41.tgz#4148cdc87d4f98fad44b2883271cd0fa57f05e0d" - integrity sha512-3dvkDvueckY83UyUXtJMalYoH6faOLkWQoaTlJgB4Djde3oORmNP0Jw85HtzTuXyliUHcdp704s0mZFQKio/KQ== - dependencies: - moment "^2.10.2" - "@types/connect-history-api-fallback@^1.3.5": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" @@ -3657,9 +3640,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.56.9" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.9.tgz#403e9ced04a34e63f1c383c5b8ee1a94442c8cc4" - integrity sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg== + version "8.56.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -3947,10 +3930,10 @@ mux.js "6.0.1" video.js "^6 || ^7" -"@videojs/http-streaming@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-3.10.0.tgz#b20eaf7246cc014f2715c967a9cdc4240b6e7e61" - integrity sha512-Lf1rmhTalV4Gw0bJqHmH4lfk/FlepUDs9smuMtorblAYnqDlE2tbUOb7sBXVYoXGdbWbdTW8jH2cnS+6HWYJ4Q== +"@videojs/http-streaming@3.12.1": + version "3.12.1" + resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-3.12.1.tgz#0d924879bc395e66e1d112698e0f54920ffae1d7" + integrity sha512-rpB5AMt0QZ9bMXzwiWhynF2NLNnm5g2DZjPOFX6OoFqqXhbe2ngY2nqm9lLRhRVe22YeysQCmAlvBNwGuWFI8Q== dependencies: "@babel/runtime" "^7.12.5" "@videojs/vhs-utils" "4.0.0" @@ -3958,7 +3941,7 @@ global "^4.4.0" m3u8-parser "^7.1.0" mpd-parser "^1.3.0" - mux.js "7.0.2" + mux.js "7.0.3" video.js "^7 || ^8" "@videojs/vhs-utils@3.0.4": @@ -4315,7 +4298,7 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@8.12.0, ajv@^8.0.0, ajv@^8.9.0: +ajv@8.12.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -4335,6 +4318,16 @@ ajv@^6.12.3, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.0, ajv@^8.9.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.13.0.tgz#a3939eaec9fb80d217ddf0c3376948c023f28c91" + integrity sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA== + dependencies: + fast-deep-equal "^3.1.3" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.4.1" + ally.js@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/ally.js/-/ally.js-1.4.1.tgz#9fb7e6ba58efac4ee9131cb29aa9ee3b540bcf1e" @@ -4713,12 +4706,12 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__traverse" "^7.0.6" babel-plugin-polyfill-corejs2@^0.4.4: - version "0.4.10" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" - integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== + version "0.4.11" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" semver "^6.3.1" babel-plugin-polyfill-corejs3@^0.8.2: @@ -5111,9 +5104,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001587: - version "1.0.30001610" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf" - integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA== + version "1.0.30001614" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001614.tgz#f894b4209376a0bf923d67d9c361d96b1dfebe39" + integrity sha512-jmZQ1VpmlRwHgdP1/uiKzgiAuGOfLEJsYFP4+GBou/QQ4U6IOJCB4NP1c+1p9RGLpwObcT94jA5/uO+F1vBbog== canonicalize@^1.0.1: version "1.0.8" @@ -5194,7 +5187,7 @@ chart.js@4.1.1: dependencies: "@kurkle/color" "^0.3.0" -chart.js@^2.4.0, chart.js@^2.9.4: +chart.js@^2.4.0: version "2.9.4" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684" integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A== @@ -5202,6 +5195,13 @@ chart.js@^2.4.0, chart.js@^2.9.4: chartjs-color "^2.1.0" moment "^2.10.2" +chart.js@^4.4.0: + version "4.4.2" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.2.tgz#95962fa6430828ed325a480cc2d5f2b4e385ac31" + integrity sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg== + dependencies: + "@kurkle/color" "^0.3.0" + chartjs-color-string@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" @@ -5224,17 +5224,15 @@ chartjs-plugin-annotation@^0.5.7: dependencies: chart.js "^2.4.0" -chartjs-plugin-datalabels@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-0.7.0.tgz#f72e44edb2db45ef68913e9320bcc50398a205e6" - integrity sha512-PKVUX14nYhH0wcdCpgOoC39Gbzvn6cZ7O9n+bwc02yKD9FTnJ7/TSrBcfebmolFZp1Rcicr9xbT0a5HUbigS7g== +chartjs-plugin-datalabels@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz#369578e131d743c2e34b5fbe2d3f9335f6639b8f" + integrity sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw== -chartjs-plugin-stacked100@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/chartjs-plugin-stacked100/-/chartjs-plugin-stacked100-0.7.1.tgz#f89579fc15045f4203e4a16a1cac196d874817fc" - integrity sha512-3EoEXzKxJcRDrKe1dBYcPMbHpCppBgAsYApyEGiIXHaQS/SZRY+VEQsnyPTnIbewA792g19hTlkhpRLS1PVGzQ== - dependencies: - chart.js "^2.4.0" +chartjs-plugin-stacked100@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/chartjs-plugin-stacked100/-/chartjs-plugin-stacked100-1.5.3.tgz#fc7f9748b01a1046d94413975c9685f6be23aff2" + integrity sha512-BvMRKLmhj4I3xtU1AATHmel/1i8r7LTvYJRH2t43nl2aq9AyC3CSWQYSCt0NZJT5LraoBJsBtrIvNImhnqpW6g== chokidar@3.5.3: version "3.5.3" @@ -5287,9 +5285,9 @@ ci-info@^3.2.0: integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== cjs-module-lexer@^1.0.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" - integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== + version "1.3.1" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c" + integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q== ckeditor5@^28.0.0: version "28.0.0" @@ -5580,9 +5578,9 @@ copy-webpack-plugin@11.0.0: serialize-javascript "^6.0.0" core-js-compat@^3.31.0, core-js-compat@^3.33.1: - version "3.36.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.1.tgz#1818695d72c99c25d621dca94e6883e190cea3c8" - integrity sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA== + version "3.37.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" + integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== dependencies: browserslist "^4.23.0" @@ -5592,9 +5590,9 @@ core-js@2.4.1: integrity sha512-W4Zkayb9VI4zr+s7ReDSgTTaV9KWB4L997i8/mkOV2kY1c7QGNj91k8X0zcr8Tl24oYF6kiBomCDSYO4BvQQdQ== core-js@^3.18.3, core-js@^3.6.0, core-js@^3.8.3: - version "3.36.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.1.tgz#c97a7160ebd00b2de19e62f4bbd3406ab720e578" - integrity sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA== + version "3.37.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb" + integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug== core-util-is@1.0.2: version "1.0.2" @@ -5843,10 +5841,10 @@ datatables.net@2.0.3: dependencies: jquery ">=1.7" -date-fns@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" - integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== +date-fns@2.0.0-alpha.1: + version "2.0.0-alpha.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.1.tgz#f45e477cf3414269d97fb1aae899035f3b308474" + integrity sha512-4gYdF1rDgv9X/0ko69pt+FgpQtDU5rgqZVmckIOhDicfCSTndwHMhUhLJw+pa4DlPdzIkEBtHg6L6VlQ6ueD1g== dayjs@1.11.9: version "1.11.9" @@ -5859,9 +5857,9 @@ dayjs@1.9.8: integrity sha512-F42qBtJRa30FKF7XDnOQyNUTsaxDkuaZRj/i7BejSHC34LlLfPoIU4aeopvWfM+m1dJ6/DHKAWLg2ur+pLgq1w== dayjs@^1.11.5: - version "1.11.10" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" - integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== + version "1.11.11" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e" + integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg== debug@2.6.9: version "2.6.9" @@ -5985,7 +5983,7 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: +define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -6129,9 +6127,9 @@ domhandler@^5.0.2, domhandler@^5.0.3: domelementtype "^2.3.0" dompurify@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.0.tgz#13b1115d79b9340e6db80b4624653f665885b15f" - integrity sha512-5RXhAXSCrKTqt9pSbobT9PVRX+oPpENplTZqCiK1l0ya+ZOzwo9kqsGLbYRsAhzIiLCwKEy99XKSSrqnRTLVcw== + version "2.5.2" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.2.tgz#e02be61d621bea36a76eb2beb23b043f347aa9c7" + integrity sha512-5vSyvxRAb45EoWwAktUT3AYqAwXK4FL7si22Cgj46U6ICsj/YJczCN+Bk7WNABIQmpWRymGfslMhrRUZkQNnqA== domutils@^3.0.1: version "3.1.0" @@ -6174,9 +6172,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.668: - version "1.4.737" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde" - integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw== + version "1.4.751" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.751.tgz#b5b19742a435c589de02f60c16618150498bbd59" + integrity sha512-2DEPi++qa89SMGRhufWTiLmzqyuGmNF3SK4+PQetW1JKiZdEpF4XQonJXJCzyuYSA6mauiMhbyVhqYAP45Hvfw== element-closest@3.0.2: version "3.0.2" @@ -6339,9 +6337,9 @@ es-errors@^1.2.1, es-errors@^1.3.0: integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== es-module-lexer@^1.2.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236" - integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw== + version "1.5.2" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.2.tgz#00b423304f2500ac59359cc9b6844951f372d497" + integrity sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA== es-object-atoms@^1.0.0: version "1.0.0" @@ -7338,11 +7336,12 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" + integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== dependencies: - define-properties "^1.1.3" + define-properties "^1.2.1" + gopd "^1.0.1" globby@^13.1.1: version "13.2.2" @@ -7955,9 +7954,9 @@ ipaddr.js@1.9.1: integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipaddr.js@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" - integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== is-absolute@^1.0.0: version "1.0.0" @@ -9263,9 +9262,9 @@ log-symbols@^4.1.0: is-unicode-supported "^0.1.0" lru-cache@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + version "10.2.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== lru-cache@^5.1.1: version "5.1.1" @@ -9724,15 +9723,7 @@ mux.js@6.0.1: "@babel/runtime" "^7.11.2" global "^4.4.0" -mux.js@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-7.0.2.tgz#410641dc922c5d173d7ce45fbdb2bb9e2a69137c" - integrity sha512-CM6+QuyDbc0qW1OfEjkd2+jVKzTXF+z5VOKH0eZxtZtnrG/ilkW/U7l7IXGtBNLASF9sKZMcK1u669cq50Qq0A== - dependencies: - "@babel/runtime" "^7.11.2" - global "^4.4.0" - -mux.js@^7.0.1: +mux.js@7.0.3, mux.js@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-7.0.3.tgz#18fbbc607faeeaa8c897e0410d2067be2bdc7e1e" integrity sha512-gzlzJVEGFYPtl2vvEiJneSWAWD4nfYRHD5XgxmB2gWvXraMPOYk+sxfvexmNfjQUFpmk6hwLR5C6iSFmuwCHdQ== @@ -9801,7 +9792,7 @@ ng2-charts@3.0.8: lodash-es "^4.17.15" tslib "^2.3.0" -ng2-charts@5.0.4: +ng2-charts@5.0.4, ng2-charts@^5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-5.0.4.tgz#306431e8b28532e22bcd877622b990c306516508" integrity sha512-AnOZ2KSRw7QjiMMNtXz9tdnO+XrIKP/2MX1TfqEEo2fwFU5c8LFJIYqmkMPkIzAEm/U9y/1psA5TDNmxxjEdgA== @@ -9809,15 +9800,6 @@ ng2-charts@5.0.4: lodash-es "^4.17.15" tslib "^2.3.0" -ng2-charts@^2.4.2: - version "2.4.3" - resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-2.4.3.tgz#e1de6cb55fe04248a5f92d342cf6423507fa532d" - integrity sha512-tPrhHSS2DfVyipXQ0gykOPc8zFNnj2b7sAebUVty392vHnEGYCwsP6YbFfpr1iXu4yBSRm4Gt5lffR5w0uyYSw== - dependencies: - "@types/chart.js" "^2.9.24" - lodash-es "^4.17.15" - tslib "^2.0.0" - ng2-material-dropdown@>=0.11.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ng2-material-dropdown/-/ng2-material-dropdown-1.0.0.tgz#1d8a5ff5926fcf0b64a2094a36fcfeb54f08fb43" @@ -10081,9 +10063,9 @@ nth-check@^2.0.1: boolbase "^1.0.0" nwsapi@^2.2.0, nwsapi@^2.2.2: - version "2.2.7" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + version "2.2.9" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.9.tgz#7f3303218372db2e9f27c27766bcfc59ae7e61c6" + integrity sha512-2f3F0SEEer8bBu0dsNCFF50N0cTThV1nWFYcEYFZttdW0lDAoybv9cQoK7X7/68Z89S7FoRrVjP1LPX4XRf9vg== oauth-sign@~0.9.0: version "0.9.0" @@ -10847,9 +10829,9 @@ rdf-canonize@^3.0.0, rdf-canonize@^3.4.0: setimmediate "^1.0.5" react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== read-package-json-fast@^3.0.0: version "3.0.2" @@ -11839,7 +11821,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -11899,7 +11890,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11913,6 +11904,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -12054,9 +12052,9 @@ terser@5.19.2: source-map-support "~0.5.20" terser@^5.26.0: - version "5.30.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" - integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== + version "5.31.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.0.tgz#06eef86f17007dbad4593f11a574c7f5eb02c6a1" + integrity sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -12169,9 +12167,9 @@ totalist@^1.0.0: integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== tough-cookie@^4.0.0, tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -12415,6 +12413,13 @@ typescript@4.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +uci-console-v16@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/uci-console-v16/-/uci-console-v16-8.0.0.tgz#f30aea7d5f4626c1323d477a3cf1e8d01de13f3e" + integrity sha512-mzu//0AQIrPuzi0rL/M8EKRDuUV2IK8UD2/A/3KvNvocgugL/FvOSLPhIZ7FhSCa5AlRx0SOCRBm1oBPeho09Q== + dependencies: + tslib "^2.0.0" + unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" @@ -12534,7 +12539,7 @@ update-browserslist-db@^1.0.13: escalade "^3.1.1" picocolors "^1.0.0" -uri-js@^4.2.2: +uri-js@^4.2.2, uri-js@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== @@ -12673,12 +12678,12 @@ video.js@7.18.1: videojs-vtt.js "^0.15.5" "video.js@^6 || ^7 || ^8", "video.js@^7 || ^8": - version "8.10.0" - resolved "https://registry.yarnpkg.com/video.js/-/video.js-8.10.0.tgz#603a49909ef33f839264da8b73513f9daf592b57" - integrity sha512-7UeG/flj/pp8tNGW8WKPP1VJb3x2FgLoqUWzpZqkoq5YIyf6MNzmIrKtxprl438T5RVkcj+OzV8IX4jYSAn4Sw== + version "8.12.0" + resolved "https://registry.yarnpkg.com/video.js/-/video.js-8.12.0.tgz#f85295f55afbef8b29d885e23777d3a64651f536" + integrity sha512-bLjfg3y09CAed1xZ4FujdTW7G9kgL0CJHaBnDKwBUgYuutijCutYPP5yQGCdN6VOi76uEuOpINwmTJSJia6zww== dependencies: "@babel/runtime" "^7.12.5" - "@videojs/http-streaming" "3.10.0" + "@videojs/http-streaming" "3.12.1" "@videojs/vhs-utils" "^4.0.0" "@videojs/xhr" "2.6.0" aes-decrypter "^4.0.1" @@ -12688,7 +12693,7 @@ video.js@7.18.1: mpd-parser "^1.2.2" mux.js "^7.0.1" safe-json-parse "4.0.0" - videojs-contrib-quality-levels "4.0.0" + videojs-contrib-quality-levels "4.1.0" videojs-font "4.1.0" videojs-vtt.js "0.15.5" @@ -12700,10 +12705,10 @@ videojs-contrib-quality-levels@2.1.0: global "^4.3.2" video.js "^6 || ^7" -videojs-contrib-quality-levels@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.0.0.tgz#faa8096594cdbfc3ccbefe8572fc20531ba23f3d" - integrity sha512-u5rmd8BjLwANp7XwuQ0Q/me34bMe6zg9PQdHfTS7aXgiVRbNTb4djcmfG7aeSrkpZjg+XCLezFNenlJaCjBHKw== +videojs-contrib-quality-levels@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.1.0.tgz#44c2d2167114a5c8418548b10a25cb409d6cba51" + integrity sha512-TfrXJJg1Bv4t6TOCMEVMwF/CoS8iENYsWNKip8zfhB5kTcegiFYezEA0eHAJPU64ZC8NQbxQgOwAsYU8VXbOWA== dependencies: global "^4.4.0" @@ -13176,7 +13181,7 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -13194,6 +13199,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -13222,9 +13236,9 @@ ws@^7.3.1, ws@^7.4.6: integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== ws@^8.11.0, ws@^8.13.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + version "8.17.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== xml-name-validator@^3.0.0: version "3.0.0" diff --git a/src/app/helpers/googleOauthHelper.js b/src/app/helpers/googleOauthHelper.js index c41d7d3d409..dec51966263 100644 --- a/src/app/helpers/googleOauthHelper.js +++ b/src/app/helpers/googleOauthHelper.js @@ -223,7 +223,7 @@ const createSession = async (emailId, reqQuery, req, res) => { const fetchUserByEmailId = async (emailId, req) => { const options = { method: 'GET', - url: envHelper.LEARNER_URL + 'user/v1/exists/email/'+ emailId, + url: envHelper.LEARNER_URL + 'user/v2/exists/email/'+ emailId, headers: getHeaders(req), json: true } diff --git a/src/app/helpers/googleService.js b/src/app/helpers/googleService.js index bfe78e200d5..40c399b29d9 100644 --- a/src/app/helpers/googleService.js +++ b/src/app/helpers/googleService.js @@ -11,12 +11,12 @@ const { parseJson } = require('./utilityService'); const validateRecaptcha = async (req, res, next) => { let errType; const reCaptchaMapping = { - '/learner/user/v1/exists/email/:emailId': envHelper.sunbird_p1_reCaptcha_enabled, - '/learner/user/v1/exists/phone/:phoneNumber': envHelper.sunbird_p1_reCaptcha_enabled, + '/learner/user/v2/exists/email/:emailId': envHelper.sunbird_p1_reCaptcha_enabled, + '/learner/user/v2/exists/phone/:phoneNumber': envHelper.sunbird_p1_reCaptcha_enabled, '/learner/user/v1/fuzzy/search': envHelper.sunbird_p1_reCaptcha_enabled, '/learner/user/v1/get/phone/*': envHelper.sunbird_p1_reCaptcha_enabled, '/learner/user/v1/get/email/*': envHelper.sunbird_p1_reCaptcha_enabled, - '/learner/anonymous/otp/v1/generate': envHelper.sunbird_p2_reCaptcha_enabled + '/learner/anonymous/otp/v2/generate': envHelper.sunbird_p2_reCaptcha_enabled }; if (_.get(reCaptchaMapping, req.route.path)) { try { diff --git a/src/app/helpers/logFeature.js b/src/app/helpers/logFeature.js new file mode 100644 index 00000000000..19113fc46e4 --- /dev/null +++ b/src/app/helpers/logFeature.js @@ -0,0 +1,42 @@ +'use strict'; +/** + * @file - Handle logs for the features of Portal API(s) + * @since release-8.0.0 + * @version 1.0 + */ + +const _ = require('lodash'); +const { pathToRegexp } = require("path-to-regexp"); +const API_LIST = require('./whitelistApis.js'); +/** + * @description - Function to check whether + * 1. Incoming API is having feature id (or) not + * 2. If API does not exists then normal flow is contiued + * 3. If incoming API is present in API_LIST ; then check URL pattern matching and add feature id to req for corresponding API + * 4. Refer `API_LIST` + * @since release-8.0.0 + */ +const mapFeature = () => { + return function (req, res, next) { + let REQ_URL = req.path; + + _.forEach(API_LIST.URL_PATTERN, (url) => { + let regExp = pathToRegexp(url); + if (regExp.test(REQ_URL)) { + REQ_URL = url; + return false; + } + }); + + const urlMap = API_LIST.URL[REQ_URL]; + if (urlMap) { + req.headers['X-Feature-Name'] = urlMap.featureName || null; + next(); + } + else next(); + } +}; + +module.exports = { + mapFeature +}; diff --git a/src/app/helpers/ssoHelper.js b/src/app/helpers/ssoHelper.js index 8bf8c0a9322..ca329c19669 100644 --- a/src/app/helpers/ssoHelper.js +++ b/src/app/helpers/ssoHelper.js @@ -245,7 +245,7 @@ const updateRoles = (req, userId, jwtPayload) => { // will be called from player } const options = { method: 'POST', - url: envHelper?.learner_Service_Local_BaseUrl + privateBaseUrl +'v1/assign/role', + url: envHelper?.learner_Service_Local_BaseUrl + privateBaseUrl +'v2/assign/role', headers: getHeaders(req), body: { request: requestBody diff --git a/src/app/helpers/telemetryEventConfig.json b/src/app/helpers/telemetryEventConfig.json index 87db811797c..e0dd7c788d8 100644 --- a/src/app/helpers/telemetryEventConfig.json +++ b/src/app/helpers/telemetryEventConfig.json @@ -17,10 +17,10 @@ "message": "Calling role read api to get permisions", "env": "user" }, - "user/v1/read": { + "user/v5/read": { "title": "Read user profile", "category": "userread", - "url": "user/v1/read", + "url": "user/v5/read", "message": "Calling get user profile", "env": "user" }, @@ -52,10 +52,10 @@ "message": "Calling get user profile", "env": "user" }, - "user/v1/create": { + "user/v1/sso/create": { "title": "Create user profile", "category": "createuser", - "url": "user/v1/create", + "url": "user/v1/sso/create", "message": "Calling create user", "env": "user" }, diff --git a/src/app/helpers/telemetryHelper.js b/src/app/helpers/telemetryHelper.js index de18ac0ddb5..eba1f90ed48 100644 --- a/src/app/helpers/telemetryHelper.js +++ b/src/app/helpers/telemetryHelper.js @@ -158,7 +158,7 @@ module.exports = { */ logAPICallEvent: function (req) { // function call is commented in all files const apiConfig = telemtryEventConfig.URL[req.uri] || {} - + let object = {} const params = this.getParamsData(req.options, req.statusCode, req.resp, req.uri) const edata = telemetry.logEventData('api_call', 'INFO', apiConfig.message, params) @@ -228,7 +228,7 @@ module.exports = { params = this.getParamsData(req.reqObj, req.statusCode, req.resp, uri) } - const edata = telemetry.logEventData('api_access', 'INFO', apiConfig.message,JSON.stringify(params)) + const edata = telemetry.logEventData('api_access', 'INFO', apiConfig.message, JSON.stringify(params)) if (req.id && req.type) { object = telemetry.getObjectData({ id: req.id, type: req.type, ver: req.version, rollup: req.rollup }) @@ -310,7 +310,7 @@ module.exports = { } const actor = this.getTelemetryActorData(req); - + /* istanbul ignore if */ if (!channel) { console.log('logApiErrorEventV2 failed due to no channel') diff --git a/src/app/helpers/trampolineServiceHelper.js b/src/app/helpers/trampolineServiceHelper.js index 2b82f90a8e8..8f8d32f7f75 100644 --- a/src/app/helpers/trampolineServiceHelper.js +++ b/src/app/helpers/trampolineServiceHelper.js @@ -225,7 +225,7 @@ module.exports = { createUser: function (req, payload, callback) { var options = { method: 'POST', - url: learnerURL + 'user/v1/create', + url: learnerURL + 'user/v1/sso/create', headers: { ts: dateFormat(new Date(), 'yyyy-mm-dd HH:MM:ss:lo'), 'x-msgid': uuidv1(), @@ -253,7 +253,7 @@ module.exports = { const telemetryData = { reqObj: req, options: options, - uri: 'user/v1/create', + uri: 'user/v1/sso/create', type: 'user', id: options.headers['x-consumer-id'], userId: options.headers['x-consumer-id'] diff --git a/src/app/helpers/userHelper.js b/src/app/helpers/userHelper.js index 4e0ef4e3847..0c9fe9ca723 100644 --- a/src/app/helpers/userHelper.js +++ b/src/app/helpers/userHelper.js @@ -14,7 +14,7 @@ module.exports = { getUserDetails: async function (userId, userToken) { const options = { method: 'GET', - url: learnerURL + 'user/v1/read/' + userId, + url: learnerURL + 'user/v5/read/' + userId, headers: { 'x-msgid': uuidv1(), 'content-type': 'application/json', @@ -71,7 +71,7 @@ module.exports = { getUserDetailsV2: async function (userId, userToken, req = undefined) { const options = { method: 'GET', - url: learnerURL + 'user/v2/read/' + userId, + url: learnerURL + 'user/v5/read/' + userId, qs: { fields: "locations" }, diff --git a/src/app/helpers/whitelistApis.js b/src/app/helpers/whitelistApis.js index 2abac3b6e4a..2a238772192 100644 --- a/src/app/helpers/whitelistApis.js +++ b/src/app/helpers/whitelistApis.js @@ -24,7 +24,7 @@ const ROLE = { TEMP_ROLE: 'TEMP_ROLE', // Use only for deprecated APIs ALL: 'ALL', // Use when user does not have PUBLIC role (Case: User bulk upload), ANONYMOUS: 'ANONYMOUS', - PROGRAM_MANAGER:"PROGRAM_MANAGER", + PROGRAM_MANAGER: "PROGRAM_MANAGER", PROGRAM_DESIGNER: "PROGRAM_DESIGNER" }; @@ -65,6 +65,7 @@ const API_LIST = { ROLE_CHECK: [ROLE.CONTENT_REVIEWER, ROLE.BOOK_REVIEWER, ROLE.FLAG_REVIEWER] }, '/content/content/v1/publish': { + featureName: 'ContentPublish', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.CONTENT_REVIEWER, ROLE.BOOK_REVIEWER, ROLE.FLAG_REVIEWER] }, @@ -164,6 +165,7 @@ const API_LIST = { ROLE_CHECK: [ROLE.CONTENT_CREATOR, ROLE.COURSE_CREATOR, ROLE.BOOK_CREATOR] }, '/content/content/v1/publish/:do_id': { + featureName: 'ContentPublish', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.CONTENT_REVIEWER, ROLE.BOOK_REVIEWER] }, @@ -430,11 +432,12 @@ const API_LIST = { }, //User related APIs - '/learner/user/v1/create': { + '/learner/user/v1/sso/create': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, '/learner/user/v1/delete': { + featureName:'DeleteUser', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, @@ -455,11 +458,11 @@ const API_LIST = { ] } }, - '/learner/user/v1/get': { + '/learner/user/v2/get': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, - '/learner/user/v1/exists': { + '/learner/user/v2/exists': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, @@ -494,7 +497,7 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, - '/learner/user/v2/search': { + '/learner/user/v3/search': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, @@ -520,7 +523,7 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL] }, - '/learner/user/v1/consent/read': { + '/learner/user/v2/consent/read': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC, ROLE.ADMIN] }, @@ -544,12 +547,12 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, - '/learner/user/v1/managed/create': { + '/learner/user/v2/managed/create': { description: 'API is to create managed user', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, - '/learner/portal/user/v2/update': { + '/learner/portal/user/v3/update': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ORG_ADMIN] }, @@ -582,7 +585,7 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, - '/learner/otp/v1/verify': { + '/learner/otp/v2/verify': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, @@ -683,19 +686,19 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, - '/learner/user/v1/exists/email/:emailId': { + '/learner/user/v2/exists/email/:emailId': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, - '/learner/user/v1/exists/phone/:phoneNumber': { + '/learner/user/v2/exists/phone/:phoneNumber': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, - '/learner/anonymous/otp/v1/generate': { + '/learner/anonymous/otp/v2/generate': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, - '/learner/anonymous/delete/otp/v1/generate': { + '/learner/anonymous/delete/otp/v2/generate': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ANONYMOUS] }, @@ -893,6 +896,7 @@ const API_LIST = { ] }, '/action/content/v3/publish/:do_id': { + featureName: 'ContentPublish', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ ROLE.CONTENT_REVIEWER, @@ -1253,7 +1257,7 @@ const API_LIST = { }, // User service - '/action/user/v1/search': { + '/action/user/v3/search': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ ROLE.CONTENT_CREATOR, @@ -1362,7 +1366,7 @@ const API_LIST = { ROLE_CHECK: [ROLE.ANONYMOUS] }, '/apple/auth': { - checksNeeded: [] + checksNeeded: [] }, // discussion forum apis '/discussion/user/v1/create': { @@ -1646,6 +1650,7 @@ const API_LIST = { ] }, '/action/questionset/v2/publish/:do_id': { + featureName: 'QuestionsetPublish', description: 'QuestionSet publish', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ @@ -1664,6 +1669,18 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.PUBLIC] }, + '/action/questionset/v2/comment/read/:do_id': { + description: 'Question comment read', + checksNeeded: ['ROLE_CHECK'], + ROLE_CHECK: [ROLE.PUBLIC] + }, + '/action/questionset/v2/comment/update/:do_id': { + description: 'QuestionSet comment update', + checksNeeded: ['ROLE_CHECK'], + ROLE_CHECK: [ + ROLE.CONTENT_REVIEWER + ] + }, '/action/questionset/v2/hierarchy/:do_id': { description: 'QuestionSet hierarchy read', checksNeeded: ['ROLE_CHECK'], @@ -1696,6 +1713,7 @@ const API_LIST = { ] }, '/action/question/v2/publish/:do_id': { + featureName: 'QuestionPublish', description: 'Question publish', checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ @@ -1727,11 +1745,11 @@ const API_LIST = { }, '/report/request/list/:tag': { checksNeeded: ['ROLE_CHECK'], - ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR,ROLE.PROGRAM_DESIGNER,ROLE.PROGRAM_MANAGER] + ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR, ROLE.PROGRAM_DESIGNER, ROLE.PROGRAM_MANAGER] }, '/dataset/v1/request/list/:tag': { checksNeeded: ['ROLE_CHECK'], - ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR,ROLE.PROGRAM_DESIGNER,ROLE.PROGRAM_MANAGER] + ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR, ROLE.PROGRAM_DESIGNER, ROLE.PROGRAM_MANAGER] }, '/report/request/read/:tag': { checksNeeded: ['ROLE_CHECK'], @@ -1743,11 +1761,11 @@ const API_LIST = { }, '/report/request/submit': { checksNeeded: ['ROLE_CHECK'], - ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR,ROLE.PROGRAM_DESIGNER,ROLE.PROGRAM_MANAGER] + ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR, ROLE.PROGRAM_DESIGNER, ROLE.PROGRAM_MANAGER] }, '/dataset/v1/request/submit': { checksNeeded: ['ROLE_CHECK'], - ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR,ROLE.PROGRAM_DESIGNER,ROLE.PROGRAM_MANAGER] + ROLE_CHECK: [ROLE.ORG_ADMIN, ROLE.CONTENT_CREATOR, ROLE.COURSE_MENTOR, ROLE.PROGRAM_DESIGNER, ROLE.PROGRAM_MANAGER] }, '/kendra/entities/mlcore/v1/entityTypesByLocationAndRole/:stateId': { checksNeeded: ['ROLE_CHECK'], @@ -1757,7 +1775,7 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL, ROLE.PUBLIC] }, - '/kendra/resource/mlreports/v1/filtervalues':{ + '/kendra/resource/mlreports/v1/filtervalues': { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL, ROLE.PUBLIC] }, @@ -1825,11 +1843,11 @@ const API_LIST = { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL, ROLE.PUBLIC] }, - "/assessment/programs/mlcore/v1/join/:id":{ + "/assessment/programs/mlcore/v1/join/:id": { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL, ROLE.PUBLIC] }, - "/assessment/users/mlcore/v1/solutions/:id":{ + "/assessment/users/mlcore/v1/solutions/:id": { checksNeeded: ['ROLE_CHECK'], ROLE_CHECK: [ROLE.ALL, ROLE.PUBLIC] }, @@ -1942,8 +1960,8 @@ const API_LIST = { '/learner/user/v1/feed/:userId', '/learner/course/v1/batch/read/:batchId', '/learner/dashboard/v2/progress/course/:batchId', - '/learner/user/v1/exists/email/:emailId', - '/learner/user/v1/exists/phone/:phoneNumber', + '/learner/user/v2/exists/email/:emailId', + '/learner/user/v2/exists/phone/:phoneNumber', '/learner/group/v1/read/:groupId', '/learner/user/v2/exists/:key/:value', '/learner/certreg/v2/certs/download/:id', @@ -2030,6 +2048,8 @@ const API_LIST = { '/action/questionset/v2/publish/:do_id', '/action/questionset/v2/reject/:do_id', '/action/questionset/v2/read/:do_id', + '/action/questionset/v2/comment/read/:do_id', + '/action/questionset/v2/comment/update/:do_id', '/action/questionset/v2/hierarchy/:do_id', '/content/questionset/v2/copy/:do_id', '/action/question/v2/read/:do_id', @@ -2075,4 +2095,5 @@ const API_LIST = { '/learner/user/v1/delete', ] }; -module.exports = API_LIST; + +module.exports = API_LIST; \ No newline at end of file diff --git a/src/app/proxy/contentEditorProxy.js b/src/app/proxy/contentEditorProxy.js index 070741908c1..c5409127397 100644 --- a/src/app/proxy/contentEditorProxy.js +++ b/src/app/proxy/contentEditorProxy.js @@ -2,14 +2,14 @@ const utils = require('../helpers/utils.js'); const proxyUtils = require('./proxyUtils.js') const proxy = require('express-http-proxy') const bodyParser = require('body-parser') -const contentProxyUrl = utils?.defaultHost(utils?.envVariables?.CONTENT_PROXY_URL); -const learnerServiceBaseUrl = utils?.defaultHost(utils?.envVariables?.LEARNER_URL); +const contentProxyUrl = utils?.defaultHost(utils?.envVariables?.CONTENT_PROXY_URL); +const learnerServiceBaseUrl = utils?.defaultHost(utils?.envVariables?.LEARNER_URL); const learner_Service_Local_BaseUrl = utils?.defaultHost(utils?.envVariables?.learner_Service_Local_BaseUrl); const PORTAL_EXT_PLUGIN_URL = utils?.defaultHost(utils?.envVariables?.PORTAL_EXT_PLUGIN_URL); const contentServiceBaseUrl = utils?.defaultHost(utils?.envVariables?.CONTENT_URL); const reqDataLimitOfContentUpload = '30mb' const telemetryHelper = require('../helpers/telemetryHelper') -const learnerURL = utils?.defaultHost(utils?.envVariables?.LEARNER_URL); +const learnerURL = utils?.defaultHost(utils?.envVariables?.LEARNER_URL); const isAPIWhitelisted = require('../helpers/apiWhiteList'); module.exports = function (app) { @@ -68,27 +68,27 @@ module.exports = function (app) { })) app.all('/action/data/v1/page/assemble', - isAPIWhitelisted.isAllowed(), - proxy(learnerServiceBaseUrl, { - proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerServiceBaseUrl), - proxyReqPathResolver: function (req) { - var originalUrl = req.originalUrl - originalUrl = originalUrl.replace('/action/', '') - return require('url').parse(learnerServiceBaseUrl + originalUrl).path - } - })) + isAPIWhitelisted.isAllowed(), + proxy(learnerServiceBaseUrl, { + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerServiceBaseUrl), + proxyReqPathResolver: function (req) { + var originalUrl = req.originalUrl + originalUrl = originalUrl.replace('/action/', '') + return require('url').parse(learnerServiceBaseUrl + originalUrl).path + } + })) app.all('/action/data/v1/form/read', - isAPIWhitelisted.isAllowed(), - proxy(contentServiceBaseUrl, { - proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), - proxyReqPathResolver: function (req) { - var originalUrl = req.originalUrl - originalUrl = originalUrl.replace('/action/', '') - return require('url').parse(contentServiceBaseUrl + originalUrl).path - } - })) + isAPIWhitelisted.isAllowed(), + proxy(contentServiceBaseUrl, { + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), + proxyReqPathResolver: function (req) { + var originalUrl = req.originalUrl + originalUrl = originalUrl.replace('/action/', '') + return require('url').parse(contentServiceBaseUrl + originalUrl).path + } + })) const addCorsHeaders = (req, res, next) => { res.header('Access-Control-Allow-Origin', '*') @@ -104,29 +104,29 @@ module.exports = function (app) { } app.all('/action/review/comment/*', - isAPIWhitelisted.isAllowed(), - addCorsHeaders, - proxy(PORTAL_EXT_PLUGIN_URL, { - proxyReqPathResolver: req => { - return req.originalUrl.replace('/action', '/plugin') - }, - userResDecorator: userResDecorator - })) + isAPIWhitelisted.isAllowed(), + addCorsHeaders, + proxy(PORTAL_EXT_PLUGIN_URL, { + proxyReqPathResolver: req => { + return req.originalUrl.replace('/action', '/plugin') + }, + userResDecorator: userResDecorator + })) app.all('/action/textbook/v1/toc/*', - isAPIWhitelisted.isAllowed(), - addCorsHeaders, - proxy(learnerURL, { - proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL), - proxyReqPathResolver: (req) => { - var originalUrl = req.originalUrl - originalUrl = originalUrl.replace('/action/textbook/v1/', 'textbook/v1/') - return require('url').parse(learnerURL + originalUrl).path - }, - userResDecorator: userResDecorator - })) + isAPIWhitelisted.isAllowed(), + addCorsHeaders, + proxy(learnerURL, { + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL), + proxyReqPathResolver: (req) => { + var originalUrl = req.originalUrl + originalUrl = originalUrl.replace('/action/textbook/v1/', 'textbook/v1/') + return require('url').parse(learnerURL + originalUrl).path + }, + userResDecorator: userResDecorator + })) - app.post('/action/user/v1/search', + app.post('/action/user/v3/search', isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -134,7 +134,7 @@ module.exports = function (app) { limit: reqDataLimitOfContentUpload, proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL), proxyReqPathResolver: function (req) { - let originalUrl = req.originalUrl.replace('/action/user/v1/search', 'user/v3/search') + let originalUrl = req.originalUrl.replace('/action/user/v3/search', 'user/v3/search') return require('url').parse(learnerURL + originalUrl).path }, userResDecorator: userResDecorator @@ -145,9 +145,10 @@ module.exports = function (app) { app.get([ '/action/questionset/v2/read/:do_id', + '/action/questionset/v2/comment/read/:do_id', '/action/question/v2/read/:do_id', '/action/questionset/v2/hierarchy/:do_id' - ], + ], isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -171,7 +172,7 @@ module.exports = function (app) { '/action/question/v2/review/:do_id', '/action/question/v2/publish/:do_id', '/action/question/v2/list' - ], + ], isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -189,9 +190,10 @@ module.exports = function (app) { app.patch([ '/action/questionset/v2/hierarchy/update', '/action/questionset/v2/update/:do_id', + '/action/questionset/v2/comment/update/:do_id', '/action/questionset/v2/add', '/action/question/v2/update/:do_id' - ], + ], isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -226,7 +228,7 @@ module.exports = function (app) { // Collection import & export API's start app.post([ '/action/collection/v1/import/:do_id' - ], + ], isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -242,7 +244,7 @@ module.exports = function (app) { ) app.get([ '/action/collection/v1/export/:do_id' - ], + ], isAPIWhitelisted.isAllowed(), addCorsHeaders, proxyUtils.verifyToken(), @@ -296,31 +298,58 @@ module.exports = function (app) { }) ) app.get('/action/asset/v1/read/:do_id', - isAPIWhitelisted.isAllowed(), - proxy(contentServiceBaseUrl, { - preserveHostHdr: true, - limit: reqDataLimitOfContentUpload, - proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), - proxyReqPathResolver: function (req) { - let originalUrl = req.originalUrl.replace('/action/', '') - return require('url').parse(contentServiceBaseUrl + originalUrl).path - }, - userResDecorator: userResDecorator - }) -) + isAPIWhitelisted.isAllowed(), + proxy(contentServiceBaseUrl, { + preserveHostHdr: true, + limit: reqDataLimitOfContentUpload, + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), + proxyReqPathResolver: function (req) { + let originalUrl = req.originalUrl.replace('/action/', '') + return require('url').parse(contentServiceBaseUrl + originalUrl).path + }, + userResDecorator: userResDecorator + }) + ) + + app.post('/action/dialcode/v1/reserve/:do_id', + isAPIWhitelisted.isAllowed(), + proxy(contentServiceBaseUrl, { + preserveHostHdr: true, + limit: reqDataLimitOfContentUpload, + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), + proxyReqPathResolver: function (req) { + let originalUrl = req.originalUrl.replace('/action/', '') + return require('url').parse(contentServiceBaseUrl + originalUrl).path + }, + userResDecorator: userResDecorator + }) + ) + app.get('/action/dialcode/v1/process/status/*', + isAPIWhitelisted.isAllowed(), + proxy(contentServiceBaseUrl, { + preserveHostHdr: true, + limit: reqDataLimitOfContentUpload, + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl), + proxyReqPathResolver: function (req) { + let originalUrl = req.originalUrl.replace('/action/', '') + return require('url').parse(contentServiceBaseUrl + originalUrl).path + }, + userResDecorator: userResDecorator + }) + ) // asset api's ends app.all('/action/*', - bodyParser.json({ limit: '50mb' }), - isAPIWhitelisted.isAllowed(), - telemetryHelper.generateTelemetryForProxy, - proxy(contentProxyUrl, { - preserveHostHdr: true, - limit: reqDataLimitOfContentUpload, - proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl), - proxyReqPathResolver: proxyReqPathResolverMethod, - userResDecorator: userResDecorator - })) + bodyParser.json({ limit: '50mb' }), + isAPIWhitelisted.isAllowed(), + telemetryHelper.generateTelemetryForProxy, + proxy(contentProxyUrl, { + preserveHostHdr: true, + limit: reqDataLimitOfContentUpload, + proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl), + proxyReqPathResolver: proxyReqPathResolverMethod, + userResDecorator: userResDecorator + })) app.all('/v1/url/fetchmeta', proxy(contentProxyUrl, { proxyReqPathResolver: proxyReqPathResolverMethod @@ -328,11 +357,11 @@ module.exports = function (app) { } const userResDecorator = (proxyRes, proxyResData, req, res) => { try { - const data = JSON.parse(proxyResData.toString('utf8')); - if(req.method === 'GET' && proxyRes.statusCode === 404 && (typeof data.message === 'string' && data.message.toLowerCase() === 'API not found with these values'.toLowerCase())) res.redirect('/') - else return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res, data); - } catch(err) { - console.log('content api user res decorator json parse error', proxyResData); - return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res); + const data = JSON.parse(proxyResData.toString('utf8')); + if (req.method === 'GET' && proxyRes.statusCode === 404 && (typeof data.message === 'string' && data.message.toLowerCase() === 'API not found with these values'.toLowerCase())) res.redirect('/') + else return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res, data); + } catch (err) { + console.log('content api user res decorator json parse error', proxyResData); + return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res); } } diff --git a/src/app/routes/accountRecoveryRoute.js b/src/app/routes/accountRecoveryRoute.js index d0489297bcf..146fd3d2703 100644 --- a/src/app/routes/accountRecoveryRoute.js +++ b/src/app/routes/accountRecoveryRoute.js @@ -20,7 +20,7 @@ module.exports = (app) => { proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learner_Service_Local_BaseUrl), proxyReqPathResolver: (req) => { logger.info({ msg: `${req.url} called`}); - return '/private/user/v1/search'; + return '/private/user/v3/search'; } })) @@ -59,7 +59,7 @@ module.exports = (app) => { } })) - app.all('/learner/otp/v1/verify', + app.all('/learner/otp/v2/verify', bodyParser.urlencoded({ extended: false }), bodyParser.json({ limit: '10mb' }), proxy(LEARNER_URL, { proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(LEARNER_URL), diff --git a/src/app/routes/learnerRoutes.js b/src/app/routes/learnerRoutes.js index 3c36517b6e1..d3088b1a199 100644 --- a/src/app/routes/learnerRoutes.js +++ b/src/app/routes/learnerRoutes.js @@ -24,7 +24,7 @@ const _ = require('lodash'); module.exports = function (app) { require('./accountRecoveryRoute.js')(app) // account recovery route // Helper route to enable enable admin to update user fields - app.patch('/learner/portal/user/v1/update', + app.patch('/learner/portal/user/v3/update', proxyUtils.verifyToken(), proxy(learner_Service_Local_BaseUrl, { proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learner_Service_Local_BaseUrl), @@ -32,14 +32,14 @@ module.exports = function (app) { return '/private/user/v3/update'; }, userResDecorator: (proxyRes, proxyResData, req, res) => { - logger.info({ msg: '/learner/portal/user/v1/update called upstream url /private/user/v3/update' }); + logger.info({ msg: '/learner/portal/user/v3/update called upstream url /private/user/v3/update' }); try { const data = JSON.parse(proxyResData.toString('utf8')); if (req.method === 'GET' && proxyRes.statusCode === 404 && (typeof data.message === 'string' && data.message.toLowerCase() === 'API not found with these values'.toLowerCase())) res.redirect('/') else return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res, data); } catch (err) { logger.error({ msg: 'learner route : userResDecorator json parse error:', proxyResData }); - logger.error({ msg: 'learner route : error for /learner/portal/user/v1/update upstram url is /private/user/v3/update ', err }); + logger.error({ msg: 'learner route : error for /learner/portal/user/v3/update upstram url is /private/user/v3/update ', err }); return proxyUtils.handleSessionExpiry(proxyRes, proxyResData, req, res, null); } } @@ -76,12 +76,12 @@ module.exports = function (app) { app.get('/learner/user/v1/managed/*', proxyManagedUserRequest()); // Route to check user email id exists (or) already registered - app.get('/learner/user/v1/exists/email/:emailId', googleService.validateRecaptcha); + app.get('/learner/user/v2/exists/email/:emailId', googleService.validateRecaptcha); // Route to check user phone number exists (or) already registered - app.get('/learner/user/v1/exists/phone/:phoneNumber', googleService.validateRecaptcha); + app.get('/learner/user/v2/exists/phone/:phoneNumber', googleService.validateRecaptcha); - app.post('/learner/anonymous/otp/v1/generate', googleService.validateRecaptcha); + app.post('/learner/anonymous/otp/v2/generate', googleService.validateRecaptcha); // Route to check user email exists - SSO update contact workflow app.all('/learner/user/v1/get/email/*', googleService.validateRecaptcha, proxyObj()); diff --git a/src/app/routes/mlRoutes.js b/src/app/routes/mlRoutes.js index 8680e0903ae..97a54c801dc 100644 --- a/src/app/routes/mlRoutes.js +++ b/src/app/routes/mlRoutes.js @@ -61,7 +61,8 @@ module.exports = function (app) { body: fileStream }; request(options, function (error, response) { - if (response.statusCode === 201) { + const successStatusOptions = [200,201,202,'200','201','202']; + if (successStatusOptions.includes(response.statusCode)) { res.send({ responseCode: "OK", status: 200 }) } else { res.send({ status: response.statusCode }) diff --git a/src/app/server.js b/src/app/server.js index 9fbce782f9c..aa08c536802 100644 --- a/src/app/server.js +++ b/src/app/server.js @@ -62,6 +62,7 @@ const { loadTokenPublicKeys } = require('sb_api_interceptor'); const { getGeneralisedResourcesBundles } = require('./helpers/resourceBundleHelper.js') const { apiWhiteListLogger, isAllowed } = require('./helpers/apiWhiteList'); const { registerDeviceWithKong } = require('./helpers/kongTokenHelper'); +const logFeature = require('./helpers/logFeature.js'); let keycloak = getKeyCloakClient({ 'realm': envHelper.PORTAL_REALM, @@ -93,7 +94,7 @@ const app = express() app.use(cookieParser()) app.use(helmet()) app.use(addLogContext) - +app.use(logFeature.mapFeature()) if(envHelper.KONG_DEVICE_REGISTER_ANONYMOUS_TOKEN === 'true') { app.use(session({ secret: '717b3357-b2b1-4e39-9090-1c712d1b8b64', @@ -106,14 +107,48 @@ if(envHelper.KONG_DEVICE_REGISTER_ANONYMOUS_TOKEN === 'true') { }), registerDeviceWithKong()); } +const morganConfig = (tokens, req, res) => { + let edata = { + "type": "system", + "level": "TRACE", + "requestid": req.get('x-request-id'), + "message": "ENTRY LOG: " + req.get('x-msgid'), + "params": req.body ? JSON.stringify(req.body) : "empty" + } + + const featureName = req.headers['X-Feature-Name']; + + if (featureName) { + req.context = req.context || {}; // Initialize req.context if it doesn't exist + req.context.cdata = req.context.cdata || []; // Initialize req.context.cdata if it doesn't exist + req.context.cdata.push({ 'type': 'Feature', 'id': featureName }); + } + + const tokensList = [ + tokens.method(req, res), + tokens.url(req, res), + tokens.status(req, res), + '{"telemetry":{"eid":"LOG","context":' + JSON.stringify(req.context) + ', "edata":' + JSON.stringify(edata) + "}}", + ]; + if(req.context.isDebugEnabled){ // add more info when log level is debug + tokensList.push( + tokens.res(req, res, 'content-length'), '-', + tokens['response-time'](req, res), 'ms', + "requestHeader:", JSON.stringify(req.headers), + "requestBody:", req.body ? JSON.stringify(req.body) : "empty", + "responseBody:", res.body + ) + } + return tokensList.join(' '); +} + app.all([ '/learner/*', '/content/*', '/user/*', '/merge/*', '/action/*', '/courseReports/*', '/course-reports/*', '/admin-reports/*', '/certreg/*', '/device/*', '/google/*', '/report/*', '/reports/*', '/v2/user/*', '/v1/sso/*', '/migrate/*', '/plugins/*', '/content-plugins/*', - '/content-editor/telemetry','/discussion/*', '/collection-editor/telemetry', '/v1/user/*', '/sessionExpired', '/logoff', '/logout', '/assets/public/*', '/endSession', - '/sso/sign-in/*','/v1/desktop/handleGauth', '/v1/desktop/google/auth/success', '/clearSession','/kendra/*','/dhiti/*', '/assessment/*','/cloudUpload/*', '/apple/auth/*', + '/content-editor/telemetry', '/discussion/*', '/collection-editor/telemetry', '/v1/user/*', '/sessionExpired', '/logoff', '/logout', '/assets/public/*', '/endSession', + '/sso/sign-in/*', '/v1/desktop/handleGauth', '/v1/desktop/google/auth/success', '/clearSession', '/kendra/*', '/dhiti/*', '/assessment/*', '/cloudUpload/*', '/apple/auth/*', '/uci/*' -], - session({ +],morgan(morganConfig),session({ secret: envHelper?.PORTAL_SESSION_SECRET_KEY, resave: false, cookie: { @@ -130,37 +165,7 @@ app.all('/logoff', endSession, (req, res) => { req.session.destroy(function (err) { res.redirect('/logout') }); }) -const morganConfig = (tokens, req, res) => { - let edata = { - "eid": "LOG", - "edata": { - "type": "system", - "level": "TRACE", - "requestid": req.get('x-request-id'), - "message": "ENTRY LOG: " + req.get('x-msgid'), - "params": req.body ? JSON.stringify(req.body) : "empty" - } - } - const tokensList = [ - tokens.url(req, res), - tokens.method(req, res), - "context: " + JSON.stringify(req.context), - tokens.status(req, res), - "eid: LOG", - "edata: " + JSON.stringify(edata) - ]; - if(req.context.isDebugEnabled){ // add more info when log level is debug - tokensList.push( - tokens.res(req, res, 'content-length'), '-', - tokens['response-time'](req, res), 'ms', - "requestHeader:", JSON.stringify(req.headers), - "requestBody:", req.body ? JSON.stringify(req.body) : "empty", - "responseBody:", res.body - ) - } - return tokensList.join(' '); -} const captureResBodyForLogging = (req, res, next) => { if(req.context.isDebugEnabled){ // store body only in debug mode diff --git a/src/desktop/OpenRAP/managers/TelemetryManager.ts b/src/desktop/OpenRAP/managers/TelemetryManager.ts index a11c56eb90b..0d24d427143 100644 --- a/src/desktop/OpenRAP/managers/TelemetryManager.ts +++ b/src/desktop/OpenRAP/managers/TelemetryManager.ts @@ -11,7 +11,7 @@ import * as zlib from "zlib"; import * as path from "path"; import * as fs from "fs"; import FileSDK from "../sdks/FileSDK"; -import uuid = require("uuid"); +const { v4: uuid } = require('uuid'); import { TelemetryInstance } from "../services/telemetry/telemetryInstance"; import SettingSDK from "../sdks/SettingSDK"; import { NetworkQueue, NETWORK_SUBTYPE } from '../services/queue/networkQueue'; @@ -112,7 +112,7 @@ export class TelemetryManager { return omittedDoc; }); - let id = uuid.v4(); + let id = uuid(); let headers = { "Content-Type": "application/json", diff --git a/src/desktop/OpenRAP/sdks/DeviceSDK.ts b/src/desktop/OpenRAP/sdks/DeviceSDK.ts index 2ca035ee263..5b80541076e 100644 --- a/src/desktop/OpenRAP/sdks/DeviceSDK.ts +++ b/src/desktop/OpenRAP/sdks/DeviceSDK.ts @@ -3,7 +3,7 @@ import SettingSDK from './SettingSDK'; import * as _ from "lodash"; import SystemSDK from "./SystemSDK"; import { HTTPService } from "./../services/httpService"; -import uuid = require("uuid"); +const { v4: uuid } = require('uuid'); import axios from "axios"; import jwt from "jsonwebtoken"; import { DataBaseSDK } from "./DataBaseSDK"; @@ -41,7 +41,7 @@ export default class DeviceSDK { ver: process.env.APP_VERSION, ts: new Date().toISOString(), params: { - msgid: uuid.v4() + msgid: uuid() }, request: { channel: process.env.CHANNEL, diff --git a/src/desktop/OpenRAP/sdks/SystemSDK.ts b/src/desktop/OpenRAP/sdks/SystemSDK.ts index ad94a397e01..919b3eee160 100644 --- a/src/desktop/OpenRAP/sdks/SystemSDK.ts +++ b/src/desktop/OpenRAP/sdks/SystemSDK.ts @@ -1,7 +1,7 @@ import { Singleton, Inject } from "typescript-ioc"; const GetMac = require("getmac"); const crypto = require("crypto"); -const uuid = require("uuid"); +const { v4: uuid } = require('uuid'); import { logger } from "@project-sunbird/logger"; import * as os from "os"; import * as si from "systeminformation"; @@ -41,7 +41,7 @@ export default class SystemSDK { return new Promise((resolve) => { GetMac.getMac((err, macAddress) => { if(err) { - resolve(uuid.v4()); + resolve(uuid()); } else { resolve(macAddress); } diff --git a/src/desktop/OpenRAP/sdks/UserSDK.ts b/src/desktop/OpenRAP/sdks/UserSDK.ts index 1a1e99a1edd..69d16f2a8be 100644 --- a/src/desktop/OpenRAP/sdks/UserSDK.ts +++ b/src/desktop/OpenRAP/sdks/UserSDK.ts @@ -1,6 +1,6 @@ import * as _ from "lodash"; import { Inject, Singleton } from "typescript-ioc"; -import uuid from "uuid/v4"; +import { v4 as uuid } from 'uuid'; import { ILoggedInUser } from '../interfaces/IUser'; import { IFramework, IUser } from "./../interfaces"; import { DataBaseSDK } from "./DataBaseSDK"; diff --git a/src/desktop/OpenRAP/services/queue/networkQueue.ts b/src/desktop/OpenRAP/services/queue/networkQueue.ts index e0576eab4f3..4d4fb2a1f10 100644 --- a/src/desktop/OpenRAP/services/queue/networkQueue.ts +++ b/src/desktop/OpenRAP/services/queue/networkQueue.ts @@ -4,7 +4,7 @@ import { Inject, Singleton } from "typescript-ioc"; import { HTTPService } from "./../httpService"; import { TelemetryInstance } from './../telemetry/telemetryInstance'; import * as _ from "lodash"; -import uuid = require("uuid"); +import { v4 as uuid } from 'uuid'; import NetworkSDK from "./../../sdks/NetworkSDK"; import { EventManager } from "./../../managers/EventManager"; import { retry, mergeMap, catchError } from 'rxjs/operators'; @@ -50,7 +50,7 @@ export class NetworkQueue extends Queue { let date = Date.now(); let data = { ...doc, - _id: docId || uuid.v4(), + _id: docId || uuid(), createdOn: date, updatedOn: date, type: QUEUE_TYPE.Network, diff --git a/src/desktop/OpenRAP/services/queue/systemQueue.ts b/src/desktop/OpenRAP/services/queue/systemQueue.ts index 3ebd50d7a97..e51209e4638 100644 --- a/src/desktop/OpenRAP/services/queue/systemQueue.ts +++ b/src/desktop/OpenRAP/services/queue/systemQueue.ts @@ -4,7 +4,7 @@ import { Inject } from "typescript-ioc"; import { DataBaseSDK } from "../../sdks/DataBaseSDK"; import { ISystemQueue, SystemQueueStatus } from './IQueue'; import { logger } from "@project-sunbird/logger"; -import uuid from "uuid/v4"; +import { v4 as uuid } from 'uuid'; import { Subject, Observer, asyncScheduler, Observable } from "rxjs"; import { throttleTime, mergeMap } from "rxjs/operators"; import { TelemetryInstance } from './../telemetry/telemetryInstance'; diff --git a/src/desktop/OpenRAP/services/telemetry/telemetryInstance.ts b/src/desktop/OpenRAP/services/telemetry/telemetryInstance.ts index 9d280cf559c..10c2858f026 100644 --- a/src/desktop/OpenRAP/services/telemetry/telemetryInstance.ts +++ b/src/desktop/OpenRAP/services/telemetry/telemetryInstance.ts @@ -3,7 +3,7 @@ import { TelemetryService } from "./telemetryService"; import { TelemetryConfig } from "./../../interfaces/telemetryConfig"; import { DataBaseSDK } from "./../../sdks/DataBaseSDK"; import * as _ from "lodash"; -import uuid = require("uuid"); +import { v4 as uuid } from 'uuid'; import { logger } from "@project-sunbird/logger"; import { ClassLogger } from '@project-sunbird/logger/decorator'; @@ -20,7 +20,7 @@ export class TelemetryInstance extends TelemetryService { sessionId: string; constructor() { super(); - this.sessionId = uuid.v4(); + this.sessionId = uuid(); this.telemetryEvents = []; let telemetryValidation = _.toLower(process.env.TELEMETRY_VALIDATION) === "true" ? true : false; diff --git a/src/desktop/modules/helper/proxyHandler.ts b/src/desktop/modules/helper/proxyHandler.ts index 1f04b9e85ca..a074fc0d2ea 100644 --- a/src/desktop/modules/helper/proxyHandler.ts +++ b/src/desktop/modules/helper/proxyHandler.ts @@ -14,7 +14,7 @@ const decorateRequest = async (request, options) => { const { headers } = request; const userSDK: any = containerAPI.getUserSdkInstance(); const channel = _.get(headers, 'X-Channel-Id') || process.env.CHANNEL; - + headers['host']=`${process.env.APP_BASE_URL}`.split('//')[1]; if (channel && !_.get(headers, 'X-Channel-Id')) { headers['X-Channel-Id'] = channel; } @@ -116,7 +116,7 @@ export const customProxy = (host, options = {}) => { headers: headers, responseType: 'json' } - + config.headers['host']=`${process.env.APP_BASE_URL}`.split('//')[1] config = addAgent(proxyURL, config); defer(() => { switch (method) { diff --git a/src/desktop/modules/manager/contentExportManager/contentExport.ts b/src/desktop/modules/manager/contentExportManager/contentExport.ts index 945b76af386..3efdda3d857 100644 --- a/src/desktop/modules/manager/contentExportManager/contentExport.ts +++ b/src/desktop/modules/manager/contentExportManager/contentExport.ts @@ -4,7 +4,7 @@ import * as os from "os"; import * as path from "path"; import * as fse from "fs-extra"; import { manifest } from "../../manifest"; -import * as uuid from "uuid"; +import {v1 as uuid} from "uuid"; import { containerAPI } from "@project-sunbird/OpenRAP/api"; import { logger } from "@project-sunbird/logger"; const fileSDK = containerAPI.getFileSDKInstance(manifest.id); @@ -241,7 +241,7 @@ export class ExportContent { id: "content.archive", ver: manifestJson.pkgVersion || "1.0", ts: new Date(), - params: { resmsgid: uuid.v1() }, + params: { resmsgid: uuid() }, archive: { count: _.get(manifestJson, "archive.items.length") || 1, ttl: 24, diff --git a/src/desktop/modules/routes.spec.ts b/src/desktop/modules/routes.spec.ts index 946ec9e81cd..b8bb789f86e 100644 --- a/src/desktop/modules/routes.spec.ts +++ b/src/desktop/modules/routes.spec.ts @@ -416,7 +416,7 @@ describe("Test Telemetry", () => { describe("User API", () => { it("#User create success", (done) => { supertest(app) - .post("/api/desktop/user/v1/create") + .post("/api/desktop/user/v1/sso/create") .send({ request: { framework: { board: "english", medium: ["english"], gradeLevel: ["class 5"] } } }) .expect(200) .end((err, res) => { @@ -431,7 +431,7 @@ describe("User API", () => { it("#User create 409 conflict", (done) => { supertest(app) - .post("/api/desktop/user/v1/create") + .post("/api/desktop/user/v1/sso/create") .send({ request: { framework: { board: "english", medium: ["english"], gradeLevel: ["class 5"] } } }) .expect(409) .end((err, res) => { @@ -446,7 +446,7 @@ describe("User API", () => { it("#User create 500 internal server error", (done) => { supertest(app) - .post("/api/desktop/user/v1/create") + .post("/api/desktop/user/v1/sso/create") .send() .expect(500) .end((err, res) => { @@ -460,7 +460,7 @@ describe("User API", () => { it("#User read success", (done) => { supertest(app) - .get("/api/desktop/user/v1/read") + .get("/api/desktop/user/v5/read") .expect(200) .end((err, res) => { if (res.statusCode >= 500) { logger.error(err); return done(); } @@ -474,7 +474,7 @@ describe("User API", () => { }); it("#User update success", (done) => { supertest(app) - .post("/api/desktop/user/v1/update") + .post("/api/desktop/user/v3/update") .send({ request: { _id: "9783dc11-206c-4a3e-917a-cf4853ce23a2", framework: { board: "english", medium: ["english"], gradeLevel: ["class 5"] } } }) @@ -490,7 +490,7 @@ describe("User API", () => { }); it("#User update 500 internal server error", (done) => { supertest(app) - .post("/api/desktop/user/v1/update") + .post("/api/desktop/user/v3/update") .send() .expect(500) .end((err, res) => { @@ -504,7 +504,7 @@ describe("User API", () => { it("#User update bad request", (done) => { supertest(app) - .post("/api/desktop/user/v1/update") + .post("/api/desktop/user/v3/update") .send({ request: { framework: { board: "english", medium: ["english"], gradeLevel: ["class 5"] } } }) .expect(400) @@ -519,7 +519,7 @@ describe("User API", () => { it("#User update 404 (ERROR)", (done) => { supertest(app) - .post("/api/desktop/user/v1/update") + .post("/api/desktop/user/v3/update") .expect(404) .end((err, res) => { expect(res.body.params.status).to.equal("failed"); diff --git a/src/desktop/modules/routes.ts b/src/desktop/modules/routes.ts index f5b92d68ac8..153c7ed2ad1 100644 --- a/src/desktop/modules/routes.ts +++ b/src/desktop/modules/routes.ts @@ -2,7 +2,7 @@ import { containerAPI } from "@project-sunbird/OpenRAP/api"; import * as _ from "lodash"; import { Inject } from "typescript-ioc"; import * as url from "url"; -import * as uuid from "uuid"; +import {v4 as uuid } from "uuid"; import { ContentDownloadManager } from "./manager/contentDownloadManager"; import contentRoutes from './routes/content'; import dataRoutes from './routes/data'; @@ -121,7 +121,7 @@ export class Router { }; app.use(logTelemetryEvent); const addRequestId = (req, res, next) => { - req.headers["X-msgid"] = req.get("X-msgid") || uuid.v4(); + req.headers["X-msgid"] = req.get("X-msgid") || uuid(); next(); }; app.use(addRequestId); diff --git a/src/desktop/modules/routes/auth.ts b/src/desktop/modules/routes/auth.ts index 2ef8549d9c1..416c1453233 100644 --- a/src/desktop/modules/routes/auth.ts +++ b/src/desktop/modules/routes/auth.ts @@ -71,7 +71,7 @@ export default (app, proxyURL) => { }); app.patch([ - '/learner/user/v1/update', + '/learner/user/v3/update', '/learner/user/v3/update', "/learner/notification/v1/feed/update", '/learner/user/v1/declarations' @@ -118,9 +118,9 @@ export default (app, proxyURL) => { }); app.post([ - "/learner/otp/v1/generate", - "/learner/otp/v1/verify", - "/learner/user/v1/consent/read", + "/learner/otp/v2/generate", + "/learner/otp/v2/verify", + "/learner/user/v2/consent/read", "/learner/user/v1/consent/update", "/learner/user/v1/tnc/accept", "/learner/user/v1/delete" @@ -128,7 +128,7 @@ export default (app, proxyURL) => { res.status(res.statusCode).send(res.body); }); - app.post(["/learner/user/v4/create", "/learner/user/v5/create", "/learner/user/v1/managed/create"], customProxy(proxyURL, defaultProxyConfig),async (req, res) => { + app.post(["/learner/user/v4/create", "/learner/user/v5/create", "/learner/user/v2/managed/create"], customProxy(proxyURL, defaultProxyConfig),async (req, res) => { const userSDK: any = containerAPI.getUserSdkInstance(); const userId = _.get(res, 'body.result.userId'); const userToken: string = await userSDK.getUserToken().catch(error => { @@ -170,7 +170,7 @@ export default (app, proxyURL) => { } }); - app.post(["/learner/anonymous/otp/v1/generate","/learner/anonymous/delete/otp/v1/generate"], (req, res, next) => { + app.post(["/learner/anonymous/otp/v2/generate","/learner/anonymous/delete/otp/v2/generate"], (req, res, next) => { if (req.url.indexOf('anonymous') > -1) { req.originalUrl = req.originalUrl.replace('anonymous/', ''); } diff --git a/src/desktop/modules/routes/course.ts b/src/desktop/modules/routes/course.ts index e37641b23d1..bd6df3e82a8 100644 --- a/src/desktop/modules/routes/course.ts +++ b/src/desktop/modules/routes/course.ts @@ -37,7 +37,7 @@ export default (app, proxyURL) => { }); app.post([ - "/learner/user/v1/search", + "/learner/user/v3/search", "/learner/course/v1/enrol", "/learner/course/v1/unenrol", "/discussion/forum/v2/read", @@ -53,7 +53,7 @@ export default (app, proxyURL) => { } }); - app.post("/learner/user/v2/search", customProxy(proxyURL, defaultProxyConfig), (req, res) => { + app.post("/learner/user/v3/search", customProxy(proxyURL, defaultProxyConfig), (req, res) => { res.status(res.statusCode).send(res.body); }); diff --git a/src/desktop/modules/routes/data.ts b/src/desktop/modules/routes/data.ts index 10714e4f711..05e863e8240 100644 --- a/src/desktop/modules/routes/data.ts +++ b/src/desktop/modules/routes/data.ts @@ -120,7 +120,7 @@ export default (app, proxyURL) => { }); const user = new User(manifest); - app.get("/api/desktop/user/v1/read", + app.get("/api/desktop/user/v5/read", user.read.bind(user), ); } diff --git a/src/desktop/modules/routes/desktop.ts b/src/desktop/modules/routes/desktop.ts index 74eb741c0ac..8c93695089d 100644 --- a/src/desktop/modules/routes/desktop.ts +++ b/src/desktop/modules/routes/desktop.ts @@ -67,15 +67,15 @@ export default (app, proxyURL) => { }); const user = new User(manifest); - app.post("/api/desktop/user/v1/create", + app.post("/api/desktop/user/v1/sso/create", user.create.bind(user), ); - app.get("/api/desktop/user/v1/read", + app.get("/api/desktop/user/v5/read", user.read.bind(user), ); app.post( - "/api/desktop/user/v1/update", user.update.bind(user), + "/api/desktop/user/v3/update", user.update.bind(user), ); diff --git a/src/desktop/modules/utils/response.ts b/src/desktop/modules/utils/response.ts index 3dde6f58a05..f9ed2078d6d 100644 --- a/src/desktop/modules/utils/response.ts +++ b/src/desktop/modules/utils/response.ts @@ -1,4 +1,4 @@ -import * as uuid from "uuid"; +import{ v4 as uuid} from "uuid"; export default class Response { public static success(id, result, req) { @@ -9,8 +9,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "successful", err: null, errmsg: null, @@ -30,8 +30,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "failed", err: errCode || "ERR_DATA_NOT_FOUND", errmsg: errmsg || "Data not found", @@ -45,8 +45,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "failed", err: errCode || "ERR_BAD_REQUEST", errmsg: errmsg || "Error while processing the request ", @@ -60,8 +60,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "failed", err: errCode || "LOW_DISK_SPACE", errmsg: errmsg || "Low Disk space", @@ -75,8 +75,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "failed", err: errCode || "UNAUTHORIZED", errmsg: errmsg || "You don't have permission to access this resource", @@ -90,8 +90,8 @@ export default class Response { ver: "1.0", ts: new Date().toISOString(), params: { - resmsgid: uuid.v4(), - msgid: uuid.v4(), + resmsgid: uuid(), + msgid: uuid(), status: "failed", err: errCode || "ERR_INTERNAL_SERVER_ERROR", errmsg: errmsg || "Error while processing the request", diff --git a/src/desktop/modules/utils/util.ts b/src/desktop/modules/utils/util.ts index 8964e8e944d..4e1ced8adef 100644 --- a/src/desktop/modules/utils/util.ts +++ b/src/desktop/modules/utils/util.ts @@ -1,5 +1,5 @@ const Hashids = require('hashids/cjs'); -import * as UUID from 'uuid'; +import { v4 as UUID } from 'uuid'; export class Util { public static hash(text: string): string {