Merge pull request #211 from Arti-Khillare1/up-for-review

bugs fixes 1720 1827 1850
ELEVATE-Project · Sep 17, 2024 · af611c7 · af611c7
2 parents 3ad48f8 + 14c630d
commit af611c7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/projects/lib-shared-modules/src/lib/components/comments-box/comments-box.component.html b/projects/lib-shared-modules/src/lib/components/comments-box/comments-box.component.html
@@ -41,7 +41,7 @@
         }
       </section>
     }
-    <section  [ngClass]="{'disabled-with-pointer-events': (mode === 'viewOnly' || mode === 'creatorView' || mode === 'reviewerView')}">
+    <section  [ngClass]="{'disabled-with-pointer-events': (mode === 'viewOnly' || mode === 'creatorView' || mode === 'reviewerView'), 'expanded-editor': !messages || messages.length === 0}">
       <quill-editor [(ngModel)]="quillInput" placeholder="Type your comment" [modules]="quillConfig"
         (onSelectionChanged)="onSelectionChanged($event)"></quill-editor>
     </section>

diff --git a/projects/lib-shared-modules/src/lib/components/comments-box/comments-box.component.scss b/projects/lib-shared-modules/src/lib/components/comments-box/comments-box.component.scss
@@ -21,13 +21,12 @@
   border-radius: .5rem 0.5rem 0 0;
 }
 quill-editor {
-  height: 8rem !important;
+  height: 18rem !important;
   width: 100%;
-  overflow-y: auto !important;
 }
 .chat-window {
   background: #e1e8ed;
-  height: calc(100% - 24rem);
+  height: calc(100% - 60vh);
   overflow-y: auto;
   max-width: 25rem !important;
   white-space: normal !important;
@@ -148,3 +147,7 @@ quill-editor {
   position: relative;
   left: 30%;
 }
+
+.expanded-editor quill-editor {
+  height: 60vh !important; 
+}
diff --git a/...ects/self-creation-portal/src/app/components/resource-holder/resource-holder.component.ts b/...ects/self-creation-portal/src/app/components/resource-holder/resource-holder.component.ts
@@ -40,11 +40,11 @@ export class ResourceHolderComponent implements OnInit{
     current: { type: [] as string[] },
     status: '' as string,
     filteredLists: [] as any[],
-    filterData: [] as any,
-    showActionButton: false,
+    filterData: [] as any, //to store filterarray data json coming from formapi
+    showActionButton: false, //property to show the buttons resourcelist ui
     changeReqCount : 0,
     inprogressCount  : 0,
-    activeFilterButton: '' as string,
+    activeFilterButton: '' as string, //button selected from filter ui
     showInfoIcon: false
   };
 
@@ -148,6 +148,7 @@ export class ResourceHolderComponent implements OnInit{
       this.filters.current.type = event.values;
       // Clear filter button action when type filter is applied
       this.filters.activeFilterButton = '';
+      this.filters.status = ''
     } else if (filterName === 'status') {
       this.filters.status = event.values;
       // Clear filter button action when status filter is applied

diff --git a/projects/self-creation-portal/src/app/services/common-service/common.service.ts b/projects/self-creation-portal/src/app/services/common-service/common.service.ts
@@ -30,7 +30,8 @@ export class CommonService {
       sort_order: sortOptions.sort_order || '',
       filter: '',
       search: btoa(filters.search) || '',
-      listing: pageStatus || ''
+      listing: pageStatus || '',
+      activeFilterButton: filters.activeFilterButton || '',
     };
   }
 
@@ -42,6 +43,7 @@ export class CommonService {
     filters.search = params['search'] ? atob(params['search']) : '';
     sortOptions.sort_by = params['sort_by'] || '';
     sortOptions.sort_order = params['sort_order'] || '';
+    filters.activeFilterButton = params['activeFilterButton'] || ''; 
   }
 
   updateQueryParams(params: { [key: string]: any }) {
@@ -60,4 +62,4 @@ export class CommonService {
     const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?Z?$/;
     return isoDateRegex.test(value);
   }
-}
+}
diff --git a/projects/self-creation-portal/src/styles.scss b/projects/self-creation-portal/src/styles.scss
@@ -193,13 +193,6 @@ color:$tertiary
   display: none !important;
 }
 
-quill-editor .ql-toolbar {
-  position: sticky; 
-  top: 0;
-  z-index: 1; 
-  background-color: white; 
-}
-
 ::ng-deep .custom-class .mat-mdc-dialog-container .mdc-dialog__surface {
   width: 63vw;
   height:auto;