Skip to content
GitLab
Commit 6c9c9491 authored by “Rajnish's avatar “Rajnish
Browse files

Merge remote-tracking branch 'upstream/release-3.3.0' into SB-19720

parents ff197e17 7927d3ce
master Dark_theme SB-25589 SB-28090 aws_fileRead dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/express-4.17.3 dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3 dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3 dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/express-4.17.3 dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/qs-6.10.3 filters_5.1.1 gcp gcp_test keshavprasadms-patch-1 keshavprasadms-patch-2 release-3.3.0 release-3.3.0-telemetry-fix release-3.3.1 release-3.3.2 release-3.4.0 release-3.4.1 release-3.4.2 release-3.4.3 release-3.4.4 release-3.4.5 release-3.4.6 release-3.4.7 release-3.5.0 release-3.5.1 release-3.5.2 release-3.5.3 release-3.6.0 release-3.6.1 release-3.6.5 release-3.6.6 release-3.7.0 release-3.7.1 release-3.7.2 release-3.8.0 release-3.8.1 release-3.8.2 release-3.8.3 release-3.9.0 release-3.9.1 release-3.9.2 release-3.9.3 release-4.0.0 release-4.0.1 release-4.0.2 release-4.1 release-4.1.0 release-4.1.1 release-4.10.0 release-4.10.0.1 release-4.10.1 release-4.10.2 release-4.10.2.1 release-4.10.2.2 release-4.10.3 release-4.2.0 release-4.2.1 release-4.3.0 release-4.3.1 release-4.4.0 release-4.4.1 release-4.5.0 release-4.5.1 release-4.5.2 release-4.6.0 release-4.7.0 release-4.7.1 release-4.8.0 release-4.8.5 release-4.9.0 release-4.9.1 release-5.0.0 release-5.0.0.1 release-5.0.0.2 release-5.0.0.3 release-5.0.1 release-5.0.2 release-5.1.0 release-5.1.1 revert-5244-sh-809 revert-5260-SB-table-3.3.0 revert-8284-release-5.0.0 sharathkashyap-patch-1 Tags unavailable
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 34 deletions
+20 -34
src/app/client/src/app/modules/learn/services/course-consumption/course-consumption.service.ts
+ 1
− 1
View file @ 6c9c9491
......@@ -170,6 +170,6 @@ getAllOpenBatches(contents) {
}
isTrackableCollection(collection: {trackable?: {enabled?: string}, contentType: string}) {
return (_.lowerCase(collection.trackable.enabled) === 'yes' || _.lowerCase(collection.contentType) === 'course');
return (_.lowerCase(_.get(collection, 'trackable.enabled')) === 'yes' || _.lowerCase(_.get(collection, 'contentType')) === 'course');
}
}
src/app/client/src/app/modules/workspace/components/all-content/all-content.component.html
+ 8
− 8
View file @ 6c9c9491
......@@ -129,15 +129,15 @@
<div class="sb-modal-content">
<h5 class="font-weight-bold sb-color-red">{{resourceService?.frmelmnts?.lbl?.linkedContentErrorMessage}}</h5>
<div class="sb-table-responsive">
<table class="sb-table sb-table-striped sb-table-sortable sb-table-blue-strip">
<table aria-hidden="true" class="sb-table sb-table-striped sb-table-sortable sb-table-blue-strip">
<thead>
<th class="w-10">{{headers.type}}</th>
<th class="w-30">{{headers.name}}</th>
<th class="w-10">{{headers.subject}}</th>
<th class="w-10">{{headers.grade}}</th>
<th class="w-10">{{headers.medium}}</th>
<th class="w-10">{{headers.board}}</th>
<th class="w-20">{{headers.channel}}</th>
<th class="w-10" id="contentType">{{headers.type}}</th>
<th class="w-30" id="contentName">{{headers.name}}</th>
<th class="w-10" id="contentSubject">{{headers.subject}}</th>
<th class="w-10" id="contentGrade">{{headers.grade}}</th>
<th class="w-10" id="contentMedium">{{headers.medium}}</th>
<th class="w-10" id="contentBoard">{{headers.board}}</th>
<th class="w-20" id="contentchannel">{{headers.channel}}</th>
</thead>
<tbody>
<tr *ngFor = "let row of collectionData">
......
src/app/client/src/app/modules/workspace/components/all-content/all-content.component.scss
+ 1
− 1
View file @ 6c9c9491
......@@ -43,7 +43,7 @@
}
.bt-0{
border-top: none;;
border-top: none;
}
.fadInButton{
......
src/app/client/src/app/modules/workspace/components/all-content/all-content.component.spec.ts
+ 0
− 7
View file @ 6c9c9491
......@@ -173,11 +173,4 @@ describe('AllContentComponent', () => {
component.checkLinkedCollections(undefined);
expect(component.checkLinkedCollections).toHaveBeenCalledWith(undefined);
}));
it('should throw error for searchContent', inject([WorkSpaceService, ToasterService],
(workSpaceService, toasterService) => {
spyOn(workSpaceService, 'searchContent').and.callFake(() => observableThrowError({}));
spyOn(toasterService, 'error').and.callThrough();
component.checkLinkedCollections(undefined);
expect(toasterService.error).toHaveBeenCalled();
}));
});
src/app/client/src/app/modules/workspace/components/published/published.component.html
+ 8
− 8
View file @ 6c9c9491
......@@ -97,15 +97,15 @@ class="sb-modal custom-lg-modal" (dismissed)="this.collectionListModal = false"
<div class="sb-modal-content">
<h5 class="font-weight-bold sb-color-red">{{resourceService?.frmelmnts?.lbl?.linkedContentErrorMessage}}</h5>
<div class="sb-table-responsive">
<table class="sb-table sb-table-striped sb-table-sortable sb-table-blue-strip">
<table aria-hidden="true" class="sb-table sb-table-striped sb-table-sortable sb-table-blue-strip">
<thead>
<th class="w-10">{{headers.type}}</th>
<th class="w-30">{{headers.name}}</th>
<th class="w-10">{{headers.subject}}</th>
<th class="w-10">{{headers.grade}}</th>
<th class="w-10">{{headers.medium}}</th>
<th class="w-10">{{headers.board}}</th>
<th class="w-20">{{headers.channel}}</th>
<th class="w-10" id="contentType">{{headers.type}}</th>
<th class="w-30" id="contentName">{{headers.name}}</th>
<th class="w-10" id="contentSubject">{{headers.subject}}</th>
<th class="w-10" id="contentGrade">{{headers.grade}}</th>
<th class="w-10" id="contentMedium">{{headers.medium}}</th>
<th class="w-10" id="contentBoard">{{headers.board}}</th>
<th class="w-20" id="contentchannel">{{headers.channel}}</th>
</thead>
<tbody>
<tr *ngFor = "let row of collectionData">
......
src/app/client/src/app/modules/workspace/components/published/published.component.scss
+ 1
− 1
View file @ 6c9c9491
......@@ -43,7 +43,7 @@
}
.bt-0{
border-top: none;;
border-top: none;
}
.fadInButton{
......
src/app/client/src/app/modules/workspace/components/published/published.component.spec.ts
+ 0
− 7
View file @ 6c9c9491
......@@ -180,11 +180,4 @@ describe('PublishedComponent', () => {
component.checkLinkedCollections(undefined);
expect(component.checkLinkedCollections).toHaveBeenCalledWith(undefined);
}));
it('should throw error for searchContent', inject([WorkSpaceService, ToasterService],
(workSpaceService, toasterService) => {
spyOn(workSpaceService, 'searchContent').and.callFake(() => observableThrowError({}));
spyOn(toasterService, 'error').and.callThrough();
component.checkLinkedCollections(undefined);
expect(toasterService.error).toHaveBeenCalled();
}));
});
src/app/helpers/whitelistApis.js
+ 1
− 1
View file @ 6c9c9491
......@@ -590,7 +590,7 @@ const API_LIST = {
'/certreg/v1/add/template': {
checksNeeded: ['ROLE_CHECK'],
ROLE_CHECK: [ROLE.COURSE_MENTOR, ROLE.CONTENT_CREATOR]
}
},
},
URL_PATTERN: [
'/content/content/v1/read/:do_id',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment