From 95817194903fb5e439bd11524edc8fb9af4fc084 Mon Sep 17 00:00:00 2001 From: Sohith Kanala Date: Tue, 26 Nov 2024 19:54:59 +0530 Subject: [PATCH] Updated collection library for side menu changes and other minir fixes --- package.json | 2 +- .../create-organisation.component.ts | 14 +------------- .../directory-list/directory-table.component.ts | 4 +++- src/themes/_theme-mixins.scss | 7 ++++--- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 547ace41..c9401425 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@babel/core": "7.22.0", "@babel/preset-env": "7.25.4", "@project-sunbird/telemetry-sdk": "0.0.26", - "@sunbird-cb/collection": "1.0.48-ang-13-16", + "@sunbird-cb/collection": "1.0.49-ang-13-16", "@sunbird-cb/rain-dashboards": "0.0.36-ang-13-16", "@sunbird-cb/resolver": "1.0.0-ang-13-16", "@sunbird-cb/taxonomy-editor": "0.0.0-ang-13-16", diff --git a/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts b/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts index f410cdf5..0cea8787 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts +++ b/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts @@ -155,19 +155,7 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy { logo: this.selectedLogo, description: this.controls['description'].value, parentMapId: this.heirarchyObject?.parentMapId || "", - sbRootOrgId: this.heirarchyObject?.parentMapId || "", - } - - if (this.controls['category'].value === "state") { - payload.organisationType = this.controls['state'].value.sbOrgType - payload.organisationSubType = this.controls['state'].value.sbOrgSubType - payload.parentMapId = this.controls['state'].value.parentMapId - payload.sbRootOrgId = this.controls['state'].value.sbOrgId - } else { - payload.organisationType = this.controls['ministry'].value.sbOrgType - payload.organisationSubType = this.controls['ministry'].value.sbOrgSubType - payload.parentMapId = this.controls['ministry'].value.parentMapId - payload.sbRootOrgId = this.controls['ministry'].value.sbOrgId + sbRootOrgId: this.heirarchyObject?.sbRootOrgId || "", } if (this.openMode === 'editMode') { diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts index adf6cc16..12247047 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts @@ -292,7 +292,9 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang } organizationCreatedEmit(_event: any) { - this.searchByEnterKey.emit('') + setTimeout(() => { + this.searchByEnterKey.emit('') + }, 1000) } diff --git a/src/themes/_theme-mixins.scss b/src/themes/_theme-mixins.scss index 9ac97339..6fc5ec43 100644 --- a/src/themes/_theme-mixins.scss +++ b/src/themes/_theme-mixins.scss @@ -227,7 +227,7 @@ position: absolute; border-color: $colorAccentDark; border-style: solid; - border-width: 0 0 0 2px; + border-width: 0 0 0 4px; right: 0; height: inherit; } @@ -374,11 +374,12 @@ &::after { content: ''; position: absolute; - border-color: #347bb6; + border-color: #1B4CA1; border-style: solid; - border-width: 0 0 0 2px; + border-width: 0 0 0 4px; right: 0; height: inherit; + top: 0; } }