Skip to content

Commit

Permalink
Issue #223093 feat: Merging latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rajnishdargan committed Aug 13, 2024
2 parents c9896cc + 43e49e9 commit 83d8dea
Show file tree
Hide file tree
Showing 15 changed files with 160 additions and 138 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI Build and Test Pipeline

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'

jobs:
build-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18]

steps:
- name: Checkout Code Repository
uses: actions/checkout@v4

- name: Set Up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: package-lock.json

- name: Install Project Dependencies
run: npm ci

- name: Execute Tests
run: npm run test-coverage

- name: Build Library
run: npm run build-lib
16 changes: 0 additions & 16 deletions .github/workflows/jira-description-action.yml

This file was deleted.

12 changes: 6 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@
},
{
"glob": "**/*",
"input": "node_modules/@project-sunbird/sunbird-quml-player-web-component/assets/",
"input": "node_modules/@tekdi/sunbird-quml-player-web-component/assets/",
"output": "/assets/"
}
],
"styles": [
"node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css",
"node_modules/@tekdi/sunbird-quml-player-web-component/styles.css",
"node_modules/@project-sunbird/sb-styles/assets/styles.scss",
"src/styles.scss",
"src/assets/lib/semantic/semantic.min.css",
"src/assets/styles/styles.scss",
"node_modules/font-awesome/css/font-awesome.css"
],
"scripts": [
"node_modules/@project-sunbird/sunbird-quml-player-web-component/sunbird-quml-player.js",
"node_modules/@tekdi/sunbird-quml-player-web-component/sunbird-quml-player.js",
"src/assets/libs/iziToast/iziToast.min.js",
"node_modules/jquery/dist/jquery.min.js",
"node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js",
Expand Down Expand Up @@ -225,12 +225,12 @@
},
{
"glob": "**/*",
"input": "node_modules/@project-sunbird/sunbird-quml-player-web-component/assets/",
"input": "node_modules/@tekdi/sunbird-quml-player-web-component/assets/",
"output": "/assets/"
}
],
"styles": [
"node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css",
"node_modules/@tekdi/sunbird-quml-player-web-component/styles.css",
"projects/questionset-editor-library-wc/src/styles.scss",
"src/assets/quml-styles/quml-carousel.css",
"node_modules/@project-sunbird/sb-styles/assets/styles.scss",
Expand All @@ -239,7 +239,7 @@
"node_modules/font-awesome/css/font-awesome.css"
],
"scripts": [
"node_modules/@project-sunbird/sunbird-quml-player-web-component/sunbird-quml-player.js",
"node_modules/@tekdi/sunbird-quml-player-web-component/sunbird-quml-player.js",
"src/assets/libs/iziToast/iziToast.min.js",
"node_modules/jquery/dist/jquery.min.js",
"node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js",
Expand Down
74 changes: 37 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@project-sunbird/ng2-semantic-ui": "8.0.2",
"@project-sunbird/sb-styles": "0.0.16",
"@project-sunbird/sunbird-file-upload-library": "1.0.2",
"@project-sunbird/sunbird-quml-player-web-component": "4.0.2",
"@project-sunbird/sunbird-resource-library": "8.0.2",
"@project-sunbird/telemetry-sdk": "1.3.0",
"@tekdi/sunbird-quml-player-web-component": "4.0.0",
"@tekdi/sunbird-resource-library": "8.0.0",
"@types/jquery": "^3.5.29",
"alphanum-sort": "^1.0.2",
"async": "^3.2.4",
Expand Down
4 changes: 2 additions & 2 deletions projects/questionset-editor-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-sunbird/sunbird-questionset-editor",
"version": "8.0.3",
"name": "@tekdi/sunbird-questionset-editor",
"version": "9.0.0-beta.0",
"dependencies": {
"tslib": "^2.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,7 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy {
getDefaultSessionContext() {
return _.omitBy(_.merge(
{
creator: _.get(this.editorService.editorConfig, 'context.user.fullName'),
createdBy: _.get(this.editorService.editorConfig, 'context.user.id'),
..._.pick(_.get(this.editorService.editorConfig, 'context'), ['board', 'medium', 'gradeLevel', 'subject', 'topic'])
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { SliderComponent } from './components/slider/slider.component';
import { TranslationsComponent } from './components/translations/translations.component';
import { PublishChecklistComponent } from './components/publish-checklist/publish-checklist.component';
import { RelationalMetadataComponent } from './components/relational-metadata/relational-metadata.component';
import { ResourceLibraryModule } from '@project-sunbird/sunbird-resource-library';
import { ResourceLibraryModule } from '@tekdi/sunbird-resource-library';
import { AppLoaderComponent } from './components/app-loader/app-loader.component';
import { AssignPageNumberComponent } from './components/assign-page-number/assign-page-number.component';
import { PlainTreeComponent } from './components/plain-tree/plain-tree.component';
Expand Down
6 changes: 3 additions & 3 deletions web-component-examples/vanilla-js/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@project-sunbird/sunbird-questionset-editor
@tekdi/sunbird-questionset-editor
MIT

@project-sunbird/sunbird-quml-player-web-component
@tekdi/sunbird-quml-player-web-component
MIT

@project-sunbird/sunbird-resource-library
@tekdi/sunbird-resource-library

bowser
MIT
Expand Down
2 changes: 1 addition & 1 deletion web-component-examples/vanilla-js/styles.css

Large diffs are not rendered by default.

Loading

0 comments on commit 83d8dea

Please sign in to comment.