@annalib/anna-core 16.1.0 → 16.1.2

package/lib/anna-core-shared-lib/models/anna-non-editable-gt-models.d.ts

@@ -21,7 +21,7 @@ export interface IHeaderInfo {
     tooltip?: ITooltip;
     joinedFilterSortObjectKeys?: string;
 }
-declare type DATATYPE = "CHECKBOX" | "ICON" | "STRING" | "RADIO" | "" | "SVG_ICON" | "TEXT_ACTIONS" | "CLICKABLE_DATA" | "STRING__TEXT_ACTION" | "STRING__ICON_ACTION" | "STRING___ICON_OR_TEXT_ACTION" | "HTML" | "HTML_STRING" | "ICON_CELL" | "STRING_OR_INPUT";
+declare type DATATYPE = "CHECKBOX" | "ICON" | "STRING" | "RADIO" | "" | "SVG_ICON" | "TEXT_ACTIONS" | "CLICKABLE_DATA" | "STRING__TEXT_ACTION" | "STRING__ICON_ACTION" | "STRING___ICON_OR_TEXT_ACTION" | "HTML" | "HTML_STRING" | "ICON_CELL" | "STRING_OR_INPUT" | "SINGLE_RADIO";
 declare type FILTERTYPE = "CHECKBOX" | "SLIDER" | "DATE" | "TIME" | "WEEK";
 export interface ITotalRowInfo {
     colspan: number;

package/lib/anna-core-shared-lib/services/anna-filter.service.d.ts

@@ -51,7 +51,8 @@ export declare class AnnaFilterService {
     reOrderAppliedFiltersArray(isHierarchialUserFiltered: boolean, date?: any): void;
     checkIfDataIsFiltered(isFiltered: boolean, isHierarchialUserFiltered: boolean, date?: any): boolean;
     removeOrChangeLatestFilterIndex(isFiltered: boolean): void;
-    filterData(originalData: any[], keyToSkip: string): any[];
+    checkIfSortingIsAppliedThenSortTheData(originalData: any[]): any[];
+    filterData(originalData: any[], keyToSkip: string, isLurCsrPage?: boolean): any[];
     returnOrdersInTheRange(order: any, range: any, key: any): boolean;
     returnDataForTimeRange(obj: any, selectedData: any): boolean;
     returnDataForFromAndToTimeRange(obj: any, selectedData: any, key: any): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annalib/anna-core",
-  "version": "16.1.0",
+  "version": "16.1.2",
   "peerDependencies": {
     "@angular-slider/ngx-slider": "^2.0.4",
     "@angular/common": "^15.2.9",

package/src/lib/anna-common-scss/_business-rule-common.scss

@@ -0,0 +1,35 @@
+.ng-content-selector-for-message {
+  display: inline;
+  font-size: 0.75rem !important;
+  font-weight: 400 !important;
+  line-height: 16px !important;
+
+  a {
+    color: #268BFF;
+    text-decoration: underline;
+  }
+}
+
+::ng-deep section.message-box.sm.seller-approval-requested {
+  .div-message p.message-label {
+    padding: 0 0 0 4px !important;
+  }
+}
+
+::ng-deep section.message-box.sm.inline-block-msg {
+  padding: 4px!important;
+  .div-message p.message-label {
+    display: inline-block !important;
+    padding: 0 0 0 6px !important;
+  }
+  .div-icon {
+    position: relative;
+    top: 4px;
+    left: 3px !important;
+  }
+}
+
+.comment-textarea {
+  resize: none;
+  height: 90px;
+}

package/src/lib/anna-common-scss/_easy-filter.scss

@@ -1,158 +1,62 @@
-@use "./fonts" as *;
-@use "./colors" as *;
-@use "sass:map";
+@use "./fonts";
+@import "./colors";
 
-$intelli-filter-default-map: (
-  "inactive-text-color": $primary-color,
-  "inactive-border-color": $primary-color,
-  "inactive-bg-color": white,
-  "active-bg-color": $primary-color,
-  "active-text-color": white,
-  "active-border-color": $primary-color
-);
+@mixin easy-filters() {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    max-width: calc(100% - 4px);
+    margin-bottom: 8px;
+
+    .easy-filters-btn {
+        border: 1px solid $primary-color;
+        border-radius: 12px;
+        background-color: white;
+        color: $primary-color;
+        @include fonts(Roboto, 0.75rem, normal, 500, normal, normal, 0.6px);
+        padding: 5px 8px 5px 8px;
+        margin: 15px 8px 0px 0px;
+
+        &:disabled {
+            background-color: $gray74;
+            color: $charcoal;
+            opacity: 0.5;
+            border: 1px solid $gray74;
+            cursor: not-allowed;
+        }
+    }
+
+    button.easy-filter-active {
+        color: white;
+        background: $primary-color;
+    }
+
+    .only-enabled-button {
+        cursor: default;
+        pointer-events: none;
+    }
+}
 
-@mixin intelli-filter-default($padding: 5px 8px) {
-  button.intelli-filter {
-    @include fonts(Roboto, 0.75rem, normal, 500, normal, normal, 0.6px);
+button.intelli-filter{
+    @include fonts.fonts(Roboto, 0.75rem, normal, 500, normal, normal, 0.6px);
+    color: #268bff;
+    padding: 5px 8px;
+    border: 1px solid #268bff;
+    background: white;
     border-radius: 0.75rem;
     height: 1.5rem;
     margin-right: 8px;
-    display: inline-flex;
-    align-items: center;
-    padding: $padding;
-
-    &:disabled {
-      border: 1px solid #bdbdbd !important;
-      color: #4a4a4a !important;
-      background: #bdbdbd !important;
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  }
-}
-
-@mixin intelli-filter-custom-styling(
-  $intelli-filter-map: $intelli-filter-default-map
-) {
-  
-  $intelli-filter-inactive-text-color: map.get(
-    $intelli-filter-map,
-    "inactive-text-color"
-  );
-  $intelli-filter-inactive-border-color: map.get(
-    $intelli-filter-map,
-    "inactive-border-color"
-  );
-  $intelli-filter-inactive-bg-color: map.get(
-    $intelli-filter-map,
-    "inactive-bg-color"
-  );
-
-  $intelli-filter-active-bg-color: map.get(
-    $intelli-filter-map,
-    "active-bg-color"
-  );
-  $intelli-filter-active-text-color: map.get(
-    $intelli-filter-map,
-    "active-text-color"
-  );
-  $intelli-filter-active-border-color: map.get(
-    $intelli-filter-map,
-    "active-border-color"
-  );
-
-  color: $intelli-filter-inactive-text-color;
-  border: 1px solid $intelli-filter-inactive-border-color;
-  background: $intelli-filter-inactive-bg-color;
-
-  &.active {
-    color: $intelli-filter-active-text-color !important;
-    background: $intelli-filter-active-bg-color !important;
-    border: 1px solid $intelli-filter-active-border-color !important;
-  }
-}
-
-$only-enabled-default-map: ("text-color": white, "bg-color": $primary-color);
-
-@mixin only-enabled-filter($enabled-styling: $only-enabled-default-map){
-  $color: map.get($enabled-styling, "text-color");
-  $bg-color: map.get($enabled-styling, "bg-color");
-
-  button.only-enabled-button{
-    color: $color;
-    background: $bg-color;
-    cursor: default;
-    pointer-events: none;
-  }
-}
-
-$intelli-filter-icon-default-map: (
-  "icon-font-size": 14.5px,
-  "icon-margin-right": 4px,
-  "active-icon-color": white,
-);
-
-@mixin intelli-filter-icons-styling(
-  $icon-styling: $intelli-filter-icon-default-map
-) {
-  $icon-font-size: map.get($icon-styling, "icon-font-size");
-  $icon-margin-right: map.get($icon-styling, "icon-margin-right");
-  $icon-active-color: map.get($icon-styling, "active-icon-color");
-
-  button.intelli-filter i {
-    font-size: $icon-font-size;
-    margin-right: $icon-margin-right;
-    display: flex;
-    vertical-align: middle;
-
-    &.mdi-star {
-      color: $amber;
-      opacity: 0.5;
-    }
-
-    &.mdi-alert {
-      color: #f97b07;
-    }
-
-    &.mdi-bell {
-      color: #f3bd18;
-    }
-
-    &.mdi-file-remove-outline {
-      color: #f44336;
-      margin-right: 2px;
-    }
-  }
-
-  button.intelli-filter.active {
-    ::ng-deep svg {
-      g {
-        stroke: $icon-active-color !important;
-        fill: $icon-active-color !important;
-      }
-    }
-
-    i {
-      color: $icon-active-color;
-    }
-
-    i.mdi-star {
-      color: #ffc107;
-      opacity: 0.9;
-      display: flex;
-    }
-  }
 }
 
-.filter-label {
-  @include fonts(Roboto, 0.875rem, normal, normal, normal, normal, normal);
-  color: $charcoal;
-  margin-bottom: 4px;
+button.intelli-filter.active{
+    color: white;
+    background: #268bff;
 }
 
-.filter-divider {
-  width: 1px;
-  margin-right: 8px;
-  height: 24px;
-  background: #111;
+button.intelli-filter:disabled {
+  border: 1px solid #bdbdbd;
+  color: #4a4a4a;
+  background: #bdbdbd;
+  opacity: .5;
+  cursor: not-allowed;
 }

package/src/lib/anna-common-scss/_gt-table.scss

@@ -18,7 +18,19 @@
 @mixin table-container-scroll-bar($margin-left: 0, $margin-top: 0){
     
     .table-container{
+        &::-webkit-scrollbar {
+            width: 4px;
+            height: 4px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            border-radius: 4px;
+            background-color: rgba(0, 0, 0, 0.4) !important;
+            border: 1px solid rgba(0, 0, 0, 0.2);
+        }
+
         &::-webkit-scrollbar-track {
+            border: 1px solid rgba(0, 0, 0, 0.1) !important;
             margin-top: $margin-top;
             margin-left: $margin-left;
         }

package/src/lib/anna-common-scss/_advertiser-listing-common.scss

@@ -1,73 +0,0 @@
-@use "../anna-common-scss/gt-table" as *;
-
-$LightBlue: #EEF6FF;
-$LightOrange: #F9EADD;
-$LightYellow: #F7F2D1;
-$LightGreen: #E1FFED;
-$DeepBlue: #1565C0;
-$DeepOrange: #F97B07;
-$DeepYellow: #F3BD18;
-$DeepGreen: #00C853;
-
-@mixin rowStyling($backgroundColor, $buttonColor, $color, $shadow-map) {
-  @include table-data((), $shadow-map, $backgroundColor);
-
-  ::ng-deep .status-btn {
-    background-color: $buttonColor !important;
-    color: $color;
-    border-radius: 2px !important;
-    padding: 2px 6px;
-    cursor: default !important;
-  }
-}
-
-@mixin advertiser-listing-table-styling($advertiser-box-shadow-map, $advertiser-no-data-box-shadow-map, $row-height-map){
-    :host ::ng-deep anna-core-non-editable-generic-table-lib {
-        @include table-container-scroll-bar(0px, 2.625rem);
-        @include table-header((), $advertiser-box-shadow-map);
-        @include no-data-table(142px, $advertiser-no-data-box-shadow-map, $row-height-map); 
-        
-        .loader {
-          margin-bottom: 0;
-        }
-      
-        tbody{
-          tr {
-            @include rowStyling(#fff,white, #000, $advertiser-box-shadow-map);
-          }
-          
-          tr.AWAITING_BUYER_CONFIRMATION,
-          tr.AWAITING_SELLER_CONFIRMATION {
-            @include rowStyling($LightBlue, $DeepBlue, white, $advertiser-box-shadow-map);
-          }
-      
-          tr.NEED_SELLER_CONFIRMATION,
-          tr.NEED_BUYER_CONFIRMATION {
-            @include rowStyling($LightOrange, $DeepOrange, white, $advertiser-box-shadow-map);
-          }
-      
-          tr.NOTIFY_BUYER {
-            @include rowStyling($LightYellow, $DeepYellow, white, $advertiser-box-shadow-map);
-          }
-      
-          tr.APPROVED {
-            @include rowStyling($LightGreen, $DeepGreen, white, $advertiser-box-shadow-map);
-          }
-
-          td{
-            cursor: default !important;
-          }
-        }
-      
-        th,td{
-          padding: 0 12px !important;
-        }
-      
-        .no-data{
-          margin-top: -63px !important;
-        }
-      
-        @include table-bottom-border($advertiser-box-shadow-map);
-        
-      }
-}

package/src/lib/anna-common-scss/_scrollbar.scss

@@ -1,14 +0,0 @@
-*::-webkit-scrollbar {
-  width: 4px;
-  height: 4px;
-}
-
-*::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  background-color: rgba(0, 0, 0, 0.4) !important;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-
-*::-webkit-scrollbar-track {
-  border: 1px solid rgba(0, 0, 0, 0.1) !important;
-}