From af77efe11140476301f8d6bad1db18fa2bd9533f Mon Sep 17 00:00:00 2001 From: Arcadio Quintero Date: Fri, 4 Oct 2024 13:23:13 -0400 Subject: [PATCH 1/3] chore: upgrade ngrx --- .../dotcdn/src/app/dotcdn.component.store.ts | 3 +- .../dot-pages-store/dot-pages.store.ts | 3 +- .../store/dot-template.store.ts | 3 +- .../store/ai-content-prompt.store.ts | 3 +- .../edit-content/store/edit-content.store.ts | 3 +- .../store/dot-binary-field-url-mode.store.ts | 3 +- .../store/binary-field.store.ts | 3 +- .../store/content-category-field.store.ts | 2 +- .../store/file-field.store.ts | 2 +- .../dot-experiments-configuration-store.ts | 4 +- .../store/dot-experiments-list-store.ts | 3 +- .../store/dot-experiments-reports-store.ts | 4 +- .../store/dot-locales-list.store.ts | 3 +- .../store/dot-ema-dialog.store.ts | 3 +- .../store/edit-ema-palette.store.ts | 3 +- .../store/features/editor/save/withSave.ts | 2 +- .../src/lib/store/features/load/withLoad.ts | 2 +- .../store/dot-favorite-page.store.ts | 3 +- .../store/dot-page-tools-seo.store.ts | 3 +- .../ai-image-prompt.store.ts | 4 +- .../store/dot-asset-search.store.ts | 3 +- core-web/package.json | 8 ++-- core-web/yarn.lock | 42 +++++++++---------- 23 files changed, 66 insertions(+), 46 deletions(-) diff --git a/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts b/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts index 358f7d8d50ff..281f8882bd92 100644 --- a/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts +++ b/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { Observable, of } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -18,6 +18,7 @@ import { PurgeReturnData } from './app.models'; import { DotCDNService } from './dotcdn.service'; +import { tapResponse } from '@ngrx/operators'; @Injectable() export class DotCDNStore extends ComponentStore { diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts index da6cc0c611ae..562b5f1c5000 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { forkJoin, Observable, of } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -52,6 +52,7 @@ import { DotFavoritePageComponent } from '@dotcms/portlets/dot-ema/ui'; import { generateDotFavoritePageUrl } from '@dotcms/utils'; import { DotPagesCreatePageDialogComponent } from '../dot-pages-create-page-dialog/dot-pages-create-page-dialog.component'; +import { tapResponse } from '@ngrx/operators'; export interface DotPagesInfo { actionMenuDomId?: string; diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts index 1cf906afc0c0..e98daac60211 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { Observable, of, zip } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -27,6 +27,7 @@ import { } from '@dotcms/data-access'; import { DotContainerMap, DotLayout, DotTemplate } from '@dotcms/dotcms-models'; import { isEqual } from '@dotcms/utils'; +import { tapResponse } from '@ngrx/operators'; type DotTemplateType = 'design' | 'advanced'; diff --git a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/store/ai-content-prompt.store.ts b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/store/ai-content-prompt.store.ts index 3ccd7455fc53..943e960e346e 100644 --- a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/store/ai-content-prompt.store.ts +++ b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/store/ai-content-prompt.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; diff --git a/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts b/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts index 02a86cabaffb..e8d8fc1259ca 100644 --- a/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts +++ b/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { Observable, forkJoin, of } from 'rxjs'; import { Location } from '@angular/common'; @@ -17,6 +17,7 @@ import { DotWorkflowsActionsService } from '@dotcms/data-access'; import { DotCMSContentType, DotCMSContentlet, DotCMSWorkflowAction } from '@dotcms/dotcms-models'; +import { tapResponse } from '@ngrx/operators'; export const SIDEBAR_LOCAL_STORAGE_KEY = 'dot-edit-content-form-sidebar'; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts index 91348cc15a9a..ee2269e67515 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { Observable, from } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -9,6 +9,7 @@ import { DotUploadService } from '@dotcms/data-access'; import { DotCMSTempFile, DotHttpErrorResponse } from '@dotcms/dotcms-models'; import { DotBinaryFieldValidatorService } from '../../../service/dot-binary-field-validator/dot-binary-field-validator.service'; +import { tapResponse } from '@ngrx/operators'; export interface DotBinaryFieldUrlModeState { tempFile: DotCMSTempFile; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts index 654121c912c2..375cd2acf3a7 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { from, Observable, of } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @@ -16,6 +16,7 @@ import { UiMessageI } from '../interfaces/index'; import { getFieldVersion, getFileMetadata, getUiMessage } from '../utils/binary-field-utils'; +import { tapResponse } from '@ngrx/operators'; export interface BinaryFieldState { contentlet: DotCMSContentlet; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts index 03e417b81635..04d65f9f6846 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts @@ -1,4 +1,3 @@ -import { tapResponse } from '@ngrx/component-store'; import { patchState, signalStore, withComputed, withMethods, withState } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { pipe } from 'rxjs'; @@ -32,6 +31,7 @@ import { getMenuItemsFromKeyParentPath, checkIfClickedIsLoaded } from '../utils/category-field.utils'; +import { tapResponse } from '@ngrx/operators'; export type CategoryFieldState = { field: DotCMSContentTypeField; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/store/file-field.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/store/file-field.store.ts index c5056a9e7ab8..1be75cc3cc3a 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/store/file-field.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/store/file-field.store.ts @@ -1,4 +1,4 @@ -import { tapResponse } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { patchState, signalStore, withComputed, withMethods, withState } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { pipe } from 'rxjs'; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts index 4d264956a749..3ed59b8f66af 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { Observable, throwError } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -42,6 +42,8 @@ import { processExperimentConfigProps } from '../../shared/dot-experiment.utils'; +import { tapResponse } from '@ngrx/operators'; + export interface DotExperimentsConfigurationState { experiment: DotExperiment; status: ComponentStatus; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts index 57fca270a5ec..877d224617be 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, OnStateInit, tapResponse } from '@ngrx/component-store'; +import { ComponentStore, OnStateInit } from '@ngrx/component-store'; import { EMPTY, Observable, throwError } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -28,6 +28,7 @@ import { } from '@dotcms/dotcms-models'; import { DotExperimentsStore } from '../../dot-experiments-shell/store/dot-experiments.store'; +import { tapResponse } from '@ngrx/operators'; export interface DotExperimentsState { experiments: DotExperiment[]; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts index da5b7aaaf983..17586faddced 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts @@ -1,4 +1,4 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; import { ChartData } from 'chart.js'; import { forkJoin, Observable, of } from 'rxjs'; @@ -47,6 +47,8 @@ import { orderVariants } from '../../shared/dot-experiment.utils'; +import { tapResponse } from '@ngrx/operators'; + export interface DotExperimentsReportsState { experiment: DotExperiment | null; status: ComponentStatus; diff --git a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/store/dot-locales-list.store.ts b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/store/dot-locales-list.store.ts index 60dbb61bc511..3056ce78b708 100644 --- a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/store/dot-locales-list.store.ts +++ b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/store/dot-locales-list.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { forkJoin } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-ema-dialog/store/dot-ema-dialog.store.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-ema-dialog/store/dot-ema-dialog.store.ts index 3c2353cd9109..243d55d5d3b8 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-ema-dialog/store/dot-ema-dialog.store.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-ema-dialog/store/dot-ema-dialog.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable } from 'rxjs'; import { Injectable, inject } from '@angular/core'; diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/store/edit-ema-palette.store.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/store/edit-ema-palette.store.ts index 4d6232327cf6..5196b2f6696f 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/store/edit-ema-palette.store.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/store/edit-ema-palette.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { EMPTY, Observable, forkJoin } from 'rxjs'; import { Injectable, inject } from '@angular/core'; diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts index e21a8df6d9d7..b6bdeb222adc 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts @@ -1,4 +1,3 @@ -import { tapResponse } from '@ngrx/component-store'; import { patchState, signalStoreFeature, type, withMethods } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { EMPTY, pipe } from 'rxjs'; @@ -12,6 +11,7 @@ import { UVE_STATUS } from '../../../../shared/enums'; import { PageContainer } from '../../../../shared/models'; import { UVEState } from '../../../models'; import { withClient } from '../../client/withClient'; +import { tapResponse } from '@ngrx/operators'; /** * Add methods to save the page diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts index e361762eeffe..5ccbeb4522cb 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts @@ -1,4 +1,4 @@ -import { tapResponse } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { patchState, signalStoreFeature, type, withMethods } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { pipe, forkJoin, of, EMPTY } from 'rxjs'; diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-favorite-page/store/dot-favorite-page.store.ts b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-favorite-page/store/dot-favorite-page.store.ts index 72af27602195..a3993097cf69 100644 --- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-favorite-page/store/dot-favorite-page.store.ts +++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-favorite-page/store/dot-favorite-page.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, throwError, of } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/store/dot-page-tools-seo.store.ts b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/store/dot-page-tools-seo.store.ts index 52028bb9ff4f..dc2dea83ba8b 100644 --- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/store/dot-page-tools-seo.store.ts +++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/store/dot-page-tools-seo.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; diff --git a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts index 1164a702e269..380ee0d344fc 100644 --- a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts +++ b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; + import { Observable, of } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -14,6 +15,7 @@ import { DotGeneratedAIImage, PromptType } from '@dotcms/dotcms-models'; +import { tapResponse } from '@ngrx/operators'; const DEFAULT_INPUT_PROMPT = PromptType.INPUT; diff --git a/core-web/libs/ui/src/lib/components/dot-asset-search/store/dot-asset-search.store.ts b/core-web/libs/ui/src/lib/components/dot-asset-search/store/dot-asset-search.store.ts index 4c6cf60c368a..6ed3bad3d4a6 100644 --- a/core-web/libs/ui/src/lib/components/dot-asset-search/store/dot-asset-search.store.ts +++ b/core-web/libs/ui/src/lib/components/dot-asset-search/store/dot-asset-search.store.ts @@ -1,4 +1,5 @@ -import { ComponentStore, tapResponse } from '@ngrx/component-store'; +import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Injectable } from '@angular/core'; diff --git a/core-web/package.json b/core-web/package.json index 61a06cb26129..eda0d9bacce1 100644 --- a/core-web/package.json +++ b/core-web/package.json @@ -68,9 +68,9 @@ "@material/mwc-formfield": "^0.20.0", "@material/mwc-icon-button": "^0.20.0", "@material/mwc-menu": "^0.20.0", - "@ngrx/component-store": "17.0.1", - "@ngrx/operators": "^17.2.0", - "@ngrx/signals": "^17.2.0", + "@ngrx/component-store": "^18.0.2", + "@ngrx/operators": "^18.0.2", + "@ngrx/signals": "^18.0.2", "@nx/angular": "19.6.5", "@tarekraafat/autocomplete.js": "^10.2.6", "@tinymce/tinymce-angular": "^7.0.0", @@ -228,7 +228,7 @@ "jest-fetch-mock": "^3.0.3", "jest-html-reporters": "^3.1.5", "jest-junit": "^16.0.0", - "jest-preset-angular": "14.0.4", + "jest-preset-angular": "14.2.4", "jsonc-eslint-parser": "^2.4.0", "karma": "6.4.0", "karma-chrome-launcher": "^3.1.0", diff --git a/core-web/yarn.lock b/core-web/yarn.lock index e03fd33259d3..eed4dc54e0ff 100644 --- a/core-web/yarn.lock +++ b/core-web/yarn.lock @@ -3455,32 +3455,32 @@ replace-in-file "6.2.0" tslib "^2.6.2" -"@ngrx/component-store@17.0.1": - version "17.0.1" - resolved "https://registry.yarnpkg.com/@ngrx/component-store/-/component-store-17.0.1.tgz#de84dab7c3595329378ca46b2b82595d6406e87e" - integrity sha512-6A7IXzZHAdFadcCILbljNQzrVMwOlx1opdCV/91h3S3ttY7HrPuatyZJyjau8dSf1ANjnAm1kcoof8lZfwhaHg== +"@ngrx/component-store@^18.0.2": + version "18.0.2" + resolved "https://registry.npmjs.org/@ngrx/component-store/-/component-store-18.0.2.tgz#fcbdc27439267cdcb6f1fbdb89a495d353c8d1ad" + integrity sha512-IB7ZKFqjDt4duQbfYqXxAOKf9Si9O1HFodqbNCSgi7gnovK/frf/H429a+lYOyItPcpno3ECom6/1k8pE8fWlg== dependencies: - "@ngrx/operators" "17.0.0-beta.0" + "@ngrx/operators" "18.0.1" tslib "^2.0.0" -"@ngrx/operators@17.0.0-beta.0": - version "17.0.0-beta.0" - resolved "https://registry.yarnpkg.com/@ngrx/operators/-/operators-17.0.0-beta.0.tgz#030486f3a610fa919d2b155aad3bc7b4c708550d" - integrity sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A== +"@ngrx/operators@18.0.1": + version "18.0.1" + resolved "https://registry.npmjs.org/@ngrx/operators/-/operators-18.0.1.tgz#fd127dce1bccb27824b77149fbb4f8b56d2ad8a9" + integrity sha512-M+QMrHNKgcuiLaRGZxJ4aQi5/OCRfKC4+T/63dsHyLFZ53/FFpF6a/ytSO1Q+tzOplZ5o99S+i8FVaZqNQ3LmQ== dependencies: tslib "^2.3.0" -"@ngrx/operators@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@ngrx/operators/-/operators-17.2.0.tgz#aa449cbd8565b50353715c568ba38488d4495069" - integrity sha512-W7SrGK4VQSJlCtMrkxNChVBDgJGSCdZ4yLBi80xoE9CmhTMMhu9J+8BbDDhZ+PPbTHylKJobkwHq+tJ8mkf4eQ== +"@ngrx/operators@^18.0.2": + version "18.0.2" + resolved "https://registry.npmjs.org/@ngrx/operators/-/operators-18.0.2.tgz#d56532ed750901418ad6e55c0719bfb11a55fa27" + integrity sha512-4dyNkVKBw9ZqECMJu6bT2t21p3ANaMC+ZkcfiBfv5OUEFtB9HhN5uCem9tcgYeNBK8XQFA7/1tzd1T3KaiBY8A== dependencies: tslib "^2.3.0" -"@ngrx/signals@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@ngrx/signals/-/signals-17.2.0.tgz#30d2e75cf3786111356115bf3cdb10e81517ac23" - integrity sha512-tkkxifeOVPOhpTqbHyK1WOx4qz49HLR/h0vhaa/MRGRIZoOR/6gR4KB3hbC8FD3FdnuNqOgOZ2lGsTfWPB/6BQ== +"@ngrx/signals@^18.0.2": + version "18.0.2" + resolved "https://registry.npmjs.org/@ngrx/signals/-/signals-18.0.2.tgz#9684da0f3ba6db656c281b0d71dc5e15e5d78098" + integrity sha512-FXmcY2cmkbhZtg9k8Ntq69SyelGmmb6fWtdButH4T8GGFH0o3f1FZTR829j4ynphy8SzuDhD/pzrnpWcV481oQ== dependencies: tslib "^2.3.0" @@ -13950,10 +13950,10 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== -jest-preset-angular@14.0.4: - version "14.0.4" - resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-14.0.4.tgz#4745033c58c86ad3d8dd16450d67563703285bd5" - integrity sha512-O4WhVRdfiN9TtJMbJbuVJxD3zn6fyOF2Pqvu12fvEVR6FxCN1S1POfR2nU1fRdP+rQZv7iiW+ttxsy+qkE8iCw== +jest-preset-angular@14.2.4: + version "14.2.4" + resolved "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.2.4.tgz#bb932b4a73f0204a20a4bf8d477224f57918a1a3" + integrity sha512-xyhkaiBdn3keBgxxkcbqZu/my3ADU9NcDrz6DaMuGRaxz/bf6ZC1qxZ1eQuz5V1WuA3/rD64VA3Kke8P6E9qNg== dependencies: bs-logger "^0.2.6" esbuild-wasm ">=0.15.13" From ed434d751bafa5e7f7e142a57e3d5166dd43cb22 Mon Sep 17 00:00:00 2001 From: Arcadio Quintero Date: Fri, 4 Oct 2024 13:46:07 -0400 Subject: [PATCH 2/3] chore: fix lint --- core-web/apps/dotcdn/src/app/dotcdn.component.store.ts | 2 +- .../app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts | 2 +- .../dot-template-create-edit/store/dot-template.store.ts | 2 +- .../src/lib/feature/edit-content/store/edit-content.store.ts | 2 +- .../store/dot-binary-field-url-mode.store.ts | 2 +- .../dot-edit-content-binary-field/store/binary-field.store.ts | 2 +- .../store/content-category-field.store.ts | 2 +- .../store/dot-experiments-configuration-store.ts | 2 +- .../dot-experiments-list/store/dot-experiments-list-store.ts | 2 +- .../store/dot-experiments-reports-store.ts | 2 +- .../portlet/src/lib/store/features/editor/save/withSave.ts | 2 +- .../components/dot-ai-image-prompt/ai-image-prompt.store.ts | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts b/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts index 281f8882bd92..2bcb3dbc61d3 100644 --- a/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts +++ b/core-web/apps/dotcdn/src/app/dotcdn.component.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, of } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -18,7 +19,6 @@ import { PurgeReturnData } from './app.models'; import { DotCDNService } from './dotcdn.service'; -import { tapResponse } from '@ngrx/operators'; @Injectable() export class DotCDNStore extends ComponentStore { diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts index 562b5f1c5000..0e6cf5c7db78 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { forkJoin, Observable, of } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -52,7 +53,6 @@ import { DotFavoritePageComponent } from '@dotcms/portlets/dot-ema/ui'; import { generateDotFavoritePageUrl } from '@dotcms/utils'; import { DotPagesCreatePageDialogComponent } from '../dot-pages-create-page-dialog/dot-pages-create-page-dialog.component'; -import { tapResponse } from '@ngrx/operators'; export interface DotPagesInfo { actionMenuDomId?: string; diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts index e98daac60211..3f3c9f811917 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, of, zip } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -27,7 +28,6 @@ import { } from '@dotcms/data-access'; import { DotContainerMap, DotLayout, DotTemplate } from '@dotcms/dotcms-models'; import { isEqual } from '@dotcms/utils'; -import { tapResponse } from '@ngrx/operators'; type DotTemplateType = 'design' | 'advanced'; diff --git a/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts b/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts index e8d8fc1259ca..c59e4f7235d7 100644 --- a/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts +++ b/core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, forkJoin, of } from 'rxjs'; import { Location } from '@angular/common'; @@ -17,7 +18,6 @@ import { DotWorkflowsActionsService } from '@dotcms/data-access'; import { DotCMSContentType, DotCMSContentlet, DotCMSWorkflowAction } from '@dotcms/dotcms-models'; -import { tapResponse } from '@ngrx/operators'; export const SIDEBAR_LOCAL_STORAGE_KEY = 'dot-edit-content-form-sidebar'; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts index ee2269e67515..e5a9646dffd7 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, from } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -9,7 +10,6 @@ import { DotUploadService } from '@dotcms/data-access'; import { DotCMSTempFile, DotHttpErrorResponse } from '@dotcms/dotcms-models'; import { DotBinaryFieldValidatorService } from '../../../service/dot-binary-field-validator/dot-binary-field-validator.service'; -import { tapResponse } from '@ngrx/operators'; export interface DotBinaryFieldUrlModeState { tempFile: DotCMSTempFile; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts index 375cd2acf3a7..b28dc82fdf7a 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { from, Observable, of } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @@ -16,7 +17,6 @@ import { UiMessageI } from '../interfaces/index'; import { getFieldVersion, getFileMetadata, getUiMessage } from '../utils/binary-field-utils'; -import { tapResponse } from '@ngrx/operators'; export interface BinaryFieldState { contentlet: DotCMSContentlet; diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts index 04d65f9f6846..cdc645aa44f6 100644 --- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts +++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts @@ -1,3 +1,4 @@ +import { tapResponse } from '@ngrx/operators'; import { patchState, signalStore, withComputed, withMethods, withState } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { pipe } from 'rxjs'; @@ -31,7 +32,6 @@ import { getMenuItemsFromKeyParentPath, checkIfClickedIsLoaded } from '../utils/category-field.utils'; -import { tapResponse } from '@ngrx/operators'; export type CategoryFieldState = { field: DotCMSContentTypeField; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts index 3ed59b8f66af..b7d2517cf59a 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { Observable, throwError } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -42,7 +43,6 @@ import { processExperimentConfigProps } from '../../shared/dot-experiment.utils'; -import { tapResponse } from '@ngrx/operators'; export interface DotExperimentsConfigurationState { experiment: DotExperiment; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts index 877d224617be..066ac65314e3 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts @@ -1,4 +1,5 @@ import { ComponentStore, OnStateInit } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { EMPTY, Observable, throwError } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; @@ -28,7 +29,6 @@ import { } from '@dotcms/dotcms-models'; import { DotExperimentsStore } from '../../dot-experiments-shell/store/dot-experiments.store'; -import { tapResponse } from '@ngrx/operators'; export interface DotExperimentsState { experiments: DotExperiment[]; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts index 17586faddced..fc4fdf829735 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts @@ -1,4 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; +import { tapResponse } from '@ngrx/operators'; import { ChartData } from 'chart.js'; import { forkJoin, Observable, of } from 'rxjs'; @@ -47,7 +48,6 @@ import { orderVariants } from '../../shared/dot-experiment.utils'; -import { tapResponse } from '@ngrx/operators'; export interface DotExperimentsReportsState { experiment: DotExperiment | null; diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts index b6bdeb222adc..af0f35637af2 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/editor/save/withSave.ts @@ -1,3 +1,4 @@ +import { tapResponse } from '@ngrx/operators'; import { patchState, signalStoreFeature, type, withMethods } from '@ngrx/signals'; import { rxMethod } from '@ngrx/signals/rxjs-interop'; import { EMPTY, pipe } from 'rxjs'; @@ -11,7 +12,6 @@ import { UVE_STATUS } from '../../../../shared/enums'; import { PageContainer } from '../../../../shared/models'; import { UVEState } from '../../../models'; import { withClient } from '../../client/withClient'; -import { tapResponse } from '@ngrx/operators'; /** * Add methods to save the page diff --git a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts index 380ee0d344fc..009020c554b9 100644 --- a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts +++ b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts @@ -1,5 +1,5 @@ import { ComponentStore } from '@ngrx/component-store'; - +import { tapResponse } from '@ngrx/operators'; import { Observable, of } from 'rxjs'; import { Injectable } from '@angular/core'; @@ -15,7 +15,7 @@ import { DotGeneratedAIImage, PromptType } from '@dotcms/dotcms-models'; -import { tapResponse } from '@ngrx/operators'; + const DEFAULT_INPUT_PROMPT = PromptType.INPUT; From 3089c492c856c9a43d9a527f8565fa298e8b2a18 Mon Sep 17 00:00:00 2001 From: Arcadio Quintero Date: Fri, 4 Oct 2024 13:53:06 -0400 Subject: [PATCH 3/3] chore: fix format --- .../store/dot-experiments-configuration-store.ts | 1 - .../store/dot-experiments-reports-store.ts | 1 - .../lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts index b7d2517cf59a..2ac021f71b79 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts @@ -43,7 +43,6 @@ import { processExperimentConfigProps } from '../../shared/dot-experiment.utils'; - export interface DotExperimentsConfigurationState { experiment: DotExperiment; status: ComponentStatus; diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts index fc4fdf829735..3a848bfd7980 100644 --- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts +++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts @@ -48,7 +48,6 @@ import { orderVariants } from '../../shared/dot-experiment.utils'; - export interface DotExperimentsReportsState { experiment: DotExperiment | null; status: ComponentStatus; diff --git a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts index 009020c554b9..2d84872bb999 100644 --- a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts +++ b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/ai-image-prompt.store.ts @@ -16,7 +16,6 @@ import { PromptType } from '@dotcms/dotcms-models'; - const DEFAULT_INPUT_PROMPT = PromptType.INPUT; export interface DotAiImagePromptComponentState {