[ACS-5601] Fix unit test, add contrast gray to badges

Alfresco · Oct 3, 2023 · fd0e5f4 · fd0e5f4
1 parent 12fb987
commit fd0e5f4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/...ca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss b/...ca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss
@@ -6,6 +6,10 @@
 
   .aca-name-column-badges {
     display: flex;
+
+    .adf-datatable-cell-badge {
+      color: var(--theme-contrast-gray);
+    }
   }
 
   .aca-name-column-container {

diff --git a/...content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts b/...content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts
@@ -32,7 +32,6 @@ import { AppExtensionService } from '@alfresco/aca-shared';
 import { of } from 'rxjs';
 import { ContentActionType } from '@alfresco/adf-extensions';
 import { By } from '@angular/platform-browser';
-import { INITIAL_APP_STATE } from '../../../store/initial-state';
 
 describe('CustomNameColumnComponent', () => {
   let fixture: ComponentFixture<CustomNameColumnComponent>;
@@ -49,7 +48,14 @@ describe('CustomNameColumnComponent', () => {
           { app: (state) => state },
           {
             initialState: {
-              app: INITIAL_APP_STATE
+              app: {
+                selection: {
+                  nodes: [],
+                  libraries: [],
+                  isEmpty: true,
+                  count: 0
+                }
+              }
             }
           }
         )

diff --git a/projects/aca-content/src/lib/ui/theme.scss b/projects/aca-content/src/lib/ui/theme.scss
@@ -4,14 +4,12 @@
 @import 'variables/variables';
 @include custom-theme($custom-theme);
 
-$contrast-gray: #646569;
-
 .mat-toolbar {
   color: var(--theme-text-color, rgba(0, 0, 0, 0.54));
 }
 
 .adf-name-location-cell-location.adf-datatable-cell-value {
-  color: $contrast-gray;
+  color: var(--theme-contrast-gray);
 }
 
 .mat-tab-list {
@@ -29,42 +27,42 @@ $contrast-gray: #646569;
 .mat-checkbox-label,
 mat-toolbar.mat-toolbar.mat-toolbar-multiple-row,
 mat-toolbar.mat-toolbar.mat-toolbar-single-row {
-  color: $contrast-gray;
+  color: var(--theme-contrast-gray);
   opacity: 1;
 }
 
 .adf-upload-dialog {
   &__header,
   &__content {
-    color: $contrast-gray;
+    color: var(--theme-contrast-gray);
   }
 }
 
 .adf-version-list {
   .adf-version-list-item {
     &-comment,
     &-date {
-      color: $contrast-gray;
+      color: var(--theme-contrast-gray);
       opacity: 1;
     }
   }
 }
 
 .mat-chip.mat-standard-chip {
   background-color: #efefef;
-  color: $contrast-gray;
+  color: var(--theme-contrast-gray);
 }
 
 .adf-property-field {
   .adf-textitem-edit-icon.mat-icon {
-    color: $contrast-gray;
+    color: var(--theme-contrast-gray);
   }
 }
 
 .adf-property-field.adf-card-textitem-field:hover .adf-property-clear-value {
-  color: $contrast-gray;
+  color: var(--theme-contrast-gray);
 }
 
 .adf-empty-content__icon {
-  color: $contrast-gray;
+  color: var(--theme-contrast-gray);
 }
diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss
@@ -35,6 +35,7 @@ $action-button-text-color: rgba(33, 35, 40, 0.7);
 $page-layout-header-background-color: #fff;
 $search-chip-icon-color: #757575;
 $disabled-chip-background-color: #f5f5f5;
+$contrast-gray: #646569;
 
 // CSS Variables
 $defaults: (
@@ -74,7 +75,8 @@ $defaults: (
   --theme-action-button-text-color: $action-button-text-color,
   --theme-page-layout-header-background-color: $page-layout-header-background-color,
   --theme-search-chip-icon-color: $search-chip-icon-color,
-  --theme-disabled-chip-background-color: $disabled-chip-background-color
+  --theme-disabled-chip-background-color: $disabled-chip-background-color,
+  --theme-contrast-gray: $contrast-gray
 );
 
 // propagates SCSS variables into the CSS variables scope