From 2124124f92745b0bc010b62dd46114e40be65a16 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sat, 12 Aug 2023 19:04:50 -0400 Subject: [PATCH 01/18] cleanup unused css --- .../aca-content/src/lib/ui/application.scss | 3 +- .../custom-background-color.scss | 14 -- .../dynamic-theme/custom-palette-creator.scss | 132 ------------------ .../ui/dynamic-theme/custom-text-color.scss | 8 -- .../dynamic-theme/custom-theme-palettes.scss | 33 ----- .../ui/dynamic-theme/custom-theme.scss.tpl | 72 ---------- .../src/lib/ui/dynamic-theme/index.scss | 1 - .../theme-configuration.scss.tpl | 14 -- .../src/lib/ui/dynamic-theme/typography.scss | 94 ------------- .../src/lib/ui/variables/font-family.scss | 1 - 10 files changed, 1 insertion(+), 371 deletions(-) delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/custom-background-color.scss delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/custom-palette-creator.scss delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/custom-text-color.scss delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/custom-theme-palettes.scss delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/custom-theme.scss.tpl delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/index.scss delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/theme-configuration.scss.tpl delete mode 100644 projects/aca-content/src/lib/ui/dynamic-theme/typography.scss delete mode 100644 projects/aca-content/src/lib/ui/variables/font-family.scss diff --git a/projects/aca-content/src/lib/ui/application.scss b/projects/aca-content/src/lib/ui/application.scss index df762f065f..2be7581910 100644 --- a/projects/aca-content/src/lib/ui/application.scss +++ b/projects/aca-content/src/lib/ui/application.scss @@ -2,7 +2,6 @@ @use '@angular/material' as mat; @import 'mixins'; @import 'theme'; -@import 'variables/font-family'; $foreground: map-get($custom-theme, foreground); @@ -11,7 +10,7 @@ body { @include flex-column; font-size: 14px; - font-family: $default-font-family; + font-family: 'Open Sans', serif; color: mat.get-color-from-palette($foreground, text, 0.87); margin: 0; diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/custom-background-color.scss b/projects/aca-content/src/lib/ui/dynamic-theme/custom-background-color.scss deleted file mode 100644 index 3913f02100..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/custom-background-color.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* stylelint-disable scss/no-global-function-names */ -@function get-custom-background-color($background-color, $theme) { - $background: map-get($theme, background); - $card: map-get($background, card); - $new-card-color: lighten($background-color, 10%); - $new-selected-button: lighten($background-color, 5%); - $background: map_merge($background, (background: $background-color)); - $background: map_merge($background, (card: $new-card-color)); - $background: map_merge($background, (modal: $new-card-color)); - $background: map_merge($background, (dialog: $new-card-color)); - $background: map_merge($background, (selected-button: $new-selected-button)); - - @return $background; -} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/custom-palette-creator.scss b/projects/aca-content/src/lib/ui/dynamic-theme/custom-palette-creator.scss deleted file mode 100644 index 656d10afcb..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/custom-palette-creator.scss +++ /dev/null @@ -1,132 +0,0 @@ -/* stylelint-disable scss/dollar-variable-pattern */ -/* stylelint-disable scss/no-global-function-names */ -/* stylelint-disable value-keyword-case */ -@use "sass:math"; - -@function multiply($fore, $back) { - $red: red($back) * red($fore) / 255; - $green: green($back) * green($fore) / 255; - $blue: blue($back) * blue($fore) / 255; - - @return rgb($red, $green, $blue); -} - -@function get-color-luminance($color) { - $colors: ( - 'red': red($color), - 'green': green($color), - 'blue': blue($color) - ); - - @each $name, $value in $colors { - $adjusted: 0; - $value: $value / 255; - - @if $value < 0.0393 { - $value: $value / 12.92; - } @else { - $value: ($value + .055) / 1.055; - $value: math.pow($value, 2.4); - } - - $colors: map-merge($colors, ($name: $value)); - } - - @return (map-get($colors, 'red') * .2126) + (map-get($colors, 'green') * .7152) + (map-get($colors, 'blue') * .0722); -} - -@function create-text-color($color, $color-type: 'primary') { - $red: red($color); - $green: green($color); - $blue: blue($color); - $light-text: $light-primary-text; - $dark-text: $dark-primary-text; - - @if $color-type == 'accent' { - $light-text: $light-secondary-text; - $dark-text: $dark-secondary-text; - } - - $light-text-luminance: get-color-luminance($light-text); - $dark-text-luminance: get-color-luminance($dark-text); - $background-color-luminance: get-color-luminance($color); - $light-text-luminance: $light-text-luminance + 0.5; - $dark-text-luminance: $dark-text-luminance + 0.5; - $background-color-luminance: $background-color-luminance + 0.5; - $luminance-contrast-for-light-text: $light-text-luminance / $background-color-luminance; - $luminance-contrast-for-dark-text: $background-color-luminance / $dark-text-luminance; - $text-colour: $light-text; - - @if $luminance-contrast-for-dark-text > $luminance-contrast-for-light-text { - $text-colour: $dark-text; - } - - @return $text-colour; -} - -@function create-color-palette($color, $color-type: 'primary') { - $light: #fff; - $dark: multiply($color, $color); - $color50: mix($light, $color, 88%); - $color100: mix($light, $color, 70%); - $color200: mix($light, $color, 50%); - $color300: mix($light, $color, 30%); - $color400: mix($light, $color, 15%); - $color500: mix($light, $color, 0%); - $color600: mix($dark, $color, 13%); - $color700: mix($dark, $color, 30%); - $color800: mix($dark, $color, 46%); - $color900: mix($dark, $color, 75%); - $colorA100: lighten(saturate(mix($dark, $color, 15%), 80%), 45.6%); - $colorA200: lighten(saturate(mix($dark, $color, 15%), 80%), 35.6%); - $colorA400: lighten(saturate(mix($dark, $color, 15%), 100%), 25.6%); - $colorA700: lighten(saturate(mix($dark, $color, 15%), 100%), 20.5%); - $contrast50: create-text-color($color50, $color-type); - $contrast100: create-text-color($color100, $color-type); - $contrast200: create-text-color($color200, $color-type); - $contrast300: create-text-color($color300, $color-type); - $contrast400: create-text-color($color400, $color-type); - $contrast500: create-text-color($color500, $color-type); - $contrast600: create-text-color($color600, $color-type); - $contrast700: create-text-color($color700, $color-type); - $contrast800: create-text-color($color800, $color-type); - $contrast900: create-text-color($color900, $color-type); - $contrastA100: create-text-color($colorA100, $color-type); - $contrastA200: create-text-color($colorA200, $color-type); - $contrastA400: create-text-color($colorA400, $color-type); - $contrastA700: create-text-color($colorA700, $color-type); - $palette: ( - 50: $color50, - 100: $color50, - 200: $color50, - 300: $color50, - 400: $color400, - 500: $color500, - 600: $color600, - 700: $color700, - 800: $color800, - 900: $color900, - A100: $colorA100, - A200: $colorA200, - A400: $colorA400, - A700: $colorA700, - contrast: ( - 50: $contrast50, - 100: $contrast100, - 200: $contrast200, - 300: $contrast300, - 400: $contrast400, - 500: $contrast500, - 600: $contrast600, - 700: $contrast700, - 800: $contrast800, - 900: $contrast900, - A100: $contrastA100, - A200: $contrastA200, - A400: $contrastA400, - A700: $contrastA700 - ) - ); - - @return $palette; -} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/custom-text-color.scss b/projects/aca-content/src/lib/ui/dynamic-theme/custom-text-color.scss deleted file mode 100644 index ad5060c7a5..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/custom-text-color.scss +++ /dev/null @@ -1,8 +0,0 @@ -/* stylelint-disable scss/no-global-function-names */ -@function get-custom-text-color($text-color, $theme) { - $foreground: map-get($custom-theme, foreground); - $foreground: map_merge($foreground, (text: $text-color)); - $foreground: map_merge($foreground, (secondary-text: $text-color)); - - @return $foreground; -} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme-palettes.scss b/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme-palettes.scss deleted file mode 100644 index d9bd5b6f92..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme-palettes.scss +++ /dev/null @@ -1,33 +0,0 @@ -/* stylelint-disable value-keyword-case */ - -@use '@angular/material' as mat; -@import '../colors'; -@import './custom-palette-creator'; - -@function get-mat-palettes($primary-color, $accent-color) { - $mat-primary-palette: null; - - @if $primary-color { - $custom-theme-primary-palette: create-color-palette($primary-color, 'primary'); - $mat-primary-palette: mat.define-palette($custom-theme-primary-palette, 500); - } @else { - $mat-primary-palette: mat.define-palette($aca-primary-blue, A100); - } - - $mat-accent-palette: null; - - @if $accent-color { - $custom-theme-accent-palette: create-color-palette($accent-color, 'accent'); - $mat-accent-palette: mat.define-palette($custom-theme-accent-palette, 500); - } @else { - $mat-accent-palette: mat.define-palette($aca-accent-green, A200); - } - - $mat-warn-palette: mat.define-palette($aca-warn, A100); - - @return ( - primary: $mat-primary-palette, - accent: $mat-accent-palette, - warning: $mat-warn-palette, - ) -} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme.scss.tpl b/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme.scss.tpl deleted file mode 100644 index b8a9c62fc0..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/custom-theme.scss.tpl +++ /dev/null @@ -1,72 +0,0 @@ -@import '@angular/material/theming'; -@import './overrides/adf-style-fixes.theme'; -@import './overrides/adf-pagination.theme'; -@import './overrides/adf-about.theme.scss'; -@import "./dynamic-theme/theme-configuration"; -@import "./dynamic-theme/typography"; -@import "./dynamic-theme/custom-theme-palettes"; -@import "./dynamic-theme/custom-background-color"; -@import "./dynamic-theme/custom-text-color"; - -$primary-color: map-get($theme-config, 'primaryColor'); -$accent-color: map-get($theme-config, 'accentColor'); -$background-color: map-get($theme-config, 'backgroundColor'); -$text-color: map-get($theme-config, 'textColor'); -$base-font-size: map-get($theme-config, 'baseFontSize'); -$font-family: map-get($theme-config, 'fontFamily'); - -$app-typography: get-mat-typography( - $base-font-size, - $font-family -); - -@include mat-core(); - -$palettes: get-mat-palettes($primary-color, $accent-color); -$custom-theme: mat-light-theme( - ( - color: ( - primary: map-get($palettes, primary), - accent: map-get($palettes, accent), - warn: map-get($palettes, warning) - ), - typography: $app-typography - ) -); - -@if $background-color { - $custom-background: get-custom-background-color($background-color, $custom-theme); - $custom-theme: map_merge($custom-theme, (background: $custom-background)); - - $color: map_get($custom-theme, color); - $new-color: map_merge($color, (background: $custom-background)); - $custom-theme: map_merge($custom-theme, (color: $new-color)); -} - -@if $text-color { - $custom-foreground: get-custom-text-color($text-color, $custom-theme); - $custom-theme: map_merge($custom-theme, (foreground: $custom-foreground)); - - $color: map_get($custom-theme, color); - $new-color: map_merge($color, (foreground: $custom-foreground)); - $custom-theme: map_merge($custom-theme, (color: $new-color)); -} - -@mixin custom-theme($theme) { - @include angular-material-theme($theme); - - @if $base-font-size { - @include adf-core-theme($theme, get-custom-adf-font-sizes()); - @include base-font-size($base-font-size); - } @else { - @include adf-core-theme($theme); - } - - @if $font-family { - @include base-font-family($font-family); - } - - @include adf-style-fixes($theme); - @include adf-pagination-theme($theme); - @include adf-about-theme($theme); -} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/index.scss b/projects/aca-content/src/lib/ui/dynamic-theme/index.scss deleted file mode 100644 index 71ef87a326..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/index.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../theme'; diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/theme-configuration.scss.tpl b/projects/aca-content/src/lib/ui/dynamic-theme/theme-configuration.scss.tpl deleted file mode 100644 index b96d9a679d..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/theme-configuration.scss.tpl +++ /dev/null @@ -1,14 +0,0 @@ -/* -Specify theme parameters e.g.: - -$theme-config: ( - primaryColor: #5175d2, - backgroundColor: #FAFAFA, - textColor: #793942, - accentColor: #C64F73, - baseFontSize: 26px, - fontFamily: Cursive -); -*/ - -${THEME_CONFIGURATION} diff --git a/projects/aca-content/src/lib/ui/dynamic-theme/typography.scss b/projects/aca-content/src/lib/ui/dynamic-theme/typography.scss deleted file mode 100644 index b9a330c658..0000000000 --- a/projects/aca-content/src/lib/ui/dynamic-theme/typography.scss +++ /dev/null @@ -1,94 +0,0 @@ -/* stylelint-disable scss/no-global-function-names */ -@use '@angular/material' as mat; -@import '../variables/font-family'; - -@function get-mat-typography($base-font-size, $font-family) { - $custom-typography: mat.define-typography-config( - $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', - $display-4: mat.define-typography-level(112px, 112px, 300), - $display-3: mat.define-typography-level(56px, 56px, 400), - $display-2: mat.define-typography-level(45px, 48px, 400), - $display-1: mat.define-typography-level(34px, 40px, 400), - $headline: mat.define-typography-level(24px, 32px, 400), - $title: mat.define-typography-level(20px, 32px, 500), - $subheading-2: mat.define-typography-level(16px, 28px, 400), - $subheading-1: mat.define-typography-level(15px, 24px, 400), - $body-2: mat.define-typography-level(14px, 24px, 500), - $body-1: mat.define-typography-level(14px, 20px, 400), - $caption: mat.define-typography-level(12px, 20px, 400), - $button: mat.define-typography-level(14px, 14px, 500), - // Line-height must be unit-less fraction of the font-size. - $input: mat.define-typography-level(16px, 1.25, 400) - ); - - @if $base-font-size { - $custom-typography: mat.define-typography-config( - $display-4: mat.define-typography-level(8rem, 8rem, 300), - $display-3: mat.define-typography-level(4rem, 4rem, 400), - $display-2: mat.define-typography-level(3.21rem, 3.21rem, 400), - $display-1: mat.define-typography-level(2.42rem, 2.85rem, 400), - $headline: mat.define-typography-level(1.71rem, 2.28rem, 400), - $title: mat.define-typography-level(1.42rem, 2.28rem, 500), - $subheading-2: mat.define-typography-level(1.14rem, 2rem, 400), - $subheading-1: mat.define-typography-level(1.07rem, 1.71rem, 400), - $body-2: mat.define-typography-level(1rem, 1.71rem, 500), - $body-1: mat.define-typography-level(1rem, 1.42rem, 400), - $caption: mat.define-typography-level(0.86rem, 1.42rem, 400), - $button: mat.define-typography-level(1rem, 1rem, 500), - $font-family: $default-font-family, - $input: mat.define-typography-level(1.14em, 1.25, 400) - ); - } - - @if $font-family { - @each $key, $level in $custom-typography { - @if type-of($level) == 'map' { - $new-level: map-merge( - $level, - ( - font-family: $font-family - ) - ); - $custom-typography: map-merge( - $custom-typography, - ( - $key: $new-level - ) - ); - } - } - - $custom-typography: map-merge( - $custom-typography, - ( - font-family: $font-family - ) - ); - } - - @return $custom-typography; -} - -@function get-custom-adf-font-sizes() { - @return ( - 'theme-adf-icon-1-font-size': 1.2rem, - 'theme-adf-picture-1-font-size': 1.28rem, - 'theme-adf-task-footer-font-size': 1.28rem, - 'theme-adf-task-title-font-size': 1.28rem, - 'theme-adf-spacing': 16px - ); -} - -@mixin base-font-size($font-size) { - html, - body { - font-size: $font-size; - } -} - -@mixin base-font-family($font-family) { - html, - body { - font-family: $font-family; - } -} diff --git a/projects/aca-content/src/lib/ui/variables/font-family.scss b/projects/aca-content/src/lib/ui/variables/font-family.scss deleted file mode 100644 index ded759c4e5..0000000000 --- a/projects/aca-content/src/lib/ui/variables/font-family.scss +++ /dev/null @@ -1 +0,0 @@ -$default-font-family: "Open Sans"; From 2102f0f2dd5584b1453bfde0735457f35a8908aa Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 10:08:17 -0400 Subject: [PATCH 02/18] remove unused store/reducer blocks --- .../favorite-libraries.component.html | 1 - .../lib/components/favorites/favorites.component.html | 1 - .../src/lib/components/files/files.component.html | 1 - .../lib/components/libraries/libraries.component.html | 1 - .../recent-files/recent-files.component.html | 1 - .../shared-files/shared-files.component.html | 1 - .../lib/components/trashcan/trashcan.component.html | 1 - .../aca-content/src/lib/store/reducers/app.reducer.ts | 8 -------- .../document-base-page/document-base-page.component.ts | 4 ---- .../aca-shared/store/src/actions/app-action-types.ts | 2 -- projects/aca-shared/store/src/actions/app.actions.ts | 10 ---------- .../aca-shared/store/src/selectors/app.selectors.ts | 1 - 12 files changed, 32 deletions(-) diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html index 061a422532..9c5e1321ed 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITL #documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [node]="$any(list)" [loading]="isLoading" [selectionMode]="'single'" diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html index 29afce483b..4c8ebd09c9 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.html +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}

#documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [currentFolderId]="'-favorites-'" [selectionMode]="'multiple'" [navigate]="false" diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html index d6da31a0fd..548d70b71c 100644 --- a/projects/aca-content/src/lib/components/files/files.component.html +++ b/projects/aca-content/src/lib/components/files/files.component.html @@ -20,7 +20,6 @@ #documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [selectionMode]="'multiple'" [multiselect]="false" [currentFolderId]="node?.id" diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html index 77890dad1c..e6b6d99edc 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.html +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | t #documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [currentFolderId]="'-mysites-'" [selectionMode]="'single'" [navigate]="false" diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html index 4c939b197e..b46ca34dfe 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.RECENT.TITLE' | translate }}

#documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [currentFolderId]="'-recent-'" [selectionMode]="'multiple'" [navigate]="false" diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html index 51ede34d66..9f37cb25a2 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.SHARED.TITLE' | translate }}

#documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [currentFolderId]="'-sharedlinks-'" [selectionMode]="'multiple'" [sorting]="['modifiedAt', 'desc']" diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html index fc18bfd0b8..39609ddf00 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html @@ -15,7 +15,6 @@

{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}

#documentList acaDocumentList acaContextActions - [display]="documentDisplayMode$ | async" [currentFolderId]="'-trashcan-'" [selectionMode]="'multiple'" [multiselect]="false" diff --git a/projects/aca-content/src/lib/store/reducers/app.reducer.ts b/projects/aca-content/src/lib/store/reducers/app.reducer.ts index a10b72ae10..7cb29e0b80 100644 --- a/projects/aca-content/src/lib/store/reducers/app.reducer.ts +++ b/projects/aca-content/src/lib/store/reducers/app.reducer.ts @@ -73,9 +73,6 @@ export function appReducer(state: AppState = INITIAL_APP_STATE, action: Action): case AppActionTypes.SetInfoDrawerMetadataAspect: newState = setInfoDrawerAspect(state, action as SetInfoDrawerMetadataAspectAction); break; - case AppActionTypes.ToggleDocumentDisplayMode: - newState = toggleDocumentDisplayMode(state); - break; case AppActionTypes.SetRepositoryInfo: newState = updateRepositoryStatus(state, action as SetRepositoryInfoAction); break; @@ -173,11 +170,6 @@ function showInfoDrawerPreview(state: AppState) { return newState; } -const toggleDocumentDisplayMode = (state: AppState) => ({ - ...state, - documentDisplayMode: state.documentDisplayMode === 'list' ? 'gallery' : 'list' -}); - function updateSelectedNodes(state: AppState, action: SetSelectedNodesAction): AppState { const newState = { ...state }; const nodes = [...action.payload]; diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts index 6e4d83339d..363ba486c8 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts @@ -36,7 +36,6 @@ import { ReloadDocumentListAction, getCurrentFolder, getAppSelection, - getDocumentDisplayMode, isInfoDrawerOpened, getSharedUrl, ViewNodeAction, @@ -61,7 +60,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges { infoDrawerOpened$: Observable; node: MinimalNodeEntryEntity; selection: SelectionState; - documentDisplayMode$: Observable; sharedPreviewUrl$: Observable; actions: Array = []; viewerToolbarActions: Array = []; @@ -94,8 +92,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges { this.sharedPreviewUrl$ = this.store.select(getSharedUrl); this.infoDrawerOpened$ = this.store.select(isInfoDrawerOpened).pipe(map((infoDrawerState) => !this.isOutletPreviewUrl() && infoDrawerState)); - this.documentDisplayMode$ = this.store.select(getDocumentDisplayMode); - this.store .select(getAppSelection) .pipe(takeUntil(this.onDestroy$)) diff --git a/projects/aca-shared/store/src/actions/app-action-types.ts b/projects/aca-shared/store/src/actions/app-action-types.ts index aa0fcbb1ec..0bef23c7fa 100644 --- a/projects/aca-shared/store/src/actions/app-action-types.ts +++ b/projects/aca-shared/store/src/actions/app-action-types.ts @@ -23,7 +23,6 @@ */ export enum AppActionTypes { - SetSettingsParameter = 'SET_SETTINGS_PARAMETER', SetInitialState = 'SET_INITIAL_STATE', SetCurrentFolder = 'SET_CURRENT_FOLDER', SetCurrentVersion = 'SET_CURRENT_VERSION', @@ -31,7 +30,6 @@ export enum AppActionTypes { SetUserProfile = 'SET_USER_PROFILE', SetRepositoryInfo = 'SET_REPOSITORY_INFO', ToggleInfoDrawer = 'TOGGLE_INFO_DRAWER', - ToggleDocumentDisplayMode = 'TOGGLE_DOCUMENT_DISPLAY_MODE', Logout = 'LOGOUT', ReloadDocumentList = 'RELOAD_DOCUMENT_LIST', ResetSelection = 'RESET_SELECTION', diff --git a/projects/aca-shared/store/src/actions/app.actions.ts b/projects/aca-shared/store/src/actions/app.actions.ts index 3cd43a9888..18ccc64514 100644 --- a/projects/aca-shared/store/src/actions/app.actions.ts +++ b/projects/aca-shared/store/src/actions/app.actions.ts @@ -27,12 +27,6 @@ import { Node, Person, Group, RepositoryInfo, VersionEntry } from '@alfresco/js- import { AppState } from '../states/app.state'; import { AppActionTypes } from './app-action-types'; -export class SetSettingsParameterAction implements Action { - readonly type = AppActionTypes.SetSettingsParameter; - - constructor(public payload: { name: string; value: any }) {} -} - export class SetInitialStateAction implements Action { readonly type = AppActionTypes.SetInitialState; @@ -67,10 +61,6 @@ export class ToggleInfoDrawerAction implements Action { readonly type = AppActionTypes.ToggleInfoDrawer; } -export class ToggleDocumentDisplayMode implements Action { - readonly type = AppActionTypes.ToggleDocumentDisplayMode; -} - export class LogoutAction implements Action { readonly type = AppActionTypes.Logout; } diff --git a/projects/aca-shared/store/src/selectors/app.selectors.ts b/projects/aca-shared/store/src/selectors/app.selectors.ts index 63fe483660..a2a3217a1b 100644 --- a/projects/aca-shared/store/src/selectors/app.selectors.ts +++ b/projects/aca-shared/store/src/selectors/app.selectors.ts @@ -40,7 +40,6 @@ export const getNavigationState = createSelector(selectApp, (state) => state.nav export const isInfoDrawerOpened = createSelector(selectApp, (state) => state.infoDrawerOpened); export const infoDrawerPreview = createSelector(selectApp, (state) => state.infoDrawerPreview); export const showFacetFilter = createSelector(selectApp, (state) => state.showFacetFilter); -export const getDocumentDisplayMode = createSelector(selectApp, (state) => state.documentDisplayMode); export const getRepositoryStatus = createSelector(selectApp, (state) => state.repository); export const isQuickShareEnabled = createSelector(getRepositoryStatus, (info) => info.status.isQuickShareEnabled); export const isAdmin = createSelector(selectApp, (state) => state.user.isAdmin); From 7eff2431c4515ef755632b9711e8fee36398ab2e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 10:36:47 -0400 Subject: [PATCH 03/18] fix typo in toolbar ("tool-bar") --- .../lib/components/info-drawer/info-drawer.component.ts | 2 +- .../toolbar-action/toolbar-action.component.html | 0 .../toolbar-action/toolbar-action.component.scss | 0 .../toolbar-action/toolbar-action.component.spec.ts | 0 .../toolbar-action/toolbar-action.component.ts | 0 .../toolbar-button/toolbar-button.component.html | 0 .../toolbar-button/toolbar-button.component.spec.ts | 0 .../toolbar-button/toolbar-button.component.ts | 0 .../toolbar-menu-item/toolbar-menu-item.component.html | 0 .../toolbar-menu-item/toolbar-menu-item.component.spec.ts | 0 .../toolbar-menu-item/toolbar-menu-item.component.ts | 0 .../toolbar-menu/toolbar-menu.component.html | 0 .../toolbar-menu/toolbar-menu.component.spec.ts | 0 .../toolbar-menu/toolbar-menu.component.ts | 0 .../src/lib/deprecated/shared-toolbar.module.ts | 8 ++++---- projects/aca-shared/src/public-api.ts | 8 ++++---- 16 files changed, 9 insertions(+), 9 deletions(-) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-action/toolbar-action.component.html (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-action/toolbar-action.component.scss (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-action/toolbar-action.component.spec.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-action/toolbar-action.component.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-button/toolbar-button.component.html (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-button/toolbar-button.component.spec.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-button/toolbar-button.component.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu-item/toolbar-menu-item.component.html (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu-item/toolbar-menu-item.component.spec.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu-item/toolbar-menu-item.component.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu/toolbar-menu.component.html (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu/toolbar-menu.component.spec.ts (100%) rename projects/aca-shared/src/lib/components/{tool-bar => toolbar}/toolbar-menu/toolbar-menu.component.ts (100%) diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts index ea9858b0ac..5b57c2af41 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts @@ -37,7 +37,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { InfoDrawerModule, ToolbarModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { A11yModule } from '@angular/cdk/a11y'; -import { ToolbarActionComponent } from '../tool-bar/toolbar-action/toolbar-action.component'; +import { ToolbarActionComponent } from '../toolbar/toolbar-action/toolbar-action.component'; @Component({ standalone: true, diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.html rename to projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.scss rename to projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.spec.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.spec.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.spec.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.spec.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-action/toolbar-action.component.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.html similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.html rename to projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.html diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.spec.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.spec.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.spec.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.spec.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-button/toolbar-button.component.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.html rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.spec.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.spec.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.spec.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.spec.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.html similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.html diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.spec.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.spec.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.spec.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.spec.ts diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts similarity index 100% rename from projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts rename to projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts diff --git a/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts b/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts index 038048c7b9..76b25543af 100644 --- a/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts +++ b/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts @@ -26,10 +26,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CoreModule } from '@alfresco/adf-core'; import { ExtensionsModule } from '@alfresco/adf-extensions'; -import { ToolbarButtonComponent } from '../components/tool-bar/toolbar-button/toolbar-button.component'; -import { ToolbarActionComponent } from '../components/tool-bar/toolbar-action/toolbar-action.component'; -import { ToolbarMenuItemComponent } from '../components/tool-bar/toolbar-menu-item/toolbar-menu-item.component'; -import { ToolbarMenuComponent } from '../components/tool-bar/toolbar-menu/toolbar-menu.component'; +import { ToolbarButtonComponent } from '../components/toolbar/toolbar-button/toolbar-button.component'; +import { ToolbarActionComponent } from '../components/toolbar/toolbar-action/toolbar-action.component'; +import { ToolbarMenuItemComponent } from '../components/toolbar/toolbar-menu-item/toolbar-menu-item.component'; +import { ToolbarMenuComponent } from '../components/toolbar/toolbar-menu/toolbar-menu.component'; // @deprecated @NgModule({ diff --git a/projects/aca-shared/src/public-api.ts b/projects/aca-shared/src/public-api.ts index a364b9c078..7eee47e089 100644 --- a/projects/aca-shared/src/public-api.ts +++ b/projects/aca-shared/src/public-api.ts @@ -30,10 +30,10 @@ export * from './lib/components/page-layout/page-layout.component'; export * from './lib/components/page-layout/page-layout.module'; export * from './lib/components/locked-by/locked-by.component'; export * from './lib/components/generic-error/generic-error.component'; -export * from './lib/components/tool-bar/toolbar-action/toolbar-action.component'; -export * from './lib/components/tool-bar/toolbar-button/toolbar-button.component'; -export * from './lib/components/tool-bar/toolbar-menu/toolbar-menu.component'; -export * from './lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component'; +export * from './lib/components/toolbar/toolbar-action/toolbar-action.component'; +export * from './lib/components/toolbar/toolbar-button/toolbar-button.component'; +export * from './lib/components/toolbar/toolbar-menu/toolbar-menu.component'; +export * from './lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component'; export * from './lib/components/info-drawer/info-drawer.component'; export * from './lib/components/document-base-page/document-base-page.component'; export * from './lib/components/document-base-page/document-base-page.service'; From 1bc3555c25126842ef1f49b22638f397b28a99d7 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 10:46:05 -0400 Subject: [PATCH 04/18] toolbar action: break dependency on adf-core --- .../toolbar/toolbar-action/toolbar-action.component.html | 2 +- .../toolbar/toolbar-action/toolbar-action.component.scss | 8 ++++++++ .../toolbar/toolbar-action/toolbar-action.component.ts | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html index 0373201b45..252ba492f4 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.html @@ -7,7 +7,7 @@ - +
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss index 593e346f7c..2ac8a2145b 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss @@ -1,3 +1,11 @@ .aca-toolbar-action { margin: 0 5px; } + +.aca-toolbar-divider { + height: 24px; + width: 1px; + background: rgba(0, 0, 0, 0.26); + margin-left: 5px; + margin-right: 5px; +} diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts index 61c017d916..a24e65d08a 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts @@ -27,12 +27,11 @@ import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { ToolbarButtonComponent, ToolbarButtonType } from '../toolbar-button/toolbar-button.component'; import { ThemePalette } from '@angular/material/core'; import { CommonModule } from '@angular/common'; -import { ToolbarModule } from '@alfresco/adf-core'; import { ToolbarMenuComponent } from '../toolbar-menu/toolbar-menu.component'; @Component({ standalone: true, - imports: [CommonModule, ExtensionsModule, ToolbarModule, ToolbarButtonComponent, ToolbarMenuComponent], + imports: [CommonModule, ExtensionsModule, ToolbarButtonComponent, ToolbarMenuComponent], selector: 'aca-toolbar-action', templateUrl: './toolbar-action.component.html', styleUrls: ['./toolbar-action.component.scss'], From 1dff13e1f2cb30a6766bcb24a3bab7b675562f15 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 14:07:05 -0400 Subject: [PATCH 05/18] unified toolbar component --- .../src/lib/components/preview.component.html | 4 +- .../src/lib/components/preview.component.ts | 4 +- .../components/details/details.component.html | 7 +-- .../components/details/details.component.ts | 8 ++-- .../favorite-libraries.component.html | 7 +-- .../favorite-libraries.component.ts | 9 ++-- .../favorites/favorites.component.html | 7 +-- .../favorites/favorites.component.ts | 9 ++-- .../lib/components/files/files.component.html | 7 +-- .../lib/components/files/files.component.ts | 9 ++-- .../libraries/libraries.component.html | 7 +-- .../libraries/libraries.component.ts | 9 ++-- .../recent-files/recent-files.component.html | 7 +-- .../recent-files/recent-files.component.ts | 9 ++-- .../search-libraries-results.component.html | 6 +-- .../search-libraries-results.component.ts | 9 ++-- .../search-results.component.html | 6 +-- .../search-results.component.ts | 9 ++-- .../shared-files/shared-files.component.html | 7 +-- .../shared-files/shared-files.component.ts | 9 ++-- .../shared-link-view.component.html | 4 +- .../shared-link-view.component.ts | 4 +- .../components/sidenav-header.component.html | 4 +- .../components/sidenav-header.component.ts | 27 +++++------- .../trashcan/trashcan.component.html | 7 +-- .../components/trashcan/trashcan.component.ts | 9 ++-- .../components/viewer/viewer.component.html | 4 +- .../lib/components/viewer/viewer.component.ts | 4 +- .../info-drawer/info-drawer.component.html | 6 +-- .../info-drawer/info-drawer.component.ts | 24 ++-------- .../components/toolbar/toolbar.component.html | 5 +++ .../components/toolbar/toolbar.component.ts | 44 +++++++++++++++++++ projects/aca-shared/src/public-api.ts | 1 + 33 files changed, 123 insertions(+), 169 deletions(-) create mode 100644 projects/aca-shared/src/lib/components/toolbar/toolbar.component.html create mode 100644 projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts diff --git a/projects/aca-content/preview/src/lib/components/preview.component.html b/projects/aca-content/preview/src/lib/components/preview.component.html index 5e02b2eaa4..e0eed96c12 100644 --- a/projects/aca-content/preview/src/lib/components/preview.component.html +++ b/projects/aca-content/preview/src/lib/components/preview.component.html @@ -28,9 +28,7 @@ - - - + diff --git a/projects/aca-content/preview/src/lib/components/preview.component.ts b/projects/aca-content/preview/src/lib/components/preview.component.ts index 881aa242f7..853e02eed4 100644 --- a/projects/aca-content/preview/src/lib/components/preview.component.ts +++ b/projects/aca-content/preview/src/lib/components/preview.component.ts @@ -34,7 +34,7 @@ import { ContentApiService, InfoDrawerComponent, ToolbarMenuItemComponent, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { ContentActionRef, ViewerExtensionRef } from '@alfresco/adf-extensions'; import { SearchRequest } from '@alfresco/js-api'; @@ -44,7 +44,7 @@ import { AlfrescoViewerModule, NodesApiService } from '@alfresco/adf-content-ser @Component({ standalone: true, - imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, ToolbarMenuItemComponent, ToolbarActionComponent], + imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, ToolbarMenuItemComponent, ToolbarComponent], selector: 'app-preview', templateUrl: './preview.component.html', styleUrls: ['./preview.component.scss'], diff --git a/projects/aca-content/src/lib/components/details/details.component.html b/projects/aca-content/src/lib/components/details/details.component.html index 345c5d05df..de8c24fee0 100644 --- a/projects/aca-content/src/lib/components/details/details.component.html +++ b/projects/aca-content/src/lib/components/details/details.component.html @@ -1,12 +1,7 @@
- - - - - - +
diff --git a/projects/aca-content/src/lib/components/details/details.component.ts b/projects/aca-content/src/lib/components/details/details.component.ts index 5edc4cae5c..a025c0409c 100644 --- a/projects/aca-content/src/lib/components/details/details.component.ts +++ b/projects/aca-content/src/lib/components/details/details.component.ts @@ -24,11 +24,10 @@ import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarActionComponent } from '@alfresco/aca-shared'; +import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarComponent } from '@alfresco/aca-shared'; import { NavigateToPreviousPage, SetSelectedNodesAction } from '@alfresco/aca-shared/store'; import { Subject } from 'rxjs'; import { BreadcrumbModule, PermissionManagerModule } from '@alfresco/adf-content-services'; -import { ToolbarModule } from '@alfresco/adf-core'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; @@ -45,15 +44,14 @@ import { CommentsTabComponent } from '../info-drawer/comments-tab/comments-tab.c TranslateModule, PermissionManagerModule, BreadcrumbModule, - ToolbarModule, MatIconModule, MatTabsModule, MatProgressBarModule, MatButtonModule, MetadataTabComponent, CommentsTabComponent, - ToolbarActionComponent, - PageLayoutComponent + PageLayoutComponent, + ToolbarComponent ], selector: 'app-details-manager', templateUrl: './details.component.html', diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html index 9c5e1321ed..874c0126bc 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts index d2d247960b..a2b2461720 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts @@ -31,10 +31,10 @@ import { InfoDrawerComponent, PageComponent, PageLayoutComponent, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { NavigateLibraryAction } from '@alfresco/aca-shared/store'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule, UserPreferencesService } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule, UserPreferencesService } from '@alfresco/adf-core'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { DocumentListModule } from '@alfresco/adf-content-services'; @@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core'; standalone: true, imports: [ CommonModule, - ToolbarModule, DocumentListModule, DocumentListDirective, ContextActionsDirective, @@ -54,9 +53,9 @@ import { TranslateModule } from '@ngx-translate/core'; ExtensionsModule, PaginationModule, InfoDrawerComponent, - ToolbarActionComponent, PageLayoutComponent, - TranslateModule + TranslateModule, + ToolbarComponent ], templateUrl: './favorite-libraries.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html index 4c8ebd09c9..5b238f28b1 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.html +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.ts index eb2dc3106a..366ae8f270 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.ts +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.ts @@ -29,7 +29,7 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, PathInfo } from '@alfresco/js-api'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; @@ -37,7 +37,7 @@ import { debounceTime, map } from 'rxjs/operators'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { DocumentListModule } from '@alfresco/adf-content-services'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core'; import { DocumentListDirective } from '../../directives/document-list.directive'; import { TranslateModule } from '@ngx-translate/core'; @@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core'; standalone: true, imports: [ CommonModule, - ToolbarModule, DocumentListModule, DocumentListDirective, ContextActionsDirective, @@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core'; PaginationModule, PaginationDirective, InfoDrawerComponent, - ToolbarActionComponent, PageLayoutComponent, - TranslateModule + TranslateModule, + ToolbarComponent ], templateUrl: './favorites.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html index 548d70b71c..e4e349747a 100644 --- a/projects/aca-content/src/lib/components/files/files.component.html +++ b/projects/aca-content/src/lib/components/files/files.component.html @@ -1,12 +1,7 @@
- - - - - - +
diff --git a/projects/aca-content/src/lib/components/files/files.component.ts b/projects/aca-content/src/lib/components/files/files.component.ts index 44caa0740b..41b68ac25f 100644 --- a/projects/aca-content/src/lib/components/files/files.component.ts +++ b/projects/aca-content/src/lib/components/files/files.component.ts @@ -22,7 +22,7 @@ * from Hyland Software. If not, see . */ -import { DataTableModule, PaginationModule, ShowHeaderMode, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, ShowHeaderMode } from '@alfresco/adf-core'; import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElement, PathElementEntity } from '@alfresco/js-api'; @@ -35,7 +35,7 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { SetCurrentFolderAction, isAdmin, UploadFileVersionAction, showLoaderSelector } from '@alfresco/aca-shared/store'; import { debounceTime, takeUntil } from 'rxjs/operators'; @@ -52,7 +52,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; CommonModule, TranslateModule, BreadcrumbModule, - ToolbarModule, GenericErrorComponent, UploadModule, DocumentListModule, @@ -63,9 +62,9 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; PaginationModule, MatProgressSpinnerModule, InfoDrawerComponent, - ToolbarActionComponent, PaginationDirective, - PageLayoutComponent + PageLayoutComponent, + ToolbarComponent ], templateUrl: './files.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html index e6b6d99edc..3e129f3525 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.html +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.ts index 4a8b7063fa..c6c1369fd7 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.ts +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.ts @@ -32,12 +32,12 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { DocumentListModule } from '@alfresco/adf-content-services'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core'; import { DocumentListDirective } from '../../directives/document-list.directive'; import { TranslateModule } from '@ngx-translate/core'; @@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core'; standalone: true, imports: [ CommonModule, - ToolbarModule, DocumentListModule, DocumentListDirective, ContextActionsDirective, @@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core'; PaginationModule, PaginationDirective, InfoDrawerComponent, - ToolbarActionComponent, PageLayoutComponent, - TranslateModule + TranslateModule, + ToolbarComponent ], templateUrl: './libraries.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html index b46ca34dfe..43b97ec8e2 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.RECENT.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts index 883a9ec4e3..71418aea14 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts @@ -31,12 +31,12 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { DocumentListModule } from '@alfresco/adf-content-services'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core'; import { DocumentListDirective } from '../../directives/document-list.directive'; import { TranslateModule } from '@ngx-translate/core'; @@ -44,7 +44,6 @@ import { TranslateModule } from '@ngx-translate/core'; standalone: true, imports: [ CommonModule, - ToolbarModule, DocumentListModule, DocumentListDirective, ContextActionsDirective, @@ -54,9 +53,9 @@ import { TranslateModule } from '@ngx-translate/core'; PaginationModule, PaginationDirective, InfoDrawerComponent, - ToolbarActionComponent, PageLayoutComponent, - TranslateModule + TranslateModule, + ToolbarComponent ], templateUrl: './recent-files.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html index 6ee8560dd2..db793f728e 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html @@ -2,11 +2,7 @@
- - - - - +
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts index 8730d49386..29b39fe6a4 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts @@ -35,13 +35,13 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { SearchInputComponent } from '../search-input/search-input.component'; -import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule } from '@alfresco/adf-core'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { DocumentListModule } from '@alfresco/adf-content-services'; import { DocumentListDirective } from '../../../directives/document-list.directive'; @@ -52,7 +52,6 @@ import { DocumentListDirective } from '../../../directives/document-list.directi CommonModule, TranslateModule, SearchInputComponent, - ToolbarModule, MatProgressBarModule, DocumentListModule, DataTableModule, @@ -61,9 +60,9 @@ import { DocumentListDirective } from '../../../directives/document-list.directi InfoDrawerComponent, ContextActionsDirective, DocumentListDirective, - ToolbarActionComponent, PaginationDirective, - PageLayoutComponent + PageLayoutComponent, + ToolbarComponent ], selector: 'aca-search-results', templateUrl: './search-libraries-results.component.html', diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html index e5b4b9ce1b..02542f63bb 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html @@ -2,11 +2,7 @@
- - - - - +
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts index 24779dc454..758b4366f3 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts @@ -35,7 +35,7 @@ import { ShowInfoDrawerPreviewAction, SnackbarErrorAction } from '@alfresco/aca-shared/store'; -import { DataTableModule, PaginationModule, ToolbarModule, TranslationService, ViewerModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TranslationService, ViewerModule } from '@alfresco/adf-core'; import { combineLatest } from 'rxjs'; import { ContextActionsDirective, @@ -43,7 +43,7 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { SearchSortingDefinition } from '@alfresco/adf-content-services/lib/search/models/search-sorting-definition.interface'; import { takeUntil } from 'rxjs/operators'; @@ -66,7 +66,6 @@ import { SearchResultsRowComponent } from '../search-results-row/search-results- CommonModule, TranslateModule, SearchInputComponent, - ToolbarModule, MatProgressBarModule, SearchModule, MatDividerModule, @@ -85,8 +84,8 @@ import { SearchResultsRowComponent } from '../search-results-row/search-results- SearchResultsRowComponent, PaginationDirective, ViewerModule, - ToolbarActionComponent, - PageLayoutComponent + PageLayoutComponent, + ToolbarComponent ], selector: 'aca-search-results', templateUrl: './search-results.component.html', diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html index 9f37cb25a2..5219b64660 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.SHARED.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts index 3cf8594235..d0ad97f890 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts @@ -32,12 +32,12 @@ import { PageComponent, PageLayoutComponent, PaginationDirective, - ToolbarActionComponent + ToolbarComponent } from '@alfresco/aca-shared'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { DocumentListModule } from '@alfresco/adf-content-services'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core'; import { DocumentListDirective } from '../../directives/document-list.directive'; import { TranslateModule } from '@ngx-translate/core'; @@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core'; standalone: true, imports: [ CommonModule, - ToolbarModule, DocumentListModule, DocumentListDirective, ContextActionsDirective, @@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core'; PaginationModule, InfoDrawerComponent, PaginationDirective, - ToolbarActionComponent, PageLayoutComponent, - TranslateModule + TranslateModule, + ToolbarComponent ], templateUrl: './shared-files.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.html b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.html index f123da35e9..d8b9abda60 100644 --- a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.html +++ b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.html @@ -1,9 +1,7 @@ - - - + diff --git a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts index 6e0e175032..9f0d00c810 100644 --- a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts +++ b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts @@ -31,13 +31,13 @@ import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; import { forkJoin, from, of, Subject } from 'rxjs'; import { catchError, mergeMap, takeUntil } from 'rxjs/operators'; -import { AppExtensionService, AppService, ToolbarActionComponent } from '@alfresco/aca-shared'; +import { AppExtensionService, AppService, ToolbarComponent } from '@alfresco/aca-shared'; import { CommonModule } from '@angular/common'; import { AlfrescoViewerModule } from '@alfresco/adf-content-services'; @Component({ standalone: true, - imports: [CommonModule, ViewerModule, AlfrescoViewerModule, ToolbarActionComponent], + imports: [CommonModule, ViewerModule, AlfrescoViewerModule, ToolbarComponent], selector: 'app-shared-link-view', templateUrl: './shared-link-view.component.html', styleUrls: ['shared-link-view.component.scss'], diff --git a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html index a938b37567..7a74ed6e61 100644 --- a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html +++ b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html @@ -14,8 +14,6 @@ {{ appName$ | async | translate }}
- - - +
diff --git a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.ts b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.ts index 3987612ea9..b0925456f9 100644 --- a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.ts +++ b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.ts @@ -22,13 +22,13 @@ * from Hyland Software. If not, see . */ -import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; +import { Component, EventEmitter, inject, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { Store } from '@ngrx/store'; -import { Observable, Subject } from 'rxjs'; +import { Subject } from 'rxjs'; import { AppStore, getAppName, getLogoPath } from '@alfresco/aca-shared/store'; import { AppConfigService } from '@alfresco/adf-core'; import { ContentActionRef } from '@alfresco/adf-extensions'; -import { AppExtensionService, ToolbarActionComponent } from '@alfresco/aca-shared'; +import { AppExtensionService, ToolbarComponent } from '@alfresco/aca-shared'; import { takeUntil } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; @@ -36,7 +36,7 @@ import { RouterModule } from '@angular/router'; @Component({ standalone: true, - imports: [CommonModule, TranslateModule, RouterModule, ToolbarActionComponent], + imports: [CommonModule, TranslateModule, RouterModule, ToolbarComponent], selector: 'app-sidenav-header', templateUrl: `./sidenav-header.component.html`, encapsulation: ViewEncapsulation.None, @@ -44,21 +44,18 @@ import { RouterModule } from '@angular/router'; }) export class SidenavHeaderComponent implements OnInit, OnDestroy { private onDestroy$ = new Subject(); + private store = inject>(Store); + private appConfigService = inject(AppConfigService); + private appExtensions = inject(AppExtensionService); - appName$: Observable; - logo$: Observable; - landingPage: string; + appName$ = this.store.select(getAppName); + logo$ = this.store.select(getLogoPath); + landingPage = this.appConfigService.get('landingPage', '/personal-files'); actions: Array = []; @Output() toggleNavBar = new EventEmitter(); - constructor(public store: Store, private appConfigService: AppConfigService, private appExtensions: AppExtensionService) { - this.appName$ = store.select(getAppName); - this.logo$ = store.select(getLogoPath); - this.landingPage = this.appConfigService.get('landingPage', '/personal-files'); - } - ngOnInit() { this.appExtensions .getHeaderActions() @@ -72,8 +69,4 @@ export class SidenavHeaderComponent implements OnInit, OnDestroy { this.onDestroy$.next(true); this.onDestroy$.complete(); } - - trackByActionId(_: number, action: ContentActionRef) { - return action.id; - } } diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html index 39609ddf00..10f449ce18 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html @@ -1,12 +1,7 @@

{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}

- - - - - - +
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts index 3ebf960449..42d29cd6f3 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts @@ -25,11 +25,11 @@ import { getUserProfile } from '@alfresco/aca-shared/store'; import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { ContextActionsDirective, PageComponent, PageLayoutComponent, PaginationDirective, ToolbarActionComponent } from '@alfresco/aca-shared'; +import { ContextActionsDirective, PageComponent, PageLayoutComponent, PaginationDirective, ToolbarComponent } from '@alfresco/aca-shared'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { DocumentListModule } from '@alfresco/adf-content-services'; -import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core'; +import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core'; import { DocumentListDirective } from '../../directives/document-list.directive'; @Component({ @@ -37,7 +37,6 @@ import { DocumentListDirective } from '../../directives/document-list.directive' imports: [ CommonModule, TranslateModule, - ToolbarModule, DocumentListModule, TemplateModule, PaginationModule, @@ -46,8 +45,8 @@ import { DocumentListDirective } from '../../directives/document-list.directive' DocumentListDirective, ContextActionsDirective, PaginationDirective, - ToolbarActionComponent, - PageLayoutComponent + PageLayoutComponent, + ToolbarComponent ], templateUrl: './trashcan.component.html', encapsulation: ViewEncapsulation.None diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html index bf6bdcad9d..be796b728c 100644 --- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html +++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html @@ -30,9 +30,7 @@ - - - + diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts index 08e2d154db..6d1c8282c8 100644 --- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts +++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts @@ -27,7 +27,7 @@ import { AppHookService, ContentApiService, InfoDrawerComponent, - ToolbarActionComponent, + ToolbarComponent, ToolbarMenuItemComponent } from '@alfresco/aca-shared'; import { @@ -56,7 +56,7 @@ import { CommonModule } from '@angular/common'; @Component({ standalone: true, - imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, AppConfigModule, ToolbarMenuItemComponent, ToolbarActionComponent], + imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, AppConfigModule, ToolbarMenuItemComponent, ToolbarComponent], selector: 'aca-viewer', templateUrl: './viewer.component.html', styleUrls: ['./viewer.component.scss'], diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html index 954d5bc628..a00199ff02 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html @@ -3,11 +3,7 @@
- - - - - + diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts index 5b57c2af41..51f01a8783 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts @@ -31,26 +31,16 @@ import { AppExtensionService } from '../../services/app.extension.service'; import { ContentApiService } from '../../services/content-api.service'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { ThemePalette } from '@angular/material/core'; import { CommonModule } from '@angular/common'; import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { InfoDrawerModule, ToolbarModule } from '@alfresco/adf-core'; +import { InfoDrawerModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { A11yModule } from '@angular/cdk/a11y'; -import { ToolbarActionComponent } from '../toolbar/toolbar-action/toolbar-action.component'; +import { ToolbarComponent } from '../toolbar/toolbar.component'; @Component({ standalone: true, - imports: [ - CommonModule, - TranslateModule, - MatProgressBarModule, - InfoDrawerModule, - ExtensionsModule, - ToolbarModule, - A11yModule, - ToolbarActionComponent - ], + imports: [CommonModule, TranslateModule, MatProgressBarModule, InfoDrawerModule, ExtensionsModule, A11yModule, ToolbarComponent], selector: 'aca-info-drawer', templateUrl: './info-drawer.component.html', encapsulation: ViewEncapsulation.None @@ -114,14 +104,6 @@ export class InfoDrawerComponent implements OnChanges, OnInit, OnDestroy { } } - trackByActionId(_: number, action: ContentActionRef) { - return action.id; - } - - getEntryColor(entry: any): ThemePalette { - return entry?.color; - } - private close() { this.store.dispatch(new ToggleInfoDrawerAction()); } diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html new file mode 100644 index 0000000000..2f0a9b10fc --- /dev/null +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts new file mode 100644 index 0000000000..f5f87179b0 --- /dev/null +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts @@ -0,0 +1,44 @@ +/*! + * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Alfresco Example Content Application + * + * This file is part of the Alfresco Example Content Application. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * The Alfresco Example Content Application is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The Alfresco Example Content Application is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * from Hyland Software. If not, see . + */ + +import { Component, Input, ViewEncapsulation } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ContentActionRef } from '@alfresco/adf-extensions'; +import { ToolbarModule } from '@alfresco/adf-core'; +import { ToolbarActionComponent } from './toolbar-action/toolbar-action.component'; + +@Component({ + selector: 'aca-toolbar', + standalone: true, + imports: [CommonModule, ToolbarModule, ToolbarActionComponent], + templateUrl: './toolbar.component.html', + encapsulation: ViewEncapsulation.None +}) +export class ToolbarComponent { + @Input() items: ContentActionRef[]; + + trackByActionId(_: number, action: ContentActionRef) { + return action.id; + } +} diff --git a/projects/aca-shared/src/public-api.ts b/projects/aca-shared/src/public-api.ts index 7eee47e089..43b0c0f1bf 100644 --- a/projects/aca-shared/src/public-api.ts +++ b/projects/aca-shared/src/public-api.ts @@ -30,6 +30,7 @@ export * from './lib/components/page-layout/page-layout.component'; export * from './lib/components/page-layout/page-layout.module'; export * from './lib/components/locked-by/locked-by.component'; export * from './lib/components/generic-error/generic-error.component'; +export * from './lib/components/toolbar/toolbar.component'; export * from './lib/components/toolbar/toolbar-action/toolbar-action.component'; export * from './lib/components/toolbar/toolbar-button/toolbar-button.component'; export * from './lib/components/toolbar/toolbar-menu/toolbar-menu.component'; From 4107384a8ec34302e9431566c5498683a8589c64 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 14:28:19 -0400 Subject: [PATCH 06/18] break dependency on adf toolbar module --- .../toolbar-action.component.scss | 8 ------ .../components/toolbar/toolbar.component.html | 4 +-- .../components/toolbar/toolbar.component.scss | 27 +++++++++++++++++++ .../components/toolbar/toolbar.component.ts | 5 ++-- 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss index 2ac8a2145b..593e346f7c 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.scss @@ -1,11 +1,3 @@ .aca-toolbar-action { margin: 0 5px; } - -.aca-toolbar-divider { - height: 24px; - width: 1px; - background: rgba(0, 0, 0, 0.26); - margin-left: 5px; - margin-right: 5px; -} diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html index 2f0a9b10fc..24eb310f86 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html @@ -1,5 +1,5 @@ - + - + diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss new file mode 100644 index 0000000000..0d4cd41aef --- /dev/null +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss @@ -0,0 +1,27 @@ +aca-toolbar { + .mat-toolbar { + min-height: 48px; + color: var(--adf-theme-foreground-text-color-054); + background-color: inherit; + border: none; + padding: 0; + } + + .mat-toolbar-row { + height: 48px; + font-size: var(--theme-body-1-font-size); + white-space: normal; + } + + .mat-toolbar-single-row { + height: 64px; + } + + .aca-toolbar-divider { + height: 24px; + width: 1px; + background: rgba(0, 0, 0, 0.26); + margin-left: 5px; + margin-right: 5px; + } +} diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts index f5f87179b0..53fd338423 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.ts @@ -25,14 +25,15 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ContentActionRef } from '@alfresco/adf-extensions'; -import { ToolbarModule } from '@alfresco/adf-core'; import { ToolbarActionComponent } from './toolbar-action/toolbar-action.component'; +import { MatToolbarModule } from '@angular/material/toolbar'; @Component({ selector: 'aca-toolbar', standalone: true, - imports: [CommonModule, ToolbarModule, ToolbarActionComponent], + imports: [CommonModule, ToolbarActionComponent, MatToolbarModule], templateUrl: './toolbar.component.html', + styleUrls: ['./toolbar.component.scss'], encapsulation: ViewEncapsulation.None }) export class ToolbarComponent { From b61c4ed88e8bae8a7747b2e66b6ebbae09c195af Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 15:04:09 -0400 Subject: [PATCH 07/18] update e2e --- .../aca-testing-shared/src/components/toolbar/toolbar.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/aca-testing-shared/src/components/toolbar/toolbar.ts b/projects/aca-testing-shared/src/components/toolbar/toolbar.ts index 55e15c543a..092fdb7451 100755 --- a/projects/aca-testing-shared/src/components/toolbar/toolbar.ts +++ b/projects/aca-testing-shared/src/components/toolbar/toolbar.ts @@ -48,7 +48,7 @@ export class Toolbar extends Component { viewerDownloadButton = element(By.css('[id="app.viewer.download"]')); constructor(ancestor?: string) { - super('.adf-toolbar', ancestor); + super('aca-toolbar', ancestor); } async isEmpty(): Promise { @@ -118,11 +118,6 @@ export class Toolbar extends Component { await BrowserActions.click(this.menu.createFolderAction); } - async openCreateLibraryDialog(): Promise { - await this.openCreateMenu(); - await BrowserActions.click(this.menu.createLibraryAction); - } - async openCreateFileFromTemplateDialog(): Promise { await this.openCreateMenu(); await BrowserActions.click(this.menu.createFileFromTemplateAction); From eb760d83b70547169200fa75ff43c011b63bddf4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 15:06:04 -0400 Subject: [PATCH 08/18] update e2e --- .../src/page-objects/components/aca-header.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts b/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts index ce88658f10..5b8ab0ddf3 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts @@ -25,7 +25,7 @@ import { BaseComponent } from './base.component'; import { Page } from '@playwright/test'; export class AcaHeader extends BaseComponent { - private static rootElement = 'adf-toolbar'; + private static rootElement = 'aca-toolbar'; private moreActionsButton = this.getChild('button[id="app.viewer.toolbar.more"]'); public createButton = this.getChild('[id="app.toolbar.create"]'); public viewDetails = this.getChild('[title="View Details"]'); From 4134b58474226854314a2021e3a82756fb498e21 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 15:48:08 -0400 Subject: [PATCH 09/18] update e2e --- projects/aca-testing-shared/src/pages/browsing-page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/aca-testing-shared/src/pages/browsing-page.ts b/projects/aca-testing-shared/src/pages/browsing-page.ts index 121adc46a8..3260a4c98f 100755 --- a/projects/aca-testing-shared/src/pages/browsing-page.ts +++ b/projects/aca-testing-shared/src/pages/browsing-page.ts @@ -29,7 +29,7 @@ import { Page } from './page'; export class BrowsingPage extends Page { header = new Header(this.appRoot); sidenav = new Sidenav(this.appRoot); - toolbar = new Toolbar(this.appRoot); + toolbar = new Toolbar('.aca-page-layout aca-toolbar'); breadcrumb = new Breadcrumb(this.appRoot); pageLayoutHeader = new PageLayoutHeader(this.appRoot); dataTable = new DataTable(this.appRoot); From ef0be1f800d92ee4cea2f977aa6cfee06b607375 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 17:17:29 -0400 Subject: [PATCH 10/18] update e2e --- .../suites/info-drawer/file-preview.test.ts | 2 +- package-lock.json | 150 ++++++++++++++++-- package.json | 1 - .../src/components/info-drawer/info-drawer.ts | 6 +- 4 files changed, 139 insertions(+), 20 deletions(-) diff --git a/e2e/protractor/suites/info-drawer/file-preview.test.ts b/e2e/protractor/suites/info-drawer/file-preview.test.ts index cfad34dd2c..afbe267933 100755 --- a/e2e/protractor/suites/info-drawer/file-preview.test.ts +++ b/e2e/protractor/suites/info-drawer/file-preview.test.ts @@ -63,7 +63,7 @@ describe('File preview', () => { const documentText = 'This is a small demonstration'; await searchInput.searchUntilResult(fileName, 'URL'); await dataTable.selectItem(fileName); - await BrowserActions.click(browsingPage.toolbar.viewDetailsButton); + await BrowserActions.click(infoDrawer.toolbar.viewDetailsButton); await infoDrawer.previewButton.click(); await viewerPage.checkFileContent(pageNumber, documentText); }); diff --git a/package-lock.json b/package-lock.json index 46709fbff9..460a0c0140 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,6 @@ "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.48.2", "ajv-cli": "^4.2.0", - "cypress": "^12.14.0", "dotenv": "8.2.0", "dotenv-expand": "^5.1.0", "eslint": "^8.42.0", @@ -4539,6 +4538,8 @@ "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -4568,6 +4569,8 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -4582,6 +4585,8 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^2.0.2", @@ -4599,6 +4604,8 @@ "engines": [ "node >=0.6.0" ], + "optional": true, + "peer": true, "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -4611,6 +4618,8 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "side-channel": "^1.0.4" }, @@ -4626,6 +4635,8 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, + "optional": true, + "peer": true, "bin": { "uuid": "dist/bin/uuid" } @@ -4635,6 +4646,8 @@ "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "debug": "^3.1.0", "lodash.once": "^4.1.1" @@ -4645,6 +4658,8 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -8019,13 +8034,17 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@types/sizzle": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@types/sockjs": { "version": "0.3.33", @@ -8082,6 +8101,7 @@ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", "dev": true, "optional": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -9378,7 +9398,9 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "optional": true, + "peer": true }, "node_modules/are-docs-informative": { "version": "0.0.2", @@ -9609,6 +9631,8 @@ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">= 4.0.0" } @@ -10131,7 +10155,9 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/blocking-proxy": { "version": "1.0.1", @@ -10152,7 +10178,9 @@ "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/body-parser": { "version": "1.20.1", @@ -10377,6 +10405,8 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": "*" } @@ -10419,6 +10449,8 @@ "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=6" } @@ -10596,6 +10628,8 @@ "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">= 0.8.0" } @@ -10763,6 +10797,8 @@ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "string-width": "^4.2.0" }, @@ -10778,6 +10814,8 @@ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -12031,6 +12069,8 @@ "integrity": "sha512-HiLIXKXZaIT1RT7sw1sVPt+qKtis3uYNm6KwC4qoYjabwLKaqZlyS/P+uVvvlBNcHIwL/BC6nQZajpbUd7hOgQ==", "dev": true, "hasInstallScript": true, + "optional": true, + "peer": true, "dependencies": { "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", @@ -12087,6 +12127,8 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -12102,6 +12144,8 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -12118,6 +12162,8 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -12130,6 +12176,8 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -12141,13 +12189,17 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/cypress/node_modules/execa": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", @@ -12171,6 +12223,8 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -12186,6 +12240,8 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -12201,6 +12257,8 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=8" } @@ -12210,6 +12268,8 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=8.12.0" } @@ -12218,13 +12278,17 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/cypress/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -12240,6 +12304,8 @@ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "rimraf": "^3.0.0" }, @@ -12312,7 +12378,9 @@ "version": "1.11.7", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/debug": { "version": "4.3.4", @@ -14415,7 +14483,9 @@ "version": "6.4.7", "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/eventemitter3": { "version": "4.0.7", @@ -14460,6 +14530,8 @@ "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "pify": "^2.2.0" }, @@ -14472,6 +14544,8 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -14716,6 +14790,8 @@ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -14736,6 +14812,8 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -14885,6 +14963,8 @@ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "pend": "~1.2.0" } @@ -15564,6 +15644,8 @@ "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz", "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "async": "^3.2.0" } @@ -16732,6 +16814,8 @@ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ci-info": "^3.2.0" }, @@ -16825,6 +16909,8 @@ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "global-dirs": "^3.0.0", "is-path-inside": "^3.0.2" @@ -16841,6 +16927,8 @@ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ini": "2.0.0" }, @@ -16856,6 +16944,8 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=10" } @@ -19948,6 +20038,8 @@ "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": "> 0.8" } @@ -20602,6 +20694,8 @@ "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "cli-truncate": "^2.1.0", "colorette": "^2.0.16", @@ -20629,6 +20723,8 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -20691,7 +20787,9 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/lodash.truncate": { "version": "4.4.2", @@ -23578,7 +23676,9 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/p-limit": { "version": "2.3.0", @@ -24235,7 +24335,9 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/performance-now": { "version": "2.1.0", @@ -26205,6 +26307,8 @@ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -26678,6 +26782,8 @@ "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "throttleit": "^1.0.0" } @@ -27593,6 +27699,8 @@ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -27607,6 +27715,8 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -27622,6 +27732,8 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -27633,7 +27745,9 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/slide": { "version": "1.1.6", @@ -28994,7 +29108,9 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/through": { "version": "2.3.8", @@ -29648,6 +29764,8 @@ "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=8" } @@ -30664,6 +30782,8 @@ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" diff --git a/package.json b/package.json index 15c73f65dd..e5d82b3c09 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,6 @@ "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.48.2", "ajv-cli": "^4.2.0", - "cypress": "^12.14.0", "dotenv": "8.2.0", "dotenv-expand": "^5.1.0", "eslint": "^8.42.0", diff --git a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts index 7cc3fa2ee7..23ed4fe115 100755 --- a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts +++ b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts @@ -29,6 +29,7 @@ import { CommentsTab } from './info-drawer-comments-tab'; import { LibraryMetadata } from './info-drawer-metadata-library'; import { ContentMetadata } from './info-drawer-metadata-content'; import { waitForPresence } from '../../utilities/utils'; +import { Toolbar } from '../toolbar/toolbar'; export class InfoDrawer extends Component { commentsTab = new CommentsTab('adf-info-drawer'); @@ -43,6 +44,7 @@ export class InfoDrawer extends Component { selectedTab = TestElement.byCss(`.mat-tab-list [aria-selected='true'] div`); expandedDetailsPermissionsTab = TestElement.byText('.acs-details-container .mat-tab-label-content', 'Permissions'); previewButton = TestElement.byCss(`button[title='Preview File']`); + toolbar = new Toolbar('adf-info-drawer'); constructor(ancestor?: string) { super('adf-info-drawer', ancestor); @@ -113,9 +115,7 @@ export class InfoDrawer extends Component { try { await BrowserActions.click(this.getTabByTitle('Comments')); await this.commentsTab.waitForCommentsContainer(); - await Promise.all([ - BrowserVisibility.waitUntilElementIsVisible(this.commentsTab.component), - ]); + await Promise.all([BrowserVisibility.waitUntilElementIsVisible(this.commentsTab.component)]); } catch (error) { Logger.error('--- info-drawer clickCommentsTab catch error: ', error); } From 4f2529dd9da2a338f6ba16573a22cdb5cd609dbc Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 18:12:51 -0400 Subject: [PATCH 11/18] update e2e --- e2e/protractor/suites/actions-available/test-util.ts | 12 ------------ .../aca-testing-shared/src/pages/browsing-page.ts | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/e2e/protractor/suites/actions-available/test-util.ts b/e2e/protractor/suites/actions-available/test-util.ts index be788a1a3c..a31b3f8032 100644 --- a/e2e/protractor/suites/actions-available/test-util.ts +++ b/e2e/protractor/suites/actions-available/test-util.ts @@ -54,18 +54,6 @@ export async function checkToolbarPrimary(item: string, expectedToolbarPrimary: } } -export async function checkToolbarMoreActions(item: string, expectedToolbarMore: string[]): Promise { - await dataTable.selectItem(item); - await toolbar.openMoreMenu(); - - const actualMoreActions = await toolbar.menu.getMenuItems(); - for (const action of expectedToolbarMore) { - expect(actualMoreActions.includes(action)).toBe(true, `Expected to contain ${action}`); - } - - await toolbar.closeMoreMenu(); -} - export async function checkToolbarActions(item: string, expectedToolbarPrimary: string[], expectedToolbarMore: string[]): Promise { await dataTable.selectItem(item); diff --git a/projects/aca-testing-shared/src/pages/browsing-page.ts b/projects/aca-testing-shared/src/pages/browsing-page.ts index 3260a4c98f..4f692067a1 100755 --- a/projects/aca-testing-shared/src/pages/browsing-page.ts +++ b/projects/aca-testing-shared/src/pages/browsing-page.ts @@ -29,7 +29,7 @@ import { Page } from './page'; export class BrowsingPage extends Page { header = new Header(this.appRoot); sidenav = new Sidenav(this.appRoot); - toolbar = new Toolbar('.aca-page-layout aca-toolbar'); + toolbar = new Toolbar('.aca-page-layout'); breadcrumb = new Breadcrumb(this.appRoot); pageLayoutHeader = new PageLayoutHeader(this.appRoot); dataTable = new DataTable(this.appRoot); From 08e699dc7651246692734dd652dd59ae96c4e1fc Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sun, 13 Aug 2023 19:01:01 -0400 Subject: [PATCH 12/18] fix search results toolbar spacing --- .../search-libraries-results.component.html | 2 +- .../search-libraries-results.component.scss | 4 ++++ .../search/search-results/search-results.component.html | 2 +- .../search/search-results/search-results.component.scss | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html index db793f728e..a5ef395177 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss index bb97071620..abdd99f86d 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss @@ -1,5 +1,9 @@ @import '../../../ui/mixins'; +.aca-search-toolbar-spacer { + width: 100%; +} + aca-search-results { .adf-search-results { @include flex-row; diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html index 02542f63bb..9a5e9e4904 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss index 9fe117c910..02f5f1482e 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss @@ -1,5 +1,9 @@ @import '../../../ui/mixins'; +.aca-search-toolbar-spacer { + width: 100%; +} + .adf-search-results { @include flex-row; From f521ec7a080916cf54d473621680f9492e942ac6 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 09:09:07 -0400 Subject: [PATCH 13/18] cleanup unused app state --- .../preview/src/lib/components/preview.component.spec.ts | 1 - projects/aca-content/src/lib/store/initial-state.ts | 1 - .../lib/components/document-base-page/document-base-page.spec.ts | 1 - projects/aca-shared/src/lib/testing/lib-testing-module.ts | 1 - projects/aca-shared/store/src/states/app.state.ts | 1 - 5 files changed, 5 deletions(-) diff --git a/projects/aca-content/preview/src/lib/components/preview.component.spec.ts b/projects/aca-content/preview/src/lib/components/preview.component.spec.ts index 36dc3ab01e..f1d254c562 100644 --- a/projects/aca-content/preview/src/lib/components/preview.component.spec.ts +++ b/projects/aca-content/preview/src/lib/components/preview.component.spec.ts @@ -83,7 +83,6 @@ export const INITIAL_APP_STATE: AppState = { infoDrawerMetadataAspect: '', showFacetFilter: true, fileUploadingDialog: true, - documentDisplayMode: 'list', showLoader: false, repository: { status: { diff --git a/projects/aca-content/src/lib/store/initial-state.ts b/projects/aca-content/src/lib/store/initial-state.ts index bde97f5aa0..e59390c987 100644 --- a/projects/aca-content/src/lib/store/initial-state.ts +++ b/projects/aca-content/src/lib/store/initial-state.ts @@ -51,7 +51,6 @@ export const INITIAL_APP_STATE: AppState = { infoDrawerMetadataAspect: '', showFacetFilter: true, fileUploadingDialog: true, - documentDisplayMode: 'list', showLoader: false, repository: { status: { diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts index 0f7a60870a..a6a2f84ea0 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts @@ -66,7 +66,6 @@ export const INITIAL_APP_STATE: AppState = { infoDrawerMetadataAspect: '', showFacetFilter: true, fileUploadingDialog: true, - documentDisplayMode: 'list', showLoader: false, repository: { status: { diff --git a/projects/aca-shared/src/lib/testing/lib-testing-module.ts b/projects/aca-shared/src/lib/testing/lib-testing-module.ts index b0982378a0..b40fd5a295 100644 --- a/projects/aca-shared/src/lib/testing/lib-testing-module.ts +++ b/projects/aca-shared/src/lib/testing/lib-testing-module.ts @@ -64,7 +64,6 @@ export const initialState = { infoDrawerOpened: false, infoDrawerMetadataAspect: '', showFacetFilter: true, - documentDisplayMode: 'list', repository: { status: { isQuickShareEnabled: true diff --git a/projects/aca-shared/store/src/states/app.state.ts b/projects/aca-shared/store/src/states/app.state.ts index bf3a28370b..e56c70f537 100644 --- a/projects/aca-shared/store/src/states/app.state.ts +++ b/projects/aca-shared/store/src/states/app.state.ts @@ -42,7 +42,6 @@ export interface AppState { infoDrawerPreview: boolean; infoDrawerMetadataAspect: string; showFacetFilter: boolean; - documentDisplayMode: string; repository: RepositoryInfo; fileUploadingDialog: boolean; showLoader: boolean; From 66527eb3c3643a799dd11266cd0acc9fd912570f Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 09:11:01 -0400 Subject: [PATCH 14/18] cleanup unused code --- .../components/shared-link-view/shared-link-view.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts index 9f0d00c810..32158ea585 100644 --- a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts +++ b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts @@ -87,8 +87,4 @@ export class SharedLinkViewComponent implements OnInit, OnDestroy { this.onDestroy$.next(true); this.onDestroy$.complete(); } - - trackByActionId(_: number, action: ContentActionRef) { - return action.id; - } } From 667eb4929ecf7812eed4ae1678c8bf6dac808835 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 09:14:11 -0400 Subject: [PATCH 15/18] fix toolbar divider color --- .../src/lib/components/toolbar/toolbar.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss index 0d4cd41aef..f92293e970 100644 --- a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss +++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss @@ -20,7 +20,7 @@ aca-toolbar { .aca-toolbar-divider { height: 24px; width: 1px; - background: rgba(0, 0, 0, 0.26); + background: var(--adf-theme-foreground-text-color-025); margin-left: 5px; margin-right: 5px; } From 3c679d803b32d0c0864c5f50d82b656ab255fa28 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 09:24:20 -0400 Subject: [PATCH 16/18] fix missing buttons in the info drawer --- .../src/lib/components/info-drawer/info-drawer.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html index a00199ff02..5f07ca0f5d 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html @@ -3,7 +3,7 @@
- + From ed3458710d937f31d6ef1259b34603859b0982a6 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 09:27:05 -0400 Subject: [PATCH 17/18] fix css nesting --- .../search-libraries-results.component.scss | 8 ++++---- .../search/search-results/search-results.component.scss | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss index abdd99f86d..36a1154d06 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss @@ -1,10 +1,10 @@ @import '../../../ui/mixins'; -.aca-search-toolbar-spacer { - width: 100%; -} - aca-search-results { + .aca-search-toolbar-spacer { + width: 100%; + } + .adf-search-results { @include flex-row; diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss index 02f5f1482e..e19c8fdcd1 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss @@ -1,12 +1,12 @@ @import '../../../ui/mixins'; -.aca-search-toolbar-spacer { - width: 100%; -} - .adf-search-results { @include flex-row; + .aca-search-toolbar-spacer { + width: 100%; + } + &__facets { display: flex; flex-direction: row; From 1b07ae398c982505f354804c0a253ca078ae1322 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Aug 2023 12:56:44 -0400 Subject: [PATCH 18/18] fix search results css --- .../search/search-results/search-results.component.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss index e19c8fdcd1..9a8947ddc8 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss @@ -1,11 +1,13 @@ @import '../../../ui/mixins'; -.adf-search-results { - @include flex-row; - +aca-search-results { .aca-search-toolbar-spacer { width: 100%; } +} + +.adf-search-results { + @include flex-row; &__facets { display: flex;