Skip to content

Commit cf8aac4

Browse files
Merge pull request #221 from vishnubansaltarento/kar-202-logout-issue
update for kar-202 logout issue
2 parents ee1e322 + f81be95 commit cf8aac4

File tree

12 files changed

+34
-36
lines changed

12 files changed

+34
-36
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@sunbird-cb/collection": "^1.0.34",
4444
"@sunbird-cb/rain-dashboards": "^0.3.9",
4545
"@sunbird-cb/resolver": "^1.0.0",
46-
"@sunbird-cb/utils": "^1.0.13",
46+
"@sunbird-cb/utils": "^1.0.17",
4747
"@types/file-saver": "^2.0.1",
4848
"@types/lodash": "4.14.172",
4949
"@types/video.js": "7.2.12",

project/ws/app/src/lib/routes/home/home.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import {
4545
ScrollspyLeftMenuModule,
4646
} from '@sunbird-cb/collection'
4747
// TO-DO need to enable for image crop
48-
//import { ImageCropModule } from './routes/image-crop/image-crop.module'
48+
// import { ImageCropModule } from './routes/image-crop/image-crop.module'
4949
import { AboutComponent } from './routes/about/about.component'
5050
import { RolesAccessComponent } from './routes/roles-access/roles-access.component'
5151
import { DirectoryViewComponent } from './routes/directory/directroy.component'
@@ -160,7 +160,7 @@ import { AddThumbnailComponent } from './routes/add-thumbnail/add-thumbnail.comp
160160
WidgetResolverModule,
161161
UserAutocompleteModule,
162162
// TO-DO need to enable for image crop
163-
//ImageCropModule,
163+
// ImageCropModule,
164164
UIAdminTableModule,
165165
UIORGTableModule,
166166
MatTableModule,
@@ -170,7 +170,7 @@ import { AddThumbnailComponent } from './routes/add-thumbnail/add-thumbnail.comp
170170
PipePublicURLModule,
171171
ScrollspyLeftMenuModule,
172172
// TO-DO need to enable for image crop
173-
//ImageCropModule,
173+
// ImageCropModule,
174174
NgMultiSelectDropDownModule.forRoot(),
175175
],
176176
entryComponents: [

project/ws/app/src/lib/routes/home/pipes/pipe-public-URL/pipe-public-URL.pipe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class PipePublicURL implements PipeTransform {
1818
const finalURL = `${environment.contentHost}${mainUrl}`
1919
return value ? finalURL : ''
2020

21-
} else {
21+
} {
2222
const mainUrl = value && value.split('/content').pop() || ''
2323
const finalURL = `${environment.contentHost}/${environment.contentBucket}/content${mainUrl}`
2424
return value ? finalURL : ''

project/ws/app/src/lib/routes/home/routes/add-thumbnail/add-thumbnail.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ export class AddThumbnailComponent implements OnInit {
119119
createdBy,
120120
compatibilityLevel: {
121121
min: sectorConstants.minCompatibilityLevel,
122-
max: sectorConstants.maxCompatibilityLevel
122+
max: sectorConstants.maxCompatibilityLevel,
123123
},
124124
contentType: ['Asset'],
125125
mediaType: ['image'],
126126
status: ['Draft'],
127-
resourceCategory: ['sector']
127+
resourceCategory: ['sector'],
128128
},
129129
query: this.queryFilter,
130130
sort_by: { lastUpdatedOn: 'desc' },
@@ -144,7 +144,7 @@ export class AddThumbnailComponent implements OnInit {
144144
this.totalContent = data && data.result.response ? data.result.response.totalHits : sectorConstants.zero
145145
this.fetchError = false
146146
},
147-
error => {
147+
error => {
148148
// tslint:disable-next-line: no-console
149149
console.log(error)
150150
})

project/ws/app/src/lib/routes/home/routes/image-crop/image-crop.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export class ImageCropComponent implements OnInit {
3636
isXSmall = false
3737
isThumbnail = true
3838

39-
4039
constructor(
4140
private dialogRef: MatDialogRef<ImageCropComponent>,
4241
private configSvc: ConfigurationsService,

project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class AddSectorComponent implements OnInit {
6363
this.router.navigate([`/app/home/sectors`])
6464
}
6565
this.isLoading = false
66-
}, eResp => {
66+
}, eResp => {
6767
if (eResp && eResp.error && eResp.error.responseCode === 'BAD_REQUEST') {
6868
this.snackBar.open(eResp.error.params.errmsg)
6969
}

project/ws/app/src/lib/routes/home/routes/sectors/edit-sector/edit-sector.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class EditSectorComponent implements OnInit {
7878
})
7979
}
8080
}
81-
}, error => {
81+
}, error => {
8282
this.snackBar.open(error, 'X', { duration: sectorConstants.duration })
8383
})
8484
}
@@ -91,8 +91,8 @@ export class EditSectorComponent implements OnInit {
9191

9292
// Add sub sectors
9393
onSubSectorSubmit() {
94-
let children: any = [...this.sectorDetails.children]
95-
let requestBody = {
94+
const children: any = [...this.sectorDetails.children]
95+
const requestBody = {
9696
request: {
9797
identifier: this.sectorDetails.identifier,
9898
subsectors: children,
@@ -108,7 +108,7 @@ export class EditSectorComponent implements OnInit {
108108
this.router.navigate([`/app/home/sectors`])
109109
}
110110
this.loading = false
111-
}, eResp => {
111+
}, eResp => {
112112
if (eResp && eResp.error && eResp.error.responseCode === 'BAD_REQUEST') {
113113
this.snackBar.open(eResp.error.params.errmsg)
114114
}

project/ws/app/src/lib/routes/home/routes/sectors/sectors-constats.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ export const sectorConstants = {
1212
maxCompatibilityLevel: 2,
1313
zero: 0,
1414
pageSize: 20,
15-
pageOptions: [20, 30, 40]
16-
}
15+
pageOptions: [20, 30, 40],
16+
}

project/ws/app/src/lib/routes/home/routes/sectors/sectors.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class SectorsComponent implements OnInit {
5353
})
5454
}
5555
this.isLoading = false
56-
}, error => {
56+
}, error => {
5757
this.isLoading = false
5858
// tslint:disable-next-line: no-console
5959
console.log(error)

src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
9898
DialogConfirmComponent,
9999
LoginRootComponent,
100100
LoginRootDirective,
101-
PublicHomeComponent
101+
PublicHomeComponent,
102102
],
103103
imports: [
104104
FormsModule,

0 commit comments

Comments
 (0)