diff --git a/angular.json b/angular.json index cabe56dc7..9fae36991 100644 --- a/angular.json +++ b/angular.json @@ -169,34 +169,6 @@ } } }, - "common": { - "projectType": "library", - "root": "core/app/common", - "sourceRoot": "core/app/common/src", - "prefix": "lib", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:ng-packagr", - "options": { - "tsConfig": "core/app/common/tsconfig.lib.json", - "project": "core/app/common/ng-package.json" - }, - "configurations": { - "production": { - "tsConfig": "core/app/common/tsconfig.lib.prod.json" - } - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "core/app/common/src/test.ts", - "tsConfig": "core/app/common/tsconfig.spec.json", - "karmaConfig": "core/app/common/karma.conf.js" - } - } - } - }, "core": { "projectType": "library", "root": "core/app/core", diff --git a/core/app/common/README.md b/core/app/common/README.md deleted file mode 100644 index 179d29038..000000000 --- a/core/app/common/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# SuiteCRM common - -This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.0.0. - - -## Build - -Run `yarn build:common` to build the project. The build artifacts will be stored in the `dist/` directory. diff --git a/core/app/common/karma.conf.js b/core/app/common/karma.conf.js deleted file mode 100644 index 13a9e73f3..000000000 --- a/core/app/common/karma.conf.js +++ /dev/null @@ -1,35 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageReporter: { - dir: require('path').join(__dirname, '../../coverage/common'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ], - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/core/app/common/ng-package.json b/core/app/common/ng-package.json deleted file mode 100644 index 6f81ca777..000000000 --- a/core/app/common/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/common", - "lib": { - "entryFile": "src/public-api.ts" - } -} diff --git a/core/app/common/package.json b/core/app/common/package.json deleted file mode 100644 index c0b606e5f..000000000 --- a/core/app/common/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "common", - "version": "8.7.1", - "peerDependencies": { - "@angular/common": "^12.1.0", - "@angular/core": "^12.1.0", - "@angular/forms": "^12.1.0", - "rxjs": "^6.6.3", - "@ng-bootstrap/ng-bootstrap": "^9.0.2" - }, - "dependencies": { - "tslib": "^2.0.0" - } -} diff --git a/core/app/common/src/lib/common.ts b/core/app/common/src/lib/common.ts deleted file mode 100644 index 8ea222739..000000000 --- a/core/app/common/src/lib/common.ts +++ /dev/null @@ -1,43 +0,0 @@ -export * from './actions/action.model'; -export * from './actions/bulk-action.model'; -export * from './actions/field-logic-action.model'; -export * from './components/button/button-group.model'; -export * from './components/button/button.model'; -export * from './components/button/dropdown-button.model'; -export * from './components/modal/modal.model'; -export * from './components/pagination/pagination.model'; -export * from './components/registry/base-component.registry'; -export * from './containers/chart/chart.model'; -export * from './menu/menu.model'; -export * from './metadata/charts-widget.metadata'; -export * from './metadata/list.metadata.model'; -export * from './metadata/metadata.model'; -export * from './metadata/subpanel.metadata.model'; -export * from './metadata/widget.metadata'; -export * from './record/favorites.model'; -export * from './record/field.model'; -export * from './record/recently-viewed.model'; -export * from './record/record.model'; -export * from './record/record-mappers/record-mapper.model'; -export * from './record/record-mappers/record-mapper.registry'; -export * from './registry/base-service.registry'; -export * from './registry/base-type.registry'; -export * from './services/ui/resize.model'; -export * from './services/validators/validators.model'; -export * from './statistics/statistics-store.model'; -export * from './statistics/statistics.model'; -export * from './types/boolean-map'; -export * from './types/messages'; -export * from './types/object-map'; -export * from './types/overridable-map'; -export * from './types/string-map'; -export * from './types/string-matrix'; -export * from './types/user'; -export * from './utils/object-utils'; -export * from './utils/value-utils'; -export * from './utils/view-utils'; -export * from './views/view.model'; -export * from './views/list/list-navigation.model'; -export * from './views/list/record-selection.model'; -export * from './views/list/search-criteria.model'; -export * from './views/list/selection.model'; diff --git a/core/app/common/src/public-api.ts b/core/app/common/src/public-api.ts deleted file mode 100644 index 36f249bdb..000000000 --- a/core/app/common/src/public-api.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* - * Public API Surface of common - */ - -export * from './lib/common'; diff --git a/core/app/common/src/test.ts b/core/app/common/src/test.ts deleted file mode 100644 index 76b489104..000000000 --- a/core/app/common/src/test.ts +++ /dev/null @@ -1,14 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js'; -import 'zone.js/testing'; -import {getTestBed} from '@angular/core/testing'; -import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing'; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting(), { - teardown: { destroyAfterEach: false } -} -); diff --git a/core/app/common/tsconfig.lib.json b/core/app/common/tsconfig.lib.json deleted file mode 100644 index d557dc38c..000000000 --- a/core/app/common/tsconfig.lib.json +++ /dev/null @@ -1,24 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "../../out-tsc/lib", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [], - "lib": [ - "dom", - "es2022" - ] - }, - "angularCompilerOptions": { - "skipTemplateCodegen": true, - "strictMetadataEmit": true, - "enableResourceInlining": true - }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] -} diff --git a/core/app/common/tsconfig.lib.prod.json b/core/app/common/tsconfig.lib.prod.json deleted file mode 100644 index 06de549e1..000000000 --- a/core/app/common/tsconfig.lib.prod.json +++ /dev/null @@ -1,10 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false - }, - "angularCompilerOptions": { - "compilationMode": "partial" - } -} diff --git a/core/app/common/tsconfig.spec.json b/core/app/common/tsconfig.spec.json deleted file mode 100644 index 85392ee8f..000000000 --- a/core/app/common/tsconfig.spec.json +++ /dev/null @@ -1,17 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "../../../out-tsc/spec", - "types": [ - "jasmine" - ] - }, - "files": [ - "src/test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/core/app/common/tslint.json b/core/app/common/tslint.json deleted file mode 100644 index 3aa2f4c6b..000000000 --- a/core/app/common/tslint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../../tslint.json", - "rules": { - "directive-selector": [ - true, - "attribute", - "lib", - "camelCase" - ], - "component-selector": [ - true, - "element", - "lib", - "kebab-case" - ] - } -} diff --git a/core/app/common/src/lib/actions/action.model.ts b/core/app/core/src/lib/common/actions/action.model.ts similarity index 100% rename from core/app/common/src/lib/actions/action.model.ts rename to core/app/core/src/lib/common/actions/action.model.ts diff --git a/core/app/common/src/lib/actions/bulk-action.model.ts b/core/app/core/src/lib/common/actions/bulk-action.model.ts similarity index 100% rename from core/app/common/src/lib/actions/bulk-action.model.ts rename to core/app/core/src/lib/common/actions/bulk-action.model.ts diff --git a/core/app/common/src/lib/actions/field-logic-action.model.ts b/core/app/core/src/lib/common/actions/field-logic-action.model.ts similarity index 100% rename from core/app/common/src/lib/actions/field-logic-action.model.ts rename to core/app/core/src/lib/common/actions/field-logic-action.model.ts diff --git a/core/app/common/src/lib/components/button/button-group.model.ts b/core/app/core/src/lib/common/components/button/button-group.model.ts similarity index 100% rename from core/app/common/src/lib/components/button/button-group.model.ts rename to core/app/core/src/lib/common/components/button/button-group.model.ts diff --git a/core/app/common/src/lib/components/button/button.model.ts b/core/app/core/src/lib/common/components/button/button.model.ts similarity index 100% rename from core/app/common/src/lib/components/button/button.model.ts rename to core/app/core/src/lib/common/components/button/button.model.ts diff --git a/core/app/common/src/lib/components/button/dropdown-button.model.ts b/core/app/core/src/lib/common/components/button/dropdown-button.model.ts similarity index 100% rename from core/app/common/src/lib/components/button/dropdown-button.model.ts rename to core/app/core/src/lib/common/components/button/dropdown-button.model.ts diff --git a/core/app/common/src/lib/components/modal/modal.model.ts b/core/app/core/src/lib/common/components/modal/modal.model.ts similarity index 100% rename from core/app/common/src/lib/components/modal/modal.model.ts rename to core/app/core/src/lib/common/components/modal/modal.model.ts diff --git a/core/app/common/src/lib/components/pagination/pagination.model.ts b/core/app/core/src/lib/common/components/pagination/pagination.model.ts similarity index 100% rename from core/app/common/src/lib/components/pagination/pagination.model.ts rename to core/app/core/src/lib/common/components/pagination/pagination.model.ts diff --git a/core/app/common/src/lib/components/registry/base-component.registry.ts b/core/app/core/src/lib/common/components/registry/base-component.registry.ts similarity index 100% rename from core/app/common/src/lib/components/registry/base-component.registry.ts rename to core/app/core/src/lib/common/components/registry/base-component.registry.ts diff --git a/core/app/common/src/lib/containers/chart/chart.model.ts b/core/app/core/src/lib/common/containers/chart/chart.model.ts similarity index 100% rename from core/app/common/src/lib/containers/chart/chart.model.ts rename to core/app/core/src/lib/common/containers/chart/chart.model.ts diff --git a/core/app/common/src/lib/menu/menu.model.ts b/core/app/core/src/lib/common/menu/menu.model.ts similarity index 100% rename from core/app/common/src/lib/menu/menu.model.ts rename to core/app/core/src/lib/common/menu/menu.model.ts diff --git a/core/app/common/src/lib/metadata/charts-widget.metadata.ts b/core/app/core/src/lib/common/metadata/charts-widget.metadata.ts similarity index 100% rename from core/app/common/src/lib/metadata/charts-widget.metadata.ts rename to core/app/core/src/lib/common/metadata/charts-widget.metadata.ts diff --git a/core/app/common/src/lib/metadata/list.metadata.model.ts b/core/app/core/src/lib/common/metadata/list.metadata.model.ts similarity index 100% rename from core/app/common/src/lib/metadata/list.metadata.model.ts rename to core/app/core/src/lib/common/metadata/list.metadata.model.ts diff --git a/core/app/common/src/lib/metadata/metadata.model.ts b/core/app/core/src/lib/common/metadata/metadata.model.ts similarity index 100% rename from core/app/common/src/lib/metadata/metadata.model.ts rename to core/app/core/src/lib/common/metadata/metadata.model.ts diff --git a/core/app/common/src/lib/metadata/subpanel.metadata.model.ts b/core/app/core/src/lib/common/metadata/subpanel.metadata.model.ts similarity index 97% rename from core/app/common/src/lib/metadata/subpanel.metadata.model.ts rename to core/app/core/src/lib/common/metadata/subpanel.metadata.model.ts index 8282bff0e..e89b2a6ef 100644 --- a/core/app/common/src/lib/metadata/subpanel.metadata.model.ts +++ b/core/app/core/src/lib/common/metadata/subpanel.metadata.model.ts @@ -45,7 +45,6 @@ export interface SubPanelMeta { [key: string]: SubPanelDefinition; } -/* eslint-disable camelcase */ export interface SubPanelDefinition { insightWidget?: WidgetOptionMap; order?: 10; @@ -69,7 +68,9 @@ export interface SubPanelDefinition { lineActions?: Action[]; get_subpanel_data?: string; showFilter?: boolean; - parameters?: { [key: string]: any }; + parameters?: { + [key: string]: any; + }; } /* eslint-enable camelcase */ diff --git a/core/app/common/src/lib/metadata/widget.metadata.ts b/core/app/core/src/lib/common/metadata/widget.metadata.ts similarity index 100% rename from core/app/common/src/lib/metadata/widget.metadata.ts rename to core/app/core/src/lib/common/metadata/widget.metadata.ts diff --git a/core/app/common/src/lib/record/favorites.model.ts b/core/app/core/src/lib/common/record/favorites.model.ts similarity index 100% rename from core/app/common/src/lib/record/favorites.model.ts rename to core/app/core/src/lib/common/record/favorites.model.ts diff --git a/core/app/common/src/lib/record/field.model.ts b/core/app/core/src/lib/common/record/field.model.ts similarity index 100% rename from core/app/common/src/lib/record/field.model.ts rename to core/app/core/src/lib/common/record/field.model.ts diff --git a/core/app/common/src/lib/record/recently-viewed.model.ts b/core/app/core/src/lib/common/record/recently-viewed.model.ts similarity index 100% rename from core/app/common/src/lib/record/recently-viewed.model.ts rename to core/app/core/src/lib/common/record/recently-viewed.model.ts diff --git a/core/app/common/src/lib/record/record-mappers/record-mapper.model.ts b/core/app/core/src/lib/common/record/record-mappers/record-mapper.model.ts similarity index 100% rename from core/app/common/src/lib/record/record-mappers/record-mapper.model.ts rename to core/app/core/src/lib/common/record/record-mappers/record-mapper.model.ts diff --git a/core/app/common/src/lib/record/record-mappers/record-mapper.registry.ts b/core/app/core/src/lib/common/record/record-mappers/record-mapper.registry.ts similarity index 100% rename from core/app/common/src/lib/record/record-mappers/record-mapper.registry.ts rename to core/app/core/src/lib/common/record/record-mappers/record-mapper.registry.ts diff --git a/core/app/common/src/lib/record/record.model.ts b/core/app/core/src/lib/common/record/record.model.ts similarity index 100% rename from core/app/common/src/lib/record/record.model.ts rename to core/app/core/src/lib/common/record/record.model.ts diff --git a/core/app/common/src/lib/registry/base-service.registry.ts b/core/app/core/src/lib/common/registry/base-service.registry.ts similarity index 100% rename from core/app/common/src/lib/registry/base-service.registry.ts rename to core/app/core/src/lib/common/registry/base-service.registry.ts diff --git a/core/app/common/src/lib/registry/base-type.registry.ts b/core/app/core/src/lib/common/registry/base-type.registry.ts similarity index 100% rename from core/app/common/src/lib/registry/base-type.registry.ts rename to core/app/core/src/lib/common/registry/base-type.registry.ts diff --git a/core/app/common/src/lib/services/ui/resize.model.ts b/core/app/core/src/lib/common/services/ui/resize.model.ts similarity index 100% rename from core/app/common/src/lib/services/ui/resize.model.ts rename to core/app/core/src/lib/common/services/ui/resize.model.ts diff --git a/core/app/common/src/lib/services/validators/validators.model.ts b/core/app/core/src/lib/common/services/validators/validators.model.ts similarity index 100% rename from core/app/common/src/lib/services/validators/validators.model.ts rename to core/app/core/src/lib/common/services/validators/validators.model.ts diff --git a/core/app/common/src/lib/statistics/statistics-store.model.ts b/core/app/core/src/lib/common/statistics/statistics-store.model.ts similarity index 100% rename from core/app/common/src/lib/statistics/statistics-store.model.ts rename to core/app/core/src/lib/common/statistics/statistics-store.model.ts diff --git a/core/app/common/src/lib/statistics/statistics.model.ts b/core/app/core/src/lib/common/statistics/statistics.model.ts similarity index 100% rename from core/app/common/src/lib/statistics/statistics.model.ts rename to core/app/core/src/lib/common/statistics/statistics.model.ts diff --git a/core/app/common/src/lib/types/boolean-map.ts b/core/app/core/src/lib/common/types/boolean-map.ts similarity index 100% rename from core/app/common/src/lib/types/boolean-map.ts rename to core/app/core/src/lib/common/types/boolean-map.ts diff --git a/core/app/common/src/lib/types/messages.ts b/core/app/core/src/lib/common/types/messages.ts similarity index 100% rename from core/app/common/src/lib/types/messages.ts rename to core/app/core/src/lib/common/types/messages.ts diff --git a/core/app/common/src/lib/types/object-map.ts b/core/app/core/src/lib/common/types/object-map.ts similarity index 100% rename from core/app/common/src/lib/types/object-map.ts rename to core/app/core/src/lib/common/types/object-map.ts diff --git a/core/app/common/src/lib/types/overridable-map.ts b/core/app/core/src/lib/common/types/overridable-map.ts similarity index 100% rename from core/app/common/src/lib/types/overridable-map.ts rename to core/app/core/src/lib/common/types/overridable-map.ts diff --git a/core/app/common/src/lib/types/string-map.ts b/core/app/core/src/lib/common/types/string-map.ts similarity index 100% rename from core/app/common/src/lib/types/string-map.ts rename to core/app/core/src/lib/common/types/string-map.ts diff --git a/core/app/common/src/lib/types/string-matrix.ts b/core/app/core/src/lib/common/types/string-matrix.ts similarity index 100% rename from core/app/common/src/lib/types/string-matrix.ts rename to core/app/core/src/lib/common/types/string-matrix.ts diff --git a/core/app/common/src/lib/types/user.ts b/core/app/core/src/lib/common/types/user.ts similarity index 100% rename from core/app/common/src/lib/types/user.ts rename to core/app/core/src/lib/common/types/user.ts diff --git a/core/app/common/src/lib/utils/object-utils.ts b/core/app/core/src/lib/common/utils/object-utils.ts similarity index 100% rename from core/app/common/src/lib/utils/object-utils.ts rename to core/app/core/src/lib/common/utils/object-utils.ts diff --git a/core/app/common/src/lib/utils/value-utils.ts b/core/app/core/src/lib/common/utils/value-utils.ts similarity index 100% rename from core/app/common/src/lib/utils/value-utils.ts rename to core/app/core/src/lib/common/utils/value-utils.ts diff --git a/core/app/common/src/lib/utils/view-utils.ts b/core/app/core/src/lib/common/utils/view-utils.ts similarity index 100% rename from core/app/common/src/lib/utils/view-utils.ts rename to core/app/core/src/lib/common/utils/view-utils.ts diff --git a/core/app/common/src/lib/views/list/list-navigation.model.ts b/core/app/core/src/lib/common/views/list/list-navigation.model.ts similarity index 100% rename from core/app/common/src/lib/views/list/list-navigation.model.ts rename to core/app/core/src/lib/common/views/list/list-navigation.model.ts diff --git a/core/app/common/src/lib/views/list/record-selection.model.ts b/core/app/core/src/lib/common/views/list/record-selection.model.ts similarity index 100% rename from core/app/common/src/lib/views/list/record-selection.model.ts rename to core/app/core/src/lib/common/views/list/record-selection.model.ts diff --git a/core/app/common/src/lib/views/list/search-criteria.model.ts b/core/app/core/src/lib/common/views/list/search-criteria.model.ts similarity index 100% rename from core/app/common/src/lib/views/list/search-criteria.model.ts rename to core/app/core/src/lib/common/views/list/search-criteria.model.ts diff --git a/core/app/common/src/lib/views/list/selection.model.ts b/core/app/core/src/lib/common/views/list/selection.model.ts similarity index 100% rename from core/app/common/src/lib/views/list/selection.model.ts rename to core/app/core/src/lib/common/views/list/selection.model.ts diff --git a/core/app/common/src/lib/views/view.model.ts b/core/app/core/src/lib/common/views/view.model.ts similarity index 100% rename from core/app/common/src/lib/views/view.model.ts rename to core/app/core/src/lib/common/views/view.model.ts diff --git a/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.spec.ts b/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.spec.ts index 454e57cce..d54c97ed3 100644 --- a/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.spec.ts +++ b/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ActionGroupMenuComponent} from './action-group-menu.component'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {Observable, of} from 'rxjs'; import {shareReplay, take} from 'rxjs/operators'; @@ -55,7 +55,8 @@ import {AppStateStore} from '../../store/app-state/app-state.store'; import {recordActionsMock} from '../../views/record/adapters/actions.adapter.spec.mock'; import {RecordActionsAdapter} from '../../views/record/adapters/actions.adapter'; import {ImageModule} from '../image/image.module'; -import {ActionDataSource, Action} from 'common'; +import {Action, ActionDataSource} from '../../common/actions/action.model'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'action-group-menu-test-host-component', @@ -94,33 +95,32 @@ describe('ActionGroupMenuComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - HttpClientTestingModule, - ApolloTestingModule, - ImageModule, - ButtonModule, - ActionGroupMenuModule, - RouterTestingModule - ], - declarations: [ActionGroupMenuComponent, ActionGroupMenuTestHostComponent], - providers: [ - {provide: RecordViewStore, useValue: recordviewStoreMock}, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - {provide: NavigationStore, useValue: navigationMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - {provide: AppStateStore, useValue: appStateStoreMock}, - {provide: RecordActionsAdapter, useValue: recordActionsMock}, - ], - }) + declarations: [ActionGroupMenuComponent, ActionGroupMenuTestHostComponent], + imports: [ApolloTestingModule, + ImageModule, + ButtonModule, + ActionGroupMenuModule, + RouterTestingModule], + providers: [ + { provide: RecordViewStore, useValue: recordviewStoreMock }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + { provide: NavigationStore, useValue: navigationMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + { provide: AppStateStore, useValue: appStateStoreMock }, + { provide: RecordActionsAdapter, useValue: recordActionsMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); testHostFixture = TestBed.createComponent(ActionGroupMenuTestHostComponent); diff --git a/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.ts b/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.ts index d9c48df44..aee552900 100644 --- a/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.ts +++ b/core/app/core/src/lib/components/action-group-menu/action-group-menu.component.ts @@ -25,7 +25,10 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {Action, ActionContext, ActionDataSource, Button, ButtonGroupInterface, ButtonInterface, isFalse} from 'common'; +import {Action, ActionContext, ActionDataSource} from '../../common/actions/action.model'; +import {Button, ButtonInterface} from '../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../common/components/button/button-group.model'; +import {isFalse} from '../../common/utils/value-utils'; import {BehaviorSubject, combineLatestWith, Observable, Subscription} from 'rxjs'; import {map} from 'rxjs/operators'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.spec.ts b/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.spec.ts index 1e69e85fe..dc201f0f5 100644 --- a/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.spec.ts +++ b/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.spec.ts @@ -28,7 +28,9 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {BulkActionDataSource, BulkActionMenuComponent} from './bulk-action-menu.component'; -import {BulkActionsMap, SelectionDataSource, SelectionStatus} from 'common'; +import {BulkActionsMap} from '../../common/actions/bulk-action.model'; +import {SelectionStatus} from '../../common/views/list/record-selection.model'; +import {SelectionDataSource} from '../../common/views/list/selection.model'; import {By} from '@angular/platform-browser'; import {shareReplay, take} from 'rxjs/operators'; import {NgbDropdownModule} from '@ng-bootstrap/ng-bootstrap'; diff --git a/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.ts b/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.ts index 7f53e702f..6414964ab 100644 --- a/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.ts +++ b/core/app/core/src/lib/components/bulk-action-menu/bulk-action-menu.component.ts @@ -26,7 +26,10 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {Observable, Subscription} from 'rxjs'; -import {BulkActionsMap, DropdownButtonInterface, SelectionDataSource, SelectionStatus} from 'common'; +import {BulkActionsMap} from '../../common/actions/bulk-action.model'; +import {DropdownButtonInterface} from '../../common/components/button/dropdown-button.model'; +import {SelectionStatus} from '../../common/views/list/record-selection.model'; +import {SelectionDataSource} from '../../common/views/list/selection.model'; import {LanguageStore} from '../../store/language/language.store'; export interface BulkActionDataSource { diff --git a/core/app/core/src/lib/components/button-group/button-group.component.spec.ts b/core/app/core/src/lib/components/button-group/button-group.component.spec.ts index 71975d973..ba0635d3d 100644 --- a/core/app/core/src/lib/components/button-group/button-group.component.spec.ts +++ b/core/app/core/src/lib/components/button-group/button-group.component.spec.ts @@ -29,7 +29,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ButtonGroupComponent} from './button-group.component'; import {Component} from '@angular/core'; import {NgbDropdownModule} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonGroupInterface} from 'common'; +import {ButtonGroupInterface} from '../../common/components/button/button-group.model'; import {shareReplay} from 'rxjs/operators'; import {Observable, of} from 'rxjs'; import {DropdownButtonModule} from '../dropdown-button/dropdown-button.module'; diff --git a/core/app/core/src/lib/components/button-group/button-group.component.ts b/core/app/core/src/lib/components/button-group/button-group.component.ts index fae192f22..17dad3fb1 100644 --- a/core/app/core/src/lib/components/button-group/button-group.component.ts +++ b/core/app/core/src/lib/components/button-group/button-group.component.ts @@ -25,7 +25,10 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {Button, ButtonGroupInterface, DropdownButtonInterface, AnyButtonInterface} from 'common'; +import {Button} from '../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../common/components/button/button-group.model'; +import {DropdownButtonInterface, AnyButtonInterface} from '../../common/components/button/dropdown-button.model'; + import {Observable, Subscription} from 'rxjs'; interface SplitButtons { diff --git a/core/app/core/src/lib/components/button/button.component.spec.ts b/core/app/core/src/lib/components/button/button.component.spec.ts index 9e7b5cd15..20f94c529 100644 --- a/core/app/core/src/lib/components/button/button.component.spec.ts +++ b/core/app/core/src/lib/components/button/button.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ButtonComponent} from './button.component'; import {Component} from '@angular/core'; -import {ButtonInterface} from 'common'; +import {ButtonInterface} from '../../common/components/button/button.model'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; import {ImageModule} from '../image/image.module'; diff --git a/core/app/core/src/lib/components/button/button.component.ts b/core/app/core/src/lib/components/button/button.component.ts index a1043ef66..ad3fcaedc 100644 --- a/core/app/core/src/lib/components/button/button.component.ts +++ b/core/app/core/src/lib/components/button/button.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {ButtonCallback, ButtonInterface} from 'common'; +import {ButtonInterface, ButtonCallback} from '../../common/components/button/button.model'; import {LanguageStore} from '../../store/language/language.store'; import {Observable, Subject, Subscription} from 'rxjs'; import {debounceTime} from 'rxjs/operators'; diff --git a/core/app/core/src/lib/components/button/button.utils.ts b/core/app/core/src/lib/components/button/button.utils.ts index dfd483778..75a7c7b44 100644 --- a/core/app/core/src/lib/components/button/button.utils.ts +++ b/core/app/core/src/lib/components/button/button.utils.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {AnyButtonInterface} from 'common'; +import {AnyButtonInterface} from '../../common/components/button/dropdown-button.model'; import partial from 'lodash-es/partial'; @Injectable({ diff --git a/core/app/core/src/lib/components/chart/components/base-chart/base-chart.component.ts b/core/app/core/src/lib/components/chart/components/base-chart/base-chart.component.ts index d2df00685..9eb31c81d 100644 --- a/core/app/core/src/lib/components/chart/components/base-chart/base-chart.component.ts +++ b/core/app/core/src/lib/components/chart/components/base-chart/base-chart.component.ts @@ -25,10 +25,10 @@ */ import {Component, ElementRef, Input, signal} from '@angular/core'; -import {ChartDataSource} from 'common'; -import {fromEvent, Observable, Subscription} from "rxjs"; -import {ScreenSizeObserverService} from "../../../../services/ui/screen-size-observer/screen-size-observer.service"; +import {fromEvent, Subscription} from "rxjs"; import {debounceTime, tap} from "rxjs/operators"; +import {ChartDataSource} from '../../../../common/containers/chart/chart.model'; +import {ScreenSizeObserverService} from "../../../../services/ui/screen-size-observer/screen-size-observer.service"; @Component({template: ''}) export class BaseChartComponent { diff --git a/core/app/core/src/lib/components/chart/components/chart/chart.component.ts b/core/app/core/src/lib/components/chart/components/chart/chart.component.ts index fd24efec8..50a8ec7a4 100644 --- a/core/app/core/src/lib/components/chart/components/chart/chart.component.ts +++ b/core/app/core/src/lib/components/chart/components/chart/chart.component.ts @@ -25,8 +25,8 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {ChartDataSource} from 'common'; import {ChartRegistry} from './chart.registry'; +import {ChartDataSource} from '../../../../common/containers/chart/chart.model'; @Component({ selector: 'scrm-chart', diff --git a/core/app/core/src/lib/components/chart/components/chart/chart.registry.ts b/core/app/core/src/lib/components/chart/components/chart/chart.registry.ts index b2c78f0db..c626d78b1 100644 --- a/core/app/core/src/lib/components/chart/components/chart/chart.registry.ts +++ b/core/app/core/src/lib/components/chart/components/chart/chart.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../../common/components/registry/base-component.registry'; import {BaseChartComponent} from '../base-chart/base-chart.component'; import {chartTypeMap} from './chart.manifest'; diff --git a/core/app/core/src/lib/components/chart/components/line-chart/line-chart.component.ts b/core/app/core/src/lib/components/chart/components/line-chart/line-chart.component.ts index 25d2c93bf..f0936fc72 100644 --- a/core/app/core/src/lib/components/chart/components/line-chart/line-chart.component.ts +++ b/core/app/core/src/lib/components/chart/components/line-chart/line-chart.component.ts @@ -25,7 +25,8 @@ */ import {Component, ElementRef, OnDestroy, OnInit} from '@angular/core'; -import {isFalse, MultiSeries} from 'common'; +import {MultiSeries} from '../../../../common/containers/chart/chart.model'; +import {isFalse} from '../../../../common/utils/value-utils'; import {BaseChartComponent} from '../base-chart/base-chart.component'; import {ScreenSizeObserverService} from "../../../../services/ui/screen-size-observer/screen-size-observer.service"; diff --git a/core/app/core/src/lib/components/chart/components/pie-grid-chart/pie-grid-chart.component.ts b/core/app/core/src/lib/components/chart/components/pie-grid-chart/pie-grid-chart.component.ts index 49f8e3cda..d24a5f7c1 100644 --- a/core/app/core/src/lib/components/chart/components/pie-grid-chart/pie-grid-chart.component.ts +++ b/core/app/core/src/lib/components/chart/components/pie-grid-chart/pie-grid-chart.component.ts @@ -25,7 +25,7 @@ */ import {Component, ElementRef, OnDestroy, OnInit} from '@angular/core'; -import {SeriesResult, SingleSeries} from 'common'; +import {SeriesResult, SingleSeries} from '../../../../common/containers/chart/chart.model'; import {LanguageStore} from '../../../../store/language/language.store'; import {BaseChartComponent} from '../base-chart/base-chart.component'; import {debounceTime} from "rxjs/operators"; diff --git a/core/app/core/src/lib/components/chart/components/vertical-bar-chart/vertical-bar-chart.component.ts b/core/app/core/src/lib/components/chart/components/vertical-bar-chart/vertical-bar-chart.component.ts index a40f18e1b..a9128e9de 100644 --- a/core/app/core/src/lib/components/chart/components/vertical-bar-chart/vertical-bar-chart.component.ts +++ b/core/app/core/src/lib/components/chart/components/vertical-bar-chart/vertical-bar-chart.component.ts @@ -25,7 +25,8 @@ */ import {Component, ElementRef, OnDestroy, OnInit} from '@angular/core'; -import {isFalse, SingleSeries} from 'common'; +import {SingleSeries} from '../../../../common/containers/chart/chart.model'; +import {isFalse} from '../../../../common/utils/value-utils'; import {BaseChartComponent} from '../base-chart/base-chart.component'; import {ScreenSizeObserverService} from "../../../../services/ui/screen-size-observer/screen-size-observer.service"; import {debounceTime} from "rxjs/operators"; diff --git a/core/app/core/src/lib/components/close-button/close-button.component.spec.ts b/core/app/core/src/lib/components/close-button/close-button.component.spec.ts index 7c2cbe8f9..4a5cd49e8 100644 --- a/core/app/core/src/lib/components/close-button/close-button.component.spec.ts +++ b/core/app/core/src/lib/components/close-button/close-button.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {CloseButtonComponent} from './close-button.component'; -import {ButtonInterface} from 'common'; +import {ButtonInterface} from '../../common/components/button/button.model'; import {ButtonModule} from '../button/button.module'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; diff --git a/core/app/core/src/lib/components/close-button/close-button.component.ts b/core/app/core/src/lib/components/close-button/close-button.component.ts index 89fc5ace6..615ac280a 100644 --- a/core/app/core/src/lib/components/close-button/close-button.component.ts +++ b/core/app/core/src/lib/components/close-button/close-button.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input} from '@angular/core'; -import {Button, ButtonInterface} from 'common'; +import {Button, ButtonInterface} from '../../common/components/button/button.model'; @Component({ selector: 'scrm-close-button', diff --git a/core/app/core/src/lib/components/columnchooser/columnchooser.component.ts b/core/app/core/src/lib/components/columnchooser/columnchooser.component.ts index 35ae04438..0d78aa309 100644 --- a/core/app/core/src/lib/components/columnchooser/columnchooser.component.ts +++ b/core/app/core/src/lib/components/columnchooser/columnchooser.component.ts @@ -27,7 +27,9 @@ import {Component, Input, OnInit} from '@angular/core'; import {CdkDragDrop, moveItemInArray, transferArrayItem} from '@angular/cdk/drag-drop'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonInterface, ColumnDefinition, ModalCloseFeedBack} from "common"; +import {ButtonInterface} from '../../common/components/button/button.model'; +import {ColumnDefinition} from '../../common/metadata/list.metadata.model'; +import {ModalCloseFeedBack} from '../../common/components/modal/modal.model'; import {AppStateStore} from "../../store/app-state/app-state.store"; import {LanguageStore} from "../../store/language/language.store"; diff --git a/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.spec.ts b/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.spec.ts index 0c119c5ca..c563d0903 100644 --- a/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.spec.ts +++ b/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {DropdownButtonComponent} from './dropdown-button.component'; import {Component} from '@angular/core'; -import {DropdownButtonInterface} from 'common'; +import {DropdownButtonInterface} from '../../common/components/button/dropdown-button.model'; import {NgbDropdownModule, NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap'; import {ButtonModule} from '../button/button.module'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; diff --git a/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.ts b/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.ts index 7f3191e4e..aa05eb006 100644 --- a/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.ts +++ b/core/app/core/src/lib/components/dropdown-button/dropdown-button.component.ts @@ -25,14 +25,9 @@ */ import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; -import { - ButtonInterface, - deepClone, - DropdownButtonInterface, - DropdownButtonSection, - DropdownButtonSectionMap, - emptyObject -} from 'common'; +import {deepClone, emptyObject} from '../../common/utils/object-utils'; +import {ButtonInterface} from '../../common/components/button/button.model'; +import {DropdownButtonInterface, DropdownButtonSection, DropdownButtonSectionMap} from '../../common/components/button/dropdown-button.model'; import {NgbDropdown} from '@ng-bootstrap/ng-bootstrap'; import {PlacementArray} from '@ng-bootstrap/ng-bootstrap/util/positioning'; import {LanguageStore} from '../../store/language/language.store'; diff --git a/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.spec.ts b/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.spec.ts index 1854cadaa..a81a48989 100644 --- a/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.spec.ts +++ b/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.spec.ts @@ -29,7 +29,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {DropdownSubmenuComponent} from './dropdown-submenu.component'; import {Component} from '@angular/core'; import {NgbDropdownModule} from '@ng-bootstrap/ng-bootstrap'; -import {DropdownButtonInterface} from 'common'; +import {DropdownButtonInterface} from '../../common/components/button/dropdown-button.model'; import {DropdownButtonModule} from '../dropdown-button/dropdown-button.module'; import {ButtonModule} from '../button/button.module'; diff --git a/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.ts b/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.ts index 45dfb498e..9060c28b6 100644 --- a/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.ts +++ b/core/app/core/src/lib/components/dropdown-submenu/dropdown-submenu.component.ts @@ -25,7 +25,7 @@ */ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {AnyButtonInterface, DropdownButtonInterface} from 'common'; +import {DropdownButtonInterface, AnyButtonInterface} from '../../common/components/button/dropdown-button.model'; @Component({ selector: 'scrm-dropdown-submenu', diff --git a/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.spec.ts b/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.spec.ts index bbff7ecef..6eeeec9ee 100644 --- a/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.spec.ts +++ b/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../common/record/field.model'; import {UserPreferenceStore} from '../../store/user-preference/user-preference.store'; import {datetimeFormatterMock} from '../../services/formatters/datetime/datetime-formatter.service.spec.mock'; import {CurrencyFormatter} from '../../services/formatters/currency/currency-formatter.service'; diff --git a/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.ts b/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.ts index a48a612ce..d0f8238b2 100644 --- a/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.ts +++ b/core/app/core/src/lib/components/dynamic-label/dynamic-label.component.ts @@ -25,7 +25,8 @@ */ import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; -import {FieldMap, StringMap} from 'common'; +import {FieldMap} from '../../common/record/field.model'; +import {StringMap} from '../../common/types/string-map'; import {Observable} from 'rxjs'; import {tap} from 'rxjs/operators'; import {LanguageStore, LanguageStrings} from '../../store/language/language.store'; diff --git a/core/app/core/src/lib/components/field-grid/base-field-grid.component.ts b/core/app/core/src/lib/components/field-grid/base-field-grid.component.ts index 92f17578b..4946d764a 100644 --- a/core/app/core/src/lib/components/field-grid/base-field-grid.component.ts +++ b/core/app/core/src/lib/components/field-grid/base-field-grid.component.ts @@ -28,7 +28,7 @@ import {Directive, Input, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from 'rxjs'; import {BreakpointObserver, Breakpoints, BreakpointState} from '@angular/cdk/layout'; import {FieldGridRow, LabelDisplay} from './field-grid.model'; -import {ScreenSizeMap} from 'common'; +import {ScreenSizeMap} from '../../common/services/ui/resize.model'; @Directive() diff --git a/core/app/core/src/lib/components/field-grid/field-grid.component.spec.ts b/core/app/core/src/lib/components/field-grid/field-grid.component.spec.ts index 3c9fee49c..94058835d 100644 --- a/core/app/core/src/lib/components/field-grid/field-grid.component.spec.ts +++ b/core/app/core/src/lib/components/field-grid/field-grid.component.spec.ts @@ -32,7 +32,7 @@ import {LayoutModule} from '@angular/cdk/layout'; import {By} from '@angular/platform-browser'; import {CommonModule} from '@angular/common'; import {RouterTestingModule} from '@angular/router/testing'; -import {Field} from 'common'; +import {Field} from '../../common/record/field.model'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {FieldModule} from '../../fields/field.module'; import {DropdownButtonModule} from '../dropdown-button/dropdown-button.module'; diff --git a/core/app/core/src/lib/components/field-grid/field-grid.component.ts b/core/app/core/src/lib/components/field-grid/field-grid.component.ts index df06e74dd..63851754a 100644 --- a/core/app/core/src/lib/components/field-grid/field-grid.component.ts +++ b/core/app/core/src/lib/components/field-grid/field-grid.component.ts @@ -26,7 +26,8 @@ import {Component, Input, OnChanges} from '@angular/core'; import {BreakpointObserver} from '@angular/cdk/layout'; -import {Field, Record} from 'common'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; import {FieldGridColumn, FieldGridRow} from './field-grid.model'; import {BaseFieldGridComponent} from './base-field-grid.component'; diff --git a/core/app/core/src/lib/components/field-grid/field-grid.model.ts b/core/app/core/src/lib/components/field-grid/field-grid.model.ts index b5b2cabf5..55a80cef2 100644 --- a/core/app/core/src/lib/components/field-grid/field-grid.model.ts +++ b/core/app/core/src/lib/components/field-grid/field-grid.model.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {ButtonInterface, Field, FieldActions} from 'common'; +import {ButtonInterface} from '../../common/components/button/button.model'; +import {Field} from '../../common/record/field.model'; export interface FieldGridColumn { field?: Field; diff --git a/core/app/core/src/lib/components/field-layout/field-layout.component.spec.ts b/core/app/core/src/lib/components/field-layout/field-layout.component.spec.ts index 2479c193d..65f0ee08b 100644 --- a/core/app/core/src/lib/components/field-layout/field-layout.component.spec.ts +++ b/core/app/core/src/lib/components/field-layout/field-layout.component.spec.ts @@ -28,7 +28,10 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {FieldLayoutComponent} from './field-layout.component'; import {Component} from '@angular/core'; -import {deepClone, FieldMap, Panel, Record} from 'common'; +import {Panel} from '../../common/metadata/metadata.model'; +import {FieldMap} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {deepClone} from '../../common/utils/object-utils'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {LayoutModule} from '@angular/cdk/layout'; import {CommonModule} from '@angular/common'; diff --git a/core/app/core/src/lib/components/field-layout/field-layout.component.ts b/core/app/core/src/lib/components/field-layout/field-layout.component.ts index 268fc378f..5c456a552 100644 --- a/core/app/core/src/lib/components/field-layout/field-layout.component.ts +++ b/core/app/core/src/lib/components/field-layout/field-layout.component.ts @@ -25,7 +25,9 @@ */ import {Component, Input} from '@angular/core'; -import {FieldMap, Panel, Record} from 'common'; +import {FieldMap} from '../../common/record/field.model'; +import {Panel} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; import {BreakpointObserver} from '@angular/cdk/layout'; import {FieldGridColumn, FieldGridRow} from '../field-grid/field-grid.model'; import {BaseFieldGridComponent} from '../field-grid/base-field-grid.component'; diff --git a/core/app/core/src/lib/components/field-layout/field-layout.model.ts b/core/app/core/src/lib/components/field-layout/field-layout.model.ts index 32cac75d4..810a3d7f3 100644 --- a/core/app/core/src/lib/components/field-layout/field-layout.model.ts +++ b/core/app/core/src/lib/components/field-layout/field-layout.model.ts @@ -25,10 +25,10 @@ */ import {Observable} from 'rxjs'; -import {Panel} from 'common'; -import {ViewMode} from 'common'; -import {FieldMap} from 'common'; -import {Record} from 'common'; +import {FieldMap} from '../../common/record/field.model'; +import {Panel} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; export interface FieldLayoutConfig { mode: ViewMode; diff --git a/core/app/core/src/lib/components/footer/footer.component.spec.ts b/core/app/core/src/lib/components/footer/footer.component.spec.ts index 78806a367..8976bca29 100644 --- a/core/app/core/src/lib/components/footer/footer.component.spec.ts +++ b/core/app/core/src/lib/components/footer/footer.component.spec.ts @@ -28,10 +28,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {FooterUiComponent} from './footer.component'; import {ApolloTestingModule} from 'apollo-angular/testing'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('FooterUiComponent', () => { let component: FooterUiComponent; @@ -39,10 +40,11 @@ describe('FooterUiComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [RouterTestingModule, HttpClientTestingModule, FormsModule, ApolloTestingModule], - declarations: [FooterUiComponent] - }) + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [FooterUiComponent], + imports: [RouterTestingModule, FormsModule, ApolloTestingModule], + providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.mock.ts b/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.mock.ts index d887e0f7d..0d2cf2eb9 100644 --- a/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.mock.ts +++ b/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.mock.ts @@ -29,7 +29,7 @@ import {shareReplay} from 'rxjs/operators'; import {SingleValueStatisticsStoreFactory} from '../../store/single-value-statistics/single-value-statistics.store.factory'; import {fieldManagerMock} from '../../services/record/field/field.manager.spec.mock'; import {StatisticsFetchGQL} from '../../store/statistics/graphql/api.statistics.get'; -import {StatisticsMap, StatisticsQueryMap} from 'common'; +import {StatisticsMap, StatisticsQueryMap} from '../../common/statistics/statistics.model'; class StatisticsFetchGQLSpy extends StatisticsFetchGQL { constructor() { diff --git a/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.ts b/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.ts index 62e910de1..602bf4383 100644 --- a/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.ts +++ b/core/app/core/src/lib/components/grid-widget/grid-widget.component.spec.ts @@ -41,7 +41,8 @@ import {SingleValueStatisticsStoreFactory} from '../../store/single-value-statis import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; import {gridWidgetFactoryMock} from './grid-widget.component.spec.mock'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../common/views/view.model'; +import {WidgetMetadata} from '../../common/metadata/widget.metadata'; @Component({ selector: 'scrm-grid-widget-test-host-component', diff --git a/core/app/core/src/lib/components/grid-widget/grid-widget.component.ts b/core/app/core/src/lib/components/grid-widget/grid-widget.component.ts index 528cac1b6..981025a16 100644 --- a/core/app/core/src/lib/components/grid-widget/grid-widget.component.ts +++ b/core/app/core/src/lib/components/grid-widget/grid-widget.component.ts @@ -33,22 +33,19 @@ import {LanguageStore} from '../../store/language/language.store'; import { ContentAlign, ContentJustify, - FieldMap, - isTrue, - SingleValueStatisticsState, - SingleValueStatisticsStoreInterface, - StatisticMetadata, - StatisticsQuery, StatisticWidgetLayoutCol, StatisticWidgetLayoutRow, StatisticWidgetOptions, - StringMap, TextColor, TextSizes, - ViewContext, - WidgetMetadata, -} from 'common'; - + WidgetMetadata +} from '../../common/metadata/widget.metadata'; +import {FieldMap} from '../../common/record/field.model'; +import {SingleValueStatisticsState, SingleValueStatisticsStoreInterface} from '../../common/statistics/statistics-store.model'; +import {StatisticMetadata, StatisticsQuery} from '../../common/statistics/statistics.model'; +import {StringMap} from '../../common/types/string-map'; +import {ViewContext} from '../../common/views/view.model'; +import {isTrue} from '../../common/utils/value-utils'; interface StatisticsEntry { labelKey?: string; type: string; diff --git a/core/app/core/src/lib/components/grouped-button/grouped-button.component.ts b/core/app/core/src/lib/components/grouped-button/grouped-button.component.ts index 4d0b2f548..e09baa168 100644 --- a/core/app/core/src/lib/components/grouped-button/grouped-button.component.ts +++ b/core/app/core/src/lib/components/grouped-button/grouped-button.component.ts @@ -25,7 +25,7 @@ */ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; -import {GroupedButtonInterface} from 'common'; +import {GroupedButtonInterface} from '../../common/components/button/dropdown-button.model'; @Component({ selector: 'scrm-grouped-button', diff --git a/core/app/core/src/lib/components/image/image.component.spec.ts b/core/app/core/src/lib/components/image/image.component.spec.ts index dbebb44dc..24a054579 100644 --- a/core/app/core/src/lib/components/image/image.component.spec.ts +++ b/core/app/core/src/lib/components/image/image.component.spec.ts @@ -27,13 +27,14 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ImageComponent} from './image.component'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; import {Component} from '@angular/core'; import {themeImagesMockData} from '../../store/theme-images/theme-images.store.spec.mock'; import {ThemeImagesStore} from '../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'host-component', @@ -54,19 +55,18 @@ describe('ImageComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [ImageComponent, TestHostComponent], - imports: [ - AngularSvgIconModule.forRoot(), - HttpClientTestingModule - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }) + declarations: [ImageComponent, TestHostComponent], + imports: [AngularSvgIconModule.forRoot()], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); diff --git a/core/app/core/src/lib/components/install-error-modal/install-error-modal.component.ts b/core/app/core/src/lib/components/install-error-modal/install-error-modal.component.ts index 87799e929..0a7ed4b3d 100644 --- a/core/app/core/src/lib/components/install-error-modal/install-error-modal.component.ts +++ b/core/app/core/src/lib/components/install-error-modal/install-error-modal.component.ts @@ -26,7 +26,9 @@ import {Component, Input, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonInterface, isEmptyString, ModalCloseFeedBack} from 'common'; +import {ModalCloseFeedBack} from '../../common/components/modal/modal.model'; +import {isEmptyString} from '../../common/utils/value-utils'; +import {ButtonInterface} from '../../common/components/button/button.model'; import {AppStateStore} from '../../store/app-state/app-state.store'; import {LanguageStore} from '../../store/language/language.store'; diff --git a/core/app/core/src/lib/components/line-action-menu/line-action-menu.component.ts b/core/app/core/src/lib/components/line-action-menu/line-action-menu.component.ts index 1dded5294..a768d8102 100644 --- a/core/app/core/src/lib/components/line-action-menu/line-action-menu.component.ts +++ b/core/app/core/src/lib/components/line-action-menu/line-action-menu.component.ts @@ -24,18 +24,12 @@ * the words "Supercharged by SuiteCRM". */ -import {Component, ElementRef, HostListener, Input, OnDestroy, OnInit, signal} from '@angular/core'; -import { - Action, - ActionContext, - ActionDataSource, - Button, - ButtonGroupInterface, - ButtonInterface, - isFalse, - Record, - ActiveLineAction -} from 'common'; +import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Action, ActionContext, ActionDataSource} from '../../common/actions/action.model'; +import {Button, ButtonInterface} from '../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../common/components/button/button-group.model'; +import {isFalse} from '../../common/utils/value-utils'; +import {Record} from '../../common/record/record.model'; import {LanguageStore, LanguageStrings} from '../../store/language/language.store'; import {BehaviorSubject, combineLatestWith, Observable, Subscription} from 'rxjs'; import { diff --git a/core/app/core/src/lib/components/load-more/load-more.component.ts b/core/app/core/src/lib/components/load-more/load-more.component.ts index 05191e8d6..72830cb2d 100644 --- a/core/app/core/src/lib/components/load-more/load-more.component.ts +++ b/core/app/core/src/lib/components/load-more/load-more.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input} from '@angular/core'; -import {ButtonInterface} from "common"; +import {ButtonInterface} from '../../common/components/button/button.model'; @Component({ selector: 'scrm-load-more', diff --git a/core/app/core/src/lib/components/logo/logo.component.spec.ts b/core/app/core/src/lib/components/logo/logo.component.spec.ts index 68e3aa16d..b7e2c9fa4 100644 --- a/core/app/core/src/lib/components/logo/logo.component.spec.ts +++ b/core/app/core/src/lib/components/logo/logo.component.spec.ts @@ -27,10 +27,11 @@ import { ComponentFixture, TestBed, inject, waitForAsync } from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import {LogoUiComponent} from './logo.component'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('LogoComponent', () => { let component: LogoUiComponent; @@ -38,10 +39,11 @@ describe('LogoComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [RouterTestingModule, HttpClientTestingModule], - declarations: [LogoUiComponent] - }) + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [LogoUiComponent], + imports: [RouterTestingModule], + providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/components/logo/logo.component.ts b/core/app/core/src/lib/components/logo/logo.component.ts index e1cf1daee..63647cbfc 100644 --- a/core/app/core/src/lib/components/logo/logo.component.ts +++ b/core/app/core/src/lib/components/logo/logo.component.ts @@ -25,7 +25,7 @@ */ import {Component, OnInit} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; @Component({ selector: 'scrm-logo-ui', diff --git a/core/app/core/src/lib/components/logout/logout.component.spec.ts b/core/app/core/src/lib/components/logout/logout.component.spec.ts index e19617f08..5e5811619 100644 --- a/core/app/core/src/lib/components/logout/logout.component.spec.ts +++ b/core/app/core/src/lib/components/logout/logout.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {LogoutUiComponent} from './logout.component'; import {ApolloTestingModule} from 'apollo-angular/testing'; @@ -36,6 +36,7 @@ import {take} from 'rxjs/operators'; import {AuthService} from '../../services/auth/auth.service'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('LogoutComponent', () => { let component: LogoutUiComponent; @@ -49,24 +50,23 @@ describe('LogoutComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - ApolloTestingModule - ], - declarations: [LogoutUiComponent], - providers: [ - { - provide: AuthService, useValue: authServiceMock - }, - { - provide: LanguageStore, useValue: { - vm$: of(languageStoreMock).pipe(take(1)) - } - }, - ] - }).compileComponents(); + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [LogoutUiComponent], + imports: [RouterTestingModule, + ApolloTestingModule], + providers: [ + { + provide: AuthService, useValue: authServiceMock + }, + { + provide: LanguageStore, useValue: { + vm$: of(languageStoreMock).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/message/message.component.ts b/core/app/core/src/lib/components/message/message.component.ts index 457e92d2f..1a4f2999b 100644 --- a/core/app/core/src/lib/components/message/message.component.ts +++ b/core/app/core/src/lib/components/message/message.component.ts @@ -25,7 +25,7 @@ */ import {Component, OnInit} from '@angular/core'; -import {Message} from 'common'; +import {Message} from '../../common/types/messages'; import {Observable} from 'rxjs'; import {transition, trigger, useAnimation} from '@angular/animations'; import {fadeIn, fadeOut} from 'ng-animate'; diff --git a/core/app/core/src/lib/components/minimise-button/minimise-button.component.spec.ts b/core/app/core/src/lib/components/minimise-button/minimise-button.component.spec.ts index 55fe969d1..76a9e2839 100644 --- a/core/app/core/src/lib/components/minimise-button/minimise-button.component.spec.ts +++ b/core/app/core/src/lib/components/minimise-button/minimise-button.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {MinimiseButtonComponent} from './minimise-button.component'; -import {ButtonInterface} from 'common'; +import {ButtonInterface} from '../../common/components/button/button.model'; import {themeImagesStoreMock} from '../../store/theme-images/theme-images.store.spec.mock'; import {ButtonModule} from '../button/button.module'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; diff --git a/core/app/core/src/lib/components/minimise-button/minimise-button.component.ts b/core/app/core/src/lib/components/minimise-button/minimise-button.component.ts index e101bab83..4c20bc2b0 100644 --- a/core/app/core/src/lib/components/minimise-button/minimise-button.component.ts +++ b/core/app/core/src/lib/components/minimise-button/minimise-button.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; -import {Button, ButtonInterface} from 'common'; +import {Button, ButtonInterface} from '../../common/components/button/button.model'; export type MinimiseButtonStatus = 'minimised' | 'maximised'; diff --git a/core/app/core/src/lib/components/modal/components/classic-modal/classic-modal.component.ts b/core/app/core/src/lib/components/modal/components/classic-modal/classic-modal.component.ts index fa362f8f1..897824d4e 100644 --- a/core/app/core/src/lib/components/modal/components/classic-modal/classic-modal.component.ts +++ b/core/app/core/src/lib/components/modal/components/classic-modal/classic-modal.component.ts @@ -28,7 +28,8 @@ import {AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChil import {IframeResizeHandlerHandler} from "../../../../views/classic/services/iframe-resize-handler.service"; import {IframePageChangeObserver} from "../../../../views/classic/services/iframe-page-change-observer.service"; import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; -import {ButtonInterface, ModalCloseFeedBack} from "common"; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ModalCloseFeedBack} from '../../../../common/components/modal/modal.model'; import {animate, transition, trigger} from "@angular/animations"; import {LanguageStore} from "../../../../store/language/language.store"; diff --git a/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.spec.ts b/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.spec.ts index f72b9bd4b..59785bfce 100644 --- a/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.spec.ts +++ b/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.spec.ts @@ -25,11 +25,10 @@ */ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; - import {MessageModalComponent} from './message-modal.component'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {Component, OnInit} from '@angular/core'; -import {ModalButtonInterface} from 'common'; +import {ModalButtonInterface} from '../../../../common/components/modal/modal.model'; import {NgbModalRef} from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {interval} from 'rxjs'; diff --git a/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.ts b/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.ts index aeaf5228b..9e86f6b1c 100644 --- a/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.ts +++ b/core/app/core/src/lib/components/modal/components/message-modal/message-modal.component.ts @@ -27,12 +27,8 @@ import {Component, Input, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; import {animate, transition, trigger} from '@angular/animations'; -import {ButtonInterface} from 'common'; -import { - AnyModalButtonInterface, - ModalButtonGroupInterface, - ModalCloseFeedBack -} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {AnyModalButtonInterface, ModalButtonGroupInterface, ModalCloseFeedBack} from '../../../../common/components/modal/modal.model'; import {Observable, of} from 'rxjs'; diff --git a/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.spec.ts b/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.spec.ts index 667bbff34..d8d99c5b3 100644 --- a/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.spec.ts +++ b/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.spec.ts @@ -29,7 +29,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; -import {ModalButtonGroupInterface} from 'common'; +import {ModalButtonGroupInterface} from '../../../../common/components/modal/modal.model'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {ModalButtonGroupModule} from './modal-button-group.module'; diff --git a/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.ts b/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.ts index 894807817..1885afeb2 100644 --- a/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.ts +++ b/core/app/core/src/lib/components/modal/components/modal-button-group/modal-button-group.component.ts @@ -26,7 +26,9 @@ import {Component, Input, OnInit} from '@angular/core'; import {Observable} from 'rxjs'; -import {ButtonGroupInterface, deepClone, ModalButtonGroupInterface} from 'common'; +import {ButtonGroupInterface} from '../../../../common/components/button/button-group.model'; +import {ModalButtonGroupInterface} from '../../../../common/components/modal/modal.model'; +import {deepClone} from '../../../../common/utils/object-utils'; import {map} from 'rxjs/operators'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; import defaults from 'lodash-es/defaults'; diff --git a/core/app/core/src/lib/components/modal/components/modal/modal.component.spec.ts b/core/app/core/src/lib/components/modal/components/modal/modal.component.spec.ts index 78b43c1cc..270f295a6 100644 --- a/core/app/core/src/lib/components/modal/components/modal/modal.component.spec.ts +++ b/core/app/core/src/lib/components/modal/components/modal/modal.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {ButtonInterface} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {ModalModule} from './modal.module'; import {languageStoreMock} from '../../../../store/language/language.store.spec.mock'; diff --git a/core/app/core/src/lib/components/modal/components/modal/modal.component.ts b/core/app/core/src/lib/components/modal/components/modal/modal.component.ts index d00da48b5..050ef42d4 100644 --- a/core/app/core/src/lib/components/modal/components/modal/modal.component.ts +++ b/core/app/core/src/lib/components/modal/components/modal/modal.component.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Component, Input, OnInit} from '@angular/core'; -import {ButtonInterface} from 'common'; +import {Component, Input} from '@angular/core'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; @Component({ selector: 'scrm-modal', diff --git a/core/app/core/src/lib/components/navbar/all-menu-model.ts b/core/app/core/src/lib/components/navbar/all-menu-model.ts index 4c28583f7..c2fcd5053 100644 --- a/core/app/core/src/lib/components/navbar/all-menu-model.ts +++ b/core/app/core/src/lib/components/navbar/all-menu-model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {MenuItem} from 'common'; +import {MenuItem} from '../../common/menu/menu.model'; export interface AllMenuModel { modules: MenuItem[]; diff --git a/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.spec.ts b/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.spec.ts index ea4bad6c1..6a1e82f5f 100644 --- a/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; @@ -39,6 +39,7 @@ import {UserPreferenceStore} from '../../store/user-preference/user-preference.s import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; import {userPreferenceStoreMock} from '../../store/user-preference/user-preference.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('NavbarUiComponent', () => { @@ -49,20 +50,19 @@ describe('NavbarUiComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - NgbModule, - ApolloTestingModule - ], - providers: [ - {provide: NavigationStore, useValue: navigationMock}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - ], - declarations: [NavbarUiComponent] - }).compileComponents(); + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [NavbarUiComponent], + imports: [RouterTestingModule, + NgbModule, + ApolloTestingModule], + providers: [ + { provide: NavigationStore, useValue: navigationMock }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); fixture = TestBed.createComponent(NavbarUiComponent); component = fixture.componentInstance; }); diff --git a/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.ts b/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.ts index 6804baed5..a7560c80c 100644 --- a/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.ts +++ b/core/app/core/src/lib/components/navbar/base-navbar/base-navbar.component.ts @@ -45,7 +45,9 @@ import {ModuleNavigation} from '../../../services/navigation/module-navigation/m import {ModuleNameMapper} from '../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {AppState, AppStateStore} from '../../../store/app-state/app-state.store'; import {AuthService} from '../../../services/auth/auth.service'; -import {MenuItem, ready, RecentlyViewed} from 'common'; +import {ready} from '../../../common/utils/object-utils'; +import {MenuItem} from '../../../common/menu/menu.model'; +import {RecentlyViewed} from '../../../common/record/recently-viewed.model'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {NotificationStore} from "../../../store/notification/notification.store"; import {GlobalRecentlyViewedStore} from "../../../store/global-recently-viewed/global-recently-viewed.store"; diff --git a/core/app/core/src/lib/components/navbar/grouped-menu-item/base-grouped-menu-item.component.ts b/core/app/core/src/lib/components/navbar/grouped-menu-item/base-grouped-menu-item.component.ts index 2fc887965..71fac2da0 100644 --- a/core/app/core/src/lib/components/navbar/grouped-menu-item/base-grouped-menu-item.component.ts +++ b/core/app/core/src/lib/components/navbar/grouped-menu-item/base-grouped-menu-item.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnDestroy, OnInit, signal, WritableSignal} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {Subject, Subscription} from "rxjs"; import {AppStateStore} from "../../../store/app-state/app-state.store"; import {MenuItemLinkConfig} from "../menu-item-link/menu-item-link-config.model"; diff --git a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.spec.ts b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.spec.ts index d608d3e10..2fc51da5d 100644 --- a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.spec.ts @@ -29,12 +29,12 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {GroupedMenuItemComponent} from './grouped-menu-item.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; import {Component} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {MenuItemLinkComponent} from '../menu-item-link/menu-item-link.component'; import {LanguageStrings} from '../../../store/language/language.store'; import {MenuRecentlyViewedComponent} from '../menu-recently-viewed/menu-recently-viewed.component'; @@ -42,6 +42,7 @@ import {languageMockData} from '../../../store/language/language.store.spec.mock import {themeImagesMockData} from '../../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const groupedMockMenuItem = { link: { @@ -120,27 +121,26 @@ describe('GroupedMenuItemComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - GroupedMenuItemComponent, - MenuItemLinkComponent, - GroupedMenuItemTestHostComponent, - MenuRecentlyViewedComponent - ], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [ + GroupedMenuItemComponent, + MenuItemLinkComponent, + GroupedMenuItemTestHostComponent, + MenuRecentlyViewedComponent + ], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.ts b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.ts index 4ed7be5b7..ebbe04a9c 100644 --- a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.ts +++ b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {GroupedMenuItemRegistry} from './grouped-menu-item.registry'; @Component({ diff --git a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.registry.ts b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.registry.ts index eccd8ed31..a559c28b1 100644 --- a/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.registry.ts +++ b/core/app/core/src/lib/components/navbar/grouped-menu-item/grouped-menu-item.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseGroupedMenuItemComponent} from './base-grouped-menu-item.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.component.spec.ts b/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.component.spec.ts index 8a9fc58a0..2d304beeb 100644 --- a/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.component.spec.ts @@ -29,7 +29,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {HomeMenuItemComponent} from './home-menu-item.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -38,6 +38,7 @@ import {MenuItemLinkComponent} from '../menu-item-link/menu-item-link.component' import {themeImagesMockData} from '../../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'home-menu-item-test-host-component', @@ -63,22 +64,21 @@ describe('HomeMenuItemComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [HomeMenuItemComponent, MenuItemLinkComponent, HomeMenuItemTestHostComponent], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule, - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [HomeMenuItemComponent, MenuItemLinkComponent, HomeMenuItemTestHostComponent], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.registry.ts b/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.registry.ts index 8d4b7c03a..305758913 100644 --- a/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.registry.ts +++ b/core/app/core/src/lib/components/navbar/home-menu-item/home-menu-item.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseHomeMenuItemComponent} from './base-home-menu-item.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-favorites/base-favorites.component.ts b/core/app/core/src/lib/components/navbar/menu-favorites/base-favorites.component.ts index 161b03e33..f7de0455e 100644 --- a/core/app/core/src/lib/components/navbar/menu-favorites/base-favorites.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-favorites/base-favorites.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core'; -import {Favorite} from 'common'; +import {Favorite} from '../../../common/record/favorites.model'; import {ModuleNavigation} from '../../../services/navigation/module-navigation/module-navigation.service'; import {ModuleNameMapper} from '../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/components/navbar/menu-favorites/menu-favorites-registry.ts b/core/app/core/src/lib/components/navbar/menu-favorites/menu-favorites-registry.ts index 77f8f0899..91a457896 100644 --- a/core/app/core/src/lib/components/navbar/menu-favorites/menu-favorites-registry.ts +++ b/core/app/core/src/lib/components/navbar/menu-favorites/menu-favorites-registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseMenuFavoritesComponent} from './base-menu-favorites.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-item-link/base-menu-item-link.component.ts b/core/app/core/src/lib/components/navbar/menu-item-link/base-menu-item-link.component.ts index c7bbb3f51..447b09620 100644 --- a/core/app/core/src/lib/components/navbar/menu-item-link/base-menu-item-link.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-item-link/base-menu-item-link.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {MenuItemLink} from 'common'; +import {MenuItemLink} from '../../../common/menu/menu.model'; import {take} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {AppStateStore} from '../../../store/app-state/app-state.store'; diff --git a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link-config.model.ts b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link-config.model.ts index 4544bcf8b..cac341762 100644 --- a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link-config.model.ts +++ b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link-config.model.ts @@ -24,8 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ButtonCallback} from "common"; - +import {ButtonCallback} from '../../../common/components/button/button.model'; export interface MenuItemLinkConfig { onClick: ButtonCallback; onTouchStart: ButtonCallback; diff --git a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.spec.ts b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.spec.ts index 1a0bc9ef0..ee4c1b761 100644 --- a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.spec.ts @@ -26,15 +26,15 @@ import {Component} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {provideHttpClientTesting} from '@angular/common/http/testing'; +import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {RouterTestingModule} from '@angular/router/testing'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {AngularSvgIconModule} from 'angular-svg-icon'; - import {MenuItemLinkComponent} from './menu-item-link.component'; -import {MenuItemLink} from 'common'; +import {MenuItemLink} from '../../../common/menu/menu.model'; import {themeImagesMockData} from '../../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; @@ -78,22 +78,21 @@ describe('MenuItemActionLinkComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [MenuItemLinkComponent, MenuItemLinkTestHostComponent], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule, - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [MenuItemLinkComponent, MenuItemLinkTestHostComponent], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.ts b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.ts index 616acc0e5..b2c17c28a 100644 --- a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.component.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Component, Input, OnInit} from '@angular/core'; -import {MenuItemLink} from 'common'; +import {Component, Input} from '@angular/core'; +import {MenuItemLink} from '../../../common/menu/menu.model'; import {MenuItemLinkRegistry} from './menu-item-link.registry'; import {MenuItemLinkConfig} from "./menu-item-link-config.model"; diff --git a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.registry.ts b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.registry.ts index df881a4e6..331b0518d 100644 --- a/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.registry.ts +++ b/core/app/core/src/lib/components/navbar/menu-item-link/menu-item-link.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseMenuItemLinkComponent} from './base-menu-item-link.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-item/base-menu-item.component.ts b/core/app/core/src/lib/components/navbar/menu-item/base-menu-item.component.ts index 3bf4d6615..5eebd8395 100644 --- a/core/app/core/src/lib/components/navbar/menu-item/base-menu-item.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-item/base-menu-item.component.ts @@ -25,7 +25,7 @@ */ import {Component, ElementRef, Input, OnDestroy, OnInit, signal, ViewChild} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {Subject, Subscription} from "rxjs"; import {AppStateStore} from "../../../store/app-state/app-state.store"; import {ModuleNavigation} from "../../../services/navigation/module-navigation/module-navigation.service"; diff --git a/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.spec.ts b/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.spec.ts index 312d9239e..2c2d9810c 100644 --- a/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.spec.ts @@ -30,11 +30,11 @@ import {MenuItemComponent} from './menu-item.component'; import {Component} from '@angular/core'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {MenuItemLinkComponent} from '../menu-item-link/menu-item-link.component'; import {LanguageStrings} from '../../../store/language/language.store'; import {MenuRecentlyViewedComponent} from '../menu-recently-viewed/menu-recently-viewed.component'; @@ -42,6 +42,7 @@ import {languageMockData} from '../../../store/language/language.store.spec.mock import {themeImagesMockData} from '../../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const mockMenuItem = { link: { @@ -99,27 +100,26 @@ describe('ModuleMenuItemComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - MenuItemComponent, - MenuItemLinkComponent, - MenuItemTestHostComponent, - MenuRecentlyViewedComponent - ], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [ + MenuItemComponent, + MenuItemLinkComponent, + MenuItemTestHostComponent, + MenuRecentlyViewedComponent + ], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.ts b/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.ts index e53cfee42..ca491a6f2 100644 --- a/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-item/menu-item.component.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Component, Input, OnInit} from '@angular/core'; -import {MenuItem} from 'common'; +import {Component, Input} from '@angular/core'; +import {MenuItem} from '../../../common/menu/menu.model'; import {MenuItemRegistry} from './menu-item.registry'; @Component({ diff --git a/core/app/core/src/lib/components/navbar/menu-item/menu-item.registry.ts b/core/app/core/src/lib/components/navbar/menu-item/menu-item.registry.ts index 374315e72..9628f6e84 100644 --- a/core/app/core/src/lib/components/navbar/menu-item/menu-item.registry.ts +++ b/core/app/core/src/lib/components/navbar/menu-item/menu-item.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseMenuItemComponent} from './base-menu-item.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-items-list/base-menu-items-list.component.ts b/core/app/core/src/lib/components/navbar/menu-items-list/base-menu-items-list.component.ts index d97569821..84362ec01 100644 --- a/core/app/core/src/lib/components/navbar/menu-items-list/base-menu-items-list.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-items-list/base-menu-items-list.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, signal} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {Subscription} from "rxjs"; import {AppStateStore} from "../../../store/app-state/app-state.store"; diff --git a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list-registry.ts b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list-registry.ts index be6ca3b1d..de43c01b5 100644 --- a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list-registry.ts +++ b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list-registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseMenuItemsListComponent} from './base-menu-items-list.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.spec.ts b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.spec.ts index c5abcfefd..0c865d4e4 100644 --- a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.spec.ts @@ -29,7 +29,7 @@ import {of} from 'rxjs'; import {take} from 'rxjs/operators'; import {Component} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; @@ -40,6 +40,7 @@ import {themeImagesMockData} from '../../../store/theme-images/theme-images.stor import {MenuItemComponent} from '../menu-item/menu-item.component'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const mockMenuItems = [ @@ -80,28 +81,27 @@ describe('MenuItemsListComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - MenuItemComponent, - MenuItemLinkComponent, - MenuItemsListComponent, - MenuRecentlyViewedComponent, - MenuItemListTestHostComponent - ], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule, - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [ + MenuItemComponent, + MenuItemLinkComponent, + MenuItemsListComponent, + MenuRecentlyViewedComponent, + MenuItemListTestHostComponent + ], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.ts b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.ts index a9b61388f..2775ebbf5 100644 --- a/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-items-list/menu-items-list.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {MenuItemsListRegistry} from './menu-items-list-registry'; @Component({ diff --git a/core/app/core/src/lib/components/navbar/menu-recently-viewed/base-menu-recently-viewed.component.ts b/core/app/core/src/lib/components/navbar/menu-recently-viewed/base-menu-recently-viewed.component.ts index 13fb0f94b..fd5f59c3c 100644 --- a/core/app/core/src/lib/components/navbar/menu-recently-viewed/base-menu-recently-viewed.component.ts +++ b/core/app/core/src/lib/components/navbar/menu-recently-viewed/base-menu-recently-viewed.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core'; -import {RecentlyViewed} from 'common'; +import {RecentlyViewed} from '../../../common/record/recently-viewed.model'; import {ModuleNavigation} from '../../../services/navigation/module-navigation/module-navigation.service'; import {ModuleNameMapper} from '../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed-registry.ts b/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed-registry.ts index 360f845d7..d67b37962 100644 --- a/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed-registry.ts +++ b/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed-registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseMenuRecentlyViewedComponent} from './base-menu-recently-viewed.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed.component.spec.ts b/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed.component.spec.ts index ae5e05723..287e6b008 100644 --- a/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/menu-recently-viewed/menu-recently-viewed.component.spec.ts @@ -29,7 +29,7 @@ import {of} from 'rxjs'; import {take} from 'rxjs/operators'; import {Component} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; @@ -40,6 +40,7 @@ import {languageMockData} from '../../../store/language/language.store.spec.mock import {themeImagesMockData} from '../../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const recentRecords = [ { @@ -70,26 +71,25 @@ describe('MenuRecentlyViewedComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - MenuItemLinkComponent, - MenuRecentlyViewedComponent, - MenuRecentlyViewedTestHostComponent - ], - imports: [ - AngularSvgIconModule.forRoot(), - RouterTestingModule, - HttpClientTestingModule, - ImageModule, - NgbModule, - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [ + MenuItemLinkComponent, + MenuRecentlyViewedComponent, + MenuRecentlyViewedTestHostComponent + ], + imports: [AngularSvgIconModule.forRoot(), + RouterTestingModule, + ImageModule, + NgbModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); })); beforeEach(() => { diff --git a/core/app/core/src/lib/components/navbar/navbar-model.ts b/core/app/core/src/lib/components/navbar/navbar-model.ts index 21ee3d538..700e6273b 100644 --- a/core/app/core/src/lib/components/navbar/navbar-model.ts +++ b/core/app/core/src/lib/components/navbar/navbar-model.ts @@ -28,7 +28,7 @@ import {ActionLinkModel} from './action-link-model'; import {CurrentUserModel} from './current-user-model'; import {AllMenuModel} from './all-menu-model'; import {LogoModel} from '../logo/logo-model'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../common/menu/menu.model'; import {GroupedTab, NavbarModuleMap, Navigation, UserActionMenu} from '../../store/navigation/navigation.store'; export interface NavbarModel { diff --git a/core/app/core/src/lib/components/navbar/navbar.abstract.ts b/core/app/core/src/lib/components/navbar/navbar.abstract.ts index c084ffed5..707ad1222 100644 --- a/core/app/core/src/lib/components/navbar/navbar.abstract.ts +++ b/core/app/core/src/lib/components/navbar/navbar.abstract.ts @@ -28,7 +28,9 @@ import {NavbarModel} from './navbar-model'; import {LogoAbstract} from '../logo/logo-abstract'; import {CurrentUserModel} from './current-user-model'; import {ActionLinkModel} from './action-link-model'; -import {MenuItem, ready, User} from 'common'; +import {ready} from '../../common/utils/object-utils'; +import {MenuItem} from '../../common/menu/menu.model'; +import {User} from '../../common/types/user'; import {LanguageStore} from '../../store/language/language.store'; import { GroupedTab, diff --git a/core/app/core/src/lib/components/navbar/navbar.component.spec.ts b/core/app/core/src/lib/components/navbar/navbar.component.spec.ts index ea4bad6c1..6a1e82f5f 100644 --- a/core/app/core/src/lib/components/navbar/navbar.component.spec.ts +++ b/core/app/core/src/lib/components/navbar/navbar.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; @@ -39,6 +39,7 @@ import {UserPreferenceStore} from '../../store/user-preference/user-preference.s import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../store/language/language.store'; import {userPreferenceStoreMock} from '../../store/user-preference/user-preference.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('NavbarUiComponent', () => { @@ -49,20 +50,19 @@ describe('NavbarUiComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - NgbModule, - ApolloTestingModule - ], - providers: [ - {provide: NavigationStore, useValue: navigationMock}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - ], - declarations: [NavbarUiComponent] - }).compileComponents(); + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [NavbarUiComponent], + imports: [RouterTestingModule, + NgbModule, + ApolloTestingModule], + providers: [ + { provide: NavigationStore, useValue: navigationMock }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); fixture = TestBed.createComponent(NavbarUiComponent); component = fixture.componentInstance; }); diff --git a/core/app/core/src/lib/components/navbar/navbar.registry.ts b/core/app/core/src/lib/components/navbar/navbar.registry.ts index 3be0e06e0..ca8eee4b5 100644 --- a/core/app/core/src/lib/components/navbar/navbar.registry.ts +++ b/core/app/core/src/lib/components/navbar/navbar.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../common/components/registry/base-component.registry'; import {BaseNavbarComponent} from './base-navbar/base-navbar.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/recently-viewed/recently-viewed.component.ts b/core/app/core/src/lib/components/navbar/recently-viewed/recently-viewed.component.ts index 9dc05ce96..92f013fa6 100644 --- a/core/app/core/src/lib/components/navbar/recently-viewed/recently-viewed.component.ts +++ b/core/app/core/src/lib/components/navbar/recently-viewed/recently-viewed.component.ts @@ -30,7 +30,7 @@ import {ImageModule} from "../../image/image.module"; import {RouterLink} from "@angular/router"; import {ModuleNameMapper} from "../../../services/navigation/module-name-mapper/module-name-mapper.service"; import {ModuleNavigation} from "../../../services/navigation/module-navigation/module-navigation.service"; -import {RecentlyViewed} from "common"; +import {RecentlyViewed} from '../../../common/record/recently-viewed.model'; import {LabelModule} from "../../label/label.module"; @Component({ diff --git a/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-config.model.ts b/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-config.model.ts index 2cd946174..7e58197da 100644 --- a/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-config.model.ts +++ b/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-config.model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ButtonCallback} from "common"; +import {ButtonCallback} from '../../../common/components/button/button.model'; import {Observable} from "rxjs"; export interface SubMenuFavoritesConfig { diff --git a/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-registry.ts b/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-registry.ts index f2d59c610..36e49e209 100644 --- a/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-registry.ts +++ b/core/app/core/src/lib/components/navbar/sub-menu-favorites/sub-menu-favorites-registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseSubMenuFavoritesComponent} from './base-sub-menu-favorites.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/base-sub-menu-recently-viewed.component.ts b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/base-sub-menu-recently-viewed.component.ts index 670ccf035..6eb817008 100644 --- a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/base-sub-menu-recently-viewed.component.ts +++ b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/base-sub-menu-recently-viewed.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnChanges, OnDestroy, OnInit, signal, SimpleChanges} from '@angular/core'; -import {RecentlyViewed} from 'common'; +import {RecentlyViewed} from '../../../common/record/recently-viewed.model'; import {ModuleNavigation} from '../../../services/navigation/module-navigation/module-navigation.service'; import {ModuleNameMapper} from '../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-config.model.ts b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-config.model.ts index ac91d6c4d..f3b13cd2f 100644 --- a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-config.model.ts +++ b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-config.model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ButtonCallback} from "common"; +import {ButtonCallback} from '../../../common/components/button/button.model'; import {Observable} from "rxjs"; export interface SubMenuRecentlyViewedConfig { diff --git a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-registry.ts b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-registry.ts index a1dd458b5..44406fe62 100644 --- a/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-registry.ts +++ b/core/app/core/src/lib/components/navbar/sub-menu-recently-viewed/sub-menu-recently-viewed-registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../common/components/registry/base-component.registry'; import {BaseSubMenuRecentlyViewedComponent} from './base-sub-menu-recently-viewed.component'; @Injectable({ diff --git a/core/app/core/src/lib/components/pagination/pagination.component.spec.ts b/core/app/core/src/lib/components/pagination/pagination.component.spec.ts index 8f25c779d..d38adfaab 100644 --- a/core/app/core/src/lib/components/pagination/pagination.component.spec.ts +++ b/core/app/core/src/lib/components/pagination/pagination.component.spec.ts @@ -30,15 +30,17 @@ import {take} from 'rxjs/operators'; import {Component} from '@angular/core'; import {PaginationComponent} from './pagination.component'; -import {PageSelection, PaginationCount, PaginationDataSource} from 'common'; +import {PaginationDataSource} from '../../common/components/pagination/pagination.model'; +import {PageSelection, PaginationCount} from '../../common/views/list/list-navigation.model'; import {By} from '@angular/platform-browser'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {LanguageStore} from '../../store/language/language.store'; import {languageMockData} from '../../store/language/language.store.spec.mock'; import {themeImagesMockData} from '../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../image/image.module'; import {ThemeImagesStore} from '../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const pageSubject = new BehaviorSubject(PageSelection.LAST); const countSubject = new BehaviorSubject({ @@ -68,29 +70,28 @@ describe('PaginationComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - PaginationTestHostComponent, - PaginationComponent, - ], - imports: [ - ImageModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule - ], - providers: [ - { - provide: LanguageStore, useValue: { - appListStrings$: of(languageMockData.appListStrings).pipe(take(1)), - appStrings$: of(languageMockData.appStrings).pipe(take(1)) - } - }, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }).compileComponents(); + declarations: [ + PaginationTestHostComponent, + PaginationComponent, + ], + imports: [ImageModule, + AngularSvgIconModule.forRoot()], + providers: [ + { + provide: LanguageStore, useValue: { + appListStrings$: of(languageMockData.appListStrings).pipe(take(1)), + appStrings$: of(languageMockData.appStrings).pipe(take(1)) + } + }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}).compileComponents(); testHostFixture = TestBed.createComponent(PaginationTestHostComponent); testHostComponent = testHostFixture.componentInstance; diff --git a/core/app/core/src/lib/components/pagination/pagination.component.ts b/core/app/core/src/lib/components/pagination/pagination.component.ts index 63f4419c5..95ba9053c 100644 --- a/core/app/core/src/lib/components/pagination/pagination.component.ts +++ b/core/app/core/src/lib/components/pagination/pagination.component.ts @@ -27,7 +27,8 @@ import {Component, Input, OnInit} from '@angular/core'; import {combineLatestWith, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; -import {PageSelection, PaginationCount, PaginationDataSource} from 'common'; +import {PaginationDataSource} from '../../common/components/pagination/pagination.model'; +import {PageSelection, PaginationCount} from '../../common/views/list/list-navigation.model'; import {LanguageStore, LanguageStringMap} from '../../store/language/language.store'; export interface PaginationViewModel { diff --git a/core/app/core/src/lib/components/panel-logic/display-type/panel-logic-display-type-action.service.ts b/core/app/core/src/lib/components/panel-logic/display-type/panel-logic-display-type-action.service.ts index 48acf7bd4..b67a2d83d 100644 --- a/core/app/core/src/lib/components/panel-logic/display-type/panel-logic-display-type-action.service.ts +++ b/core/app/core/src/lib/components/panel-logic/display-type/panel-logic-display-type-action.service.ts @@ -26,7 +26,13 @@ import {Injectable} from '@angular/core'; import {PanelLogicActionData, PanelLogicActionHandler} from '../panel-logic.action'; -import {Action, Field, isVoid, Record, StringArrayMap, StringArrayMatrix, ViewMode} from 'common'; +import {isVoid} from '../../../common/utils/value-utils'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {Field} from '../../../common/record/field.model'; +import {Action} from '../../../common/actions/action.model'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; import {isEmpty} from 'lodash-es'; @Injectable({ diff --git a/core/app/core/src/lib/components/panel-logic/panel-logic.action.ts b/core/app/core/src/lib/components/panel-logic/panel-logic.action.ts index 49fefe96e..ebb032622 100644 --- a/core/app/core/src/lib/components/panel-logic/panel-logic.action.ts +++ b/core/app/core/src/lib/components/panel-logic/panel-logic.action.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Field, Panel, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {Panel} from '../../common/metadata/metadata.model'; export interface PanelLogicActionData extends ActionData { field: Field, diff --git a/core/app/core/src/lib/components/panel-logic/panel-logic.manager.ts b/core/app/core/src/lib/components/panel-logic/panel-logic.manager.ts index d79d38691..092a8cb4c 100644 --- a/core/app/core/src/lib/components/panel-logic/panel-logic.manager.ts +++ b/core/app/core/src/lib/components/panel-logic/panel-logic.manager.ts @@ -27,7 +27,11 @@ import {Injectable} from '@angular/core'; import {BaseActionManager} from '../../services/actions/base-action-manager.service'; import {PanelLogicActionData} from './panel-logic.action'; -import {Action, ActionContext, Field, Record, ViewMode, Panel} from 'common'; +import {Action, ActionContext} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Panel} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; import {PanelLogicDisplayTypeAction} from './display-type/panel-logic-display-type-action.service'; @Injectable({ diff --git a/core/app/core/src/lib/components/panel/panel.component.spec.ts b/core/app/core/src/lib/components/panel/panel.component.spec.ts index b4399dc0a..aca33d64a 100644 --- a/core/app/core/src/lib/components/panel/panel.component.spec.ts +++ b/core/app/core/src/lib/components/panel/panel.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {PanelComponent} from './panel.component'; import {By} from '@angular/platform-browser'; -import {DropdownButtonInterface} from 'common'; +import {DropdownButtonInterface} from '../../common/components/button/dropdown-button.model'; import {DropdownButtonModule} from '../dropdown-button/dropdown-button.module'; import {ButtonModule} from '../button/button.module'; import {ListViewStore} from '../../views/list/store/list-view/list-view.store'; diff --git a/core/app/core/src/lib/components/panel/panel.component.ts b/core/app/core/src/lib/components/panel/panel.component.ts index 64e3905e5..6ca9c5b5d 100644 --- a/core/app/core/src/lib/components/panel/panel.component.ts +++ b/core/app/core/src/lib/components/panel/panel.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {Button, ButtonInterface} from 'common'; +import {Button, ButtonInterface} from '../../common/components/button/button.model'; import {Observable, Subscription} from 'rxjs'; import {MinimiseButtonStatus} from '../minimise-button/minimise-button.component'; diff --git a/core/app/core/src/lib/components/popups/components/popup-button/popup-button.component.ts b/core/app/core/src/lib/components/popups/components/popup-button/popup-button.component.ts index b949cbdfa..916162334 100644 --- a/core/app/core/src/lib/components/popups/components/popup-button/popup-button.component.ts +++ b/core/app/core/src/lib/components/popups/components/popup-button/popup-button.component.ts @@ -25,8 +25,7 @@ */ import {Component, Input, OnInit, signal} from '@angular/core'; -import {ButtonInterface} from "common"; - +import {ButtonInterface} from '../../../../common/components/button/button.model'; @Component({ selector: 'scrm-popup-button', templateUrl: 'popup-button.component.html', diff --git a/core/app/core/src/lib/components/popups/components/record-details-popup-button/record-details-popup-button.component.ts b/core/app/core/src/lib/components/popups/components/record-details-popup-button/record-details-popup-button.component.ts index 41338acbb..156b37916 100644 --- a/core/app/core/src/lib/components/popups/components/record-details-popup-button/record-details-popup-button.component.ts +++ b/core/app/core/src/lib/components/popups/components/record-details-popup-button/record-details-popup-button.component.ts @@ -25,11 +25,9 @@ */ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; -import { - ColumnDefinition, - Field, - Record -} from 'common'; +import {ColumnDefinition} from '../../../../common/metadata/list.metadata.model'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; import {FieldManager} from "../../../../services/record/field/field.manager"; @Component({ diff --git a/core/app/core/src/lib/components/record-content/record-content.component.spec.ts b/core/app/core/src/lib/components/record-content/record-content.component.spec.ts index e42a952a0..4f22210c3 100644 --- a/core/app/core/src/lib/components/record-content/record-content.component.spec.ts +++ b/core/app/core/src/lib/components/record-content/record-content.component.spec.ts @@ -29,7 +29,8 @@ import {RecordContentComponent} from './record-content.component'; import {BehaviorSubject, Observable} from 'rxjs'; import {Component} from '@angular/core'; import {NgbDropdownModule, NgbModule, NgbNavModule} from '@ng-bootstrap/ng-bootstrap'; -import {Panel, Record} from 'common'; +import {Panel, TabDefinitions} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; import {DropdownButtonModule} from '../dropdown-button/dropdown-button.module'; import {ButtonModule} from '../button/button.module'; import {CloseButtonModule} from '../close-button/close-button.module'; @@ -37,7 +38,7 @@ import {PanelModule} from '../panel/panel.module'; import {LanguageStore} from '../../store/language/language.store'; import {RecordContentConfig, RecordContentDataSource} from './record-content.model'; import {metadataStoreMock} from '../../store/metadata/metadata.store.spec.mock'; -import {MetadataStore, TabDefinitions} from '../../store/metadata/metadata.store.service'; +import {MetadataStore} from '../../store/metadata/metadata.store.service'; import {themeImagesStoreMock} from '../../store/theme-images/theme-images.store.spec.mock'; import {MinimiseButtonModule} from '../minimise-button/minimise-button.module'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; diff --git a/core/app/core/src/lib/components/record-content/record-content.component.ts b/core/app/core/src/lib/components/record-content/record-content.component.ts index bdcd5a40f..9c7db100b 100644 --- a/core/app/core/src/lib/components/record-content/record-content.component.ts +++ b/core/app/core/src/lib/components/record-content/record-content.component.ts @@ -26,7 +26,10 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {Observable, of, Subscription} from 'rxjs'; -import {FieldMap, Panel, Record, isTrue} from 'common'; +import {FieldMap} from '../../common/record/field.model'; +import {Panel} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; +import {isTrue} from '../../common/utils/value-utils'; import {map, shareReplay} from 'rxjs/operators'; import {RecordContentConfig, RecordContentDataSource} from './record-content.model'; import {FieldLayoutConfig, FieldLayoutDataSource} from '../field-layout/field-layout.model'; diff --git a/core/app/core/src/lib/components/record-content/record-content.model.ts b/core/app/core/src/lib/components/record-content/record-content.model.ts index d449c7782..9303920b9 100644 --- a/core/app/core/src/lib/components/record-content/record-content.model.ts +++ b/core/app/core/src/lib/components/record-content/record-content.model.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Panel, Record, ViewMode, TabDefinitions} from 'common'; +import {Panel, TabDefinitions} from '../../common/metadata/metadata.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; import {Observable} from 'rxjs'; export interface RecordContentDataSource { diff --git a/core/app/core/src/lib/components/record-flexbox/record-flexbox.component.ts b/core/app/core/src/lib/components/record-flexbox/record-flexbox.component.ts index e8f5be47e..6a618d8ba 100644 --- a/core/app/core/src/lib/components/record-flexbox/record-flexbox.component.ts +++ b/core/app/core/src/lib/components/record-flexbox/record-flexbox.component.ts @@ -28,16 +28,16 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import { ContentAlign, ContentJustify, - Field, - isTrue, - Record, - ScreenSizeMap, StatisticWidgetLayoutRow, TextColor, TextSizes, - ViewFieldDefinition, - ViewMode -} from 'common'; +} from '../../common/metadata/widget.metadata'; +import {Record} from '../../common/record/record.model'; +import {Field} from '../../common/record/field.model'; +import {ScreenSizeMap} from '../../common/services/ui/resize.model'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; +import {ViewMode} from '../../common/views/view.model'; +import {isTrue} from '../../common/utils/value-utils'; import {Subscription} from 'rxjs'; import {FieldFlexbox, FieldFlexboxCol, RecordFlexboxConfig} from './record-flexbox.model'; import {LabelDisplay} from '../field-grid/field-grid.model'; diff --git a/core/app/core/src/lib/components/record-flexbox/record-flexbox.model.ts b/core/app/core/src/lib/components/record-flexbox/record-flexbox.model.ts index eb6a8c5a5..f7c28bb81 100644 --- a/core/app/core/src/lib/components/record-flexbox/record-flexbox.model.ts +++ b/core/app/core/src/lib/components/record-flexbox/record-flexbox.model.ts @@ -25,15 +25,15 @@ */ import { - ActionDataSource, ContentAlign, ContentJustify, - Record, TextColor, - TextSizes, - ViewFieldDefinition, - ViewMode -} from 'common'; + TextSizes +} from '../../common/metadata/widget.metadata'; +import {ActionDataSource} from '../../common/actions/action.model'; +import {Record} from '../../common/record/record.model'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; +import {ViewMode} from '../../common/views/view.model'; import {Observable} from 'rxjs'; import {LabelDisplay} from '../field-grid/field-grid.model'; diff --git a/core/app/core/src/lib/components/record-grid/record-grid.component.ts b/core/app/core/src/lib/components/record-grid/record-grid.component.ts index 5b0791589..d915e175a 100644 --- a/core/app/core/src/lib/components/record-grid/record-grid.component.ts +++ b/core/app/core/src/lib/components/record-grid/record-grid.component.ts @@ -25,7 +25,10 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {Field, Record, ScreenSizeMap, ViewMode} from 'common'; +import {Record} from '../../common/record/record.model'; +import {Field} from '../../common/record/field.model'; +import {ScreenSizeMap} from '../../common/services/ui/resize.model'; +import {ViewMode} from '../../common/views/view.model'; import {combineLatestWith, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; import {RecordGridConfig, RecordGridViewModel} from './record-grid.model'; diff --git a/core/app/core/src/lib/components/record-grid/record-grid.model.ts b/core/app/core/src/lib/components/record-grid/record-grid.model.ts index c68d35dd3..4ad857584 100644 --- a/core/app/core/src/lib/components/record-grid/record-grid.model.ts +++ b/core/app/core/src/lib/components/record-grid/record-grid.model.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionDataSource, Record, ScreenSizeMap, ViewMode} from 'common'; +import {ActionDataSource} from '../../common/actions/action.model'; +import {Record} from '../../common/record/record.model'; +import {ScreenSizeMap} from '../../common/services/ui/resize.model'; +import {ViewMode} from '../../common/views/view.model'; import {Observable} from 'rxjs'; import {LabelDisplay} from '../field-grid/field-grid.model'; diff --git a/core/app/core/src/lib/components/sidebar/mobile-menu/mobile-menu.component.ts b/core/app/core/src/lib/components/sidebar/mobile-menu/mobile-menu.component.ts index 6b48d0973..0747213a5 100644 --- a/core/app/core/src/lib/components/sidebar/mobile-menu/mobile-menu.component.ts +++ b/core/app/core/src/lib/components/sidebar/mobile-menu/mobile-menu.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input, OnInit, signal, WritableSignal} from '@angular/core'; -import {MenuItem} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; import {Router, RouterModule} from "@angular/router"; import {CommonModule} from "@angular/common"; import {SearchBarModule} from "../../search-bar/search-bar.module"; diff --git a/core/app/core/src/lib/components/sidebar/sidebar.component.ts b/core/app/core/src/lib/components/sidebar/sidebar.component.ts index 4259fbab4..ac54d7498 100644 --- a/core/app/core/src/lib/components/sidebar/sidebar.component.ts +++ b/core/app/core/src/lib/components/sidebar/sidebar.component.ts @@ -28,7 +28,7 @@ import {Component, OnDestroy, OnInit, signal, ViewChild, WritableSignal} from '@ import {AppStateStore} from "../../store/app-state/app-state.store"; import {combineLatestWith, Subscription} from "rxjs"; import {NavbarModuleMap, Navigation, NavigationStore} from "../../store/navigation/navigation.store"; -import {MenuItem} from "common"; +import {MenuItem} from '../../common/menu/menu.model'; import {ModuleNameMapper} from "../../services/navigation/module-name-mapper/module-name-mapper.service"; import {ModuleNavigation} from "../../services/navigation/module-navigation/module-navigation.service"; import {LanguageListStringMap, LanguageStore, LanguageStrings} from "../../store/language/language.store"; diff --git a/core/app/core/src/lib/components/sort-button/sort-button.component.spec.ts b/core/app/core/src/lib/components/sort-button/sort-button.component.spec.ts index 69a890977..249878df1 100644 --- a/core/app/core/src/lib/components/sort-button/sort-button.component.spec.ts +++ b/core/app/core/src/lib/components/sort-button/sort-button.component.spec.ts @@ -30,14 +30,15 @@ import {SortButtonComponent} from './sort-button.component'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {Component} from '@angular/core'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {By} from '@angular/platform-browser'; -import {SortDirection} from 'common'; +import {SortDirection} from '../../common/views/list/list-navigation.model'; import {take} from 'rxjs/operators'; import {themeImagesMockData} from '../../store/theme-images/theme-images.store.spec.mock'; import {ImageModule} from '../image/image.module'; import {ThemeImagesStore} from '../../store/theme-images/theme-images.store'; import {SortDirectionDataSource} from './sort-button.model'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const sortDirectionSubject = new BehaviorSubject(SortDirection.NONE); let lastDirection = SortDirection.NONE; @@ -63,23 +64,22 @@ describe('SortButtonComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - SortButtonTestHostComponent, - SortButtonComponent, - ], - imports: [ - ImageModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - ], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - } - ], - }).compileComponents(); + declarations: [ + SortButtonTestHostComponent, + SortButtonComponent, + ], + imports: [ImageModule, + AngularSvgIconModule.forRoot()], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting() + ] +}).compileComponents(); testHostFixture = TestBed.createComponent(SortButtonTestHostComponent); testHostComponent = testHostFixture.componentInstance; diff --git a/core/app/core/src/lib/components/sort-button/sort-button.component.ts b/core/app/core/src/lib/components/sort-button/sort-button.component.ts index 190f79ea0..001aadcd6 100644 --- a/core/app/core/src/lib/components/sort-button/sort-button.component.ts +++ b/core/app/core/src/lib/components/sort-button/sort-button.component.ts @@ -25,7 +25,7 @@ */ import {Component, Input} from '@angular/core'; -import {SortDirection} from 'common'; +import {SortDirection} from '../../common/views/list/list-navigation.model'; import {Observable} from 'rxjs'; import {SortDirectionDataSource} from './sort-button.model'; diff --git a/core/app/core/src/lib/components/sort-button/sort-button.model.ts b/core/app/core/src/lib/components/sort-button/sort-button.model.ts index efabb0ddb..e3b106bc6 100644 --- a/core/app/core/src/lib/components/sort-button/sort-button.model.ts +++ b/core/app/core/src/lib/components/sort-button/sort-button.model.ts @@ -25,7 +25,7 @@ */ import {Observable} from 'rxjs'; -import {SortDirection} from 'common'; +import {SortDirection} from '../../common/views/list/list-navigation.model'; export interface SortDirectionDataSource { getSortDirection(): Observable; diff --git a/core/app/core/src/lib/components/status-bar/status-bar.component.spec.ts b/core/app/core/src/lib/components/status-bar/status-bar.component.spec.ts index dd8bc0ed9..f7666b2c1 100644 --- a/core/app/core/src/lib/components/status-bar/status-bar.component.spec.ts +++ b/core/app/core/src/lib/components/status-bar/status-bar.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {StatusBarComponent} from './status-bar.component'; import {RouterTestingModule} from '@angular/router/testing'; @@ -35,6 +35,7 @@ import {RecordViewStore} from '../../views/record/store/record-view/record-view. import {ActionMenuModule} from '../../views/list/components/action-menu/action-menu.module'; import {ImageModule} from '../image/image.module'; import {SettingsMenuModule} from '../../views/list/components/settings-menu/settings-menu.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'status-bar-test-host-component', @@ -49,20 +50,19 @@ describe('StatusBarComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ActionMenuModule, - ButtonModule, - SettingsMenuModule, - ApolloTestingModule, - HttpClientTestingModule, - ImageModule, - RouterTestingModule - ], - declarations: [StatusBarComponent, StatusBarTestHostComponent], - providers: [ - {provide: RecordViewStore}, - ], - }) + declarations: [StatusBarComponent, StatusBarTestHostComponent], + imports: [ActionMenuModule, + ButtonModule, + SettingsMenuModule, + ApolloTestingModule, + ImageModule, + RouterTestingModule], + providers: [ + { provide: RecordViewStore }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); }); diff --git a/core/app/core/src/lib/components/table/adapters/base-line-actions.adapter.ts b/core/app/core/src/lib/components/table/adapters/base-line-actions.adapter.ts index 5cf2f716d..87b174838 100644 --- a/core/app/core/src/lib/components/table/adapters/base-line-actions.adapter.ts +++ b/core/app/core/src/lib/components/table/adapters/base-line-actions.adapter.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; import {AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {MessageService} from '../../../services/message/message.service'; import {LineActionActionManager} from '../line-actions/line-action-manager.service'; diff --git a/core/app/core/src/lib/components/table/line-actions/async-process/async-process.action.ts b/core/app/core/src/lib/components/table/line-actions/async-process/async-process.action.ts index 193f6557f..be3a5d7d6 100644 --- a/core/app/core/src/lib/components/table/line-actions/async-process/async-process.action.ts +++ b/core/app/core/src/lib/components/table/line-actions/async-process/async-process.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../common/views/view.model'; import {LineActionActionHandler, LineActionData} from '../line.action'; @Injectable({ diff --git a/core/app/core/src/lib/components/table/line-actions/create-related/create-related.action.ts b/core/app/core/src/lib/components/table/line-actions/create-related/create-related.action.ts index 58ce0faa3..4419fadef 100644 --- a/core/app/core/src/lib/components/table/line-actions/create-related/create-related.action.ts +++ b/core/app/core/src/lib/components/table/line-actions/create-related/create-related.action.ts @@ -26,7 +26,8 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; -import {Action, ViewMode} from 'common'; +import {Action} from '../../../../common/actions/action.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {LineActionActionHandler, LineActionData} from '../line.action'; diff --git a/core/app/core/src/lib/components/table/line-actions/line.action.ts b/core/app/core/src/lib/components/table/line-actions/line.action.ts index 4265ff450..d369937d5 100644 --- a/core/app/core/src/lib/components/table/line-actions/line.action.ts +++ b/core/app/core/src/lib/components/table/line-actions/line.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionData, ActionHandler, Record} from 'common'; +import {ActionData, ActionHandler} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; export interface LineActionData extends ActionData { record: Record; diff --git a/core/app/core/src/lib/components/table/table-body/table-body.component.ts b/core/app/core/src/lib/components/table/table-body/table-body.component.ts index bbe86c612..9f8ff80fa 100644 --- a/core/app/core/src/lib/components/table/table-body/table-body.component.ts +++ b/core/app/core/src/lib/components/table/table-body/table-body.component.ts @@ -27,16 +27,11 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {combineLatestWith, BehaviorSubject, Observable, of, Subscription} from 'rxjs'; import {map, shareReplay} from 'rxjs/operators'; -import { - ColumnDefinition, - Field, - Record, - RecordSelection, - SelectionStatus, - SortDirection, - SortingSelection, - ActiveLineAction -} from 'common'; +import {ColumnDefinition} from '../../../common/metadata/list.metadata.model'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {RecordSelection, SelectionStatus} from '../../../common/views/list/record-selection.model'; +import {SortDirection, SortingSelection} from '../../../common/views/list/list-navigation.model'; import {FieldManager} from '../../../services/record/field/field.manager'; import {TableConfig} from '../table.model'; import {SortDirectionDataSource} from '../../sort-button/sort-button.model'; diff --git a/core/app/core/src/lib/components/table/table-footer/table-footer.component.spec.ts b/core/app/core/src/lib/components/table/table-footer/table-footer.component.spec.ts index b974859a8..870fd6e18 100644 --- a/core/app/core/src/lib/components/table/table-footer/table-footer.component.spec.ts +++ b/core/app/core/src/lib/components/table/table-footer/table-footer.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {TableFooterComponent} from './table-footer.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -41,6 +41,7 @@ import {PaginationModule} from '../../pagination/pagination.module'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; import {listviewStoreMock} from '../../../views/list/store/list-view/list-view.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('TablefooterUiComponent', () => { let component: TableFooterComponent; @@ -48,27 +49,26 @@ describe('TablefooterUiComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - PaginationModule, - BulkActionMenuModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - ApolloTestingModule, - ImageModule - ], - declarations: [TableFooterComponent], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - {provide: LanguageStore, useValue: languageStoreMock}, - { - provide: ListViewStore, useValue: listviewStoreMock - }, - ], - }) + declarations: [TableFooterComponent], + imports: [PaginationModule, + BulkActionMenuModule, + AngularSvgIconModule.forRoot(), + ApolloTestingModule, + ImageModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { provide: LanguageStore, useValue: languageStoreMock }, + { + provide: ListViewStore, useValue: listviewStoreMock + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/components/table/table-footer/table-footer.component.ts b/core/app/core/src/lib/components/table/table-footer/table-footer.component.ts index a2f83ee99..9318ada00 100644 --- a/core/app/core/src/lib/components/table/table-footer/table-footer.component.ts +++ b/core/app/core/src/lib/components/table/table-footer/table-footer.component.ts @@ -25,7 +25,10 @@ */ import {Component, Input} from '@angular/core'; -import {ActionDataSource, ButtonInterface, PaginationDataSource, SelectionDataSource} from 'common'; +import {ActionDataSource} from '../../../common/actions/action.model'; +import {ButtonInterface} from '../../../common/components/button/button.model'; +import {PaginationDataSource} from '../../../common/components/pagination/pagination.model'; +import {SelectionDataSource} from '../../../common/views/list/selection.model'; import {BulkActionDataSource} from '../../bulk-action-menu/bulk-action-menu.component'; import {TableConfig} from "../table.model"; diff --git a/core/app/core/src/lib/components/table/table-header/table-header.component.spec.ts b/core/app/core/src/lib/components/table/table-header/table-header.component.spec.ts index aeb8abded..4fe962f61 100644 --- a/core/app/core/src/lib/components/table/table-header/table-header.component.spec.ts +++ b/core/app/core/src/lib/components/table/table-header/table-header.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {TableHeaderComponent} from './table-header.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -41,6 +41,7 @@ import {PaginationModule} from '../../pagination/pagination.module'; import {ImageModule} from '../../image/image.module'; import {ThemeImagesStore} from '../../../store/theme-images/theme-images.store'; import {listviewStoreMock} from '../../../views/list/store/list-view/list-view.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('TableheaderUiComponent', () => { let component: TableHeaderComponent; @@ -48,27 +49,26 @@ describe('TableheaderUiComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - PaginationModule, - BulkActionMenuModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - ApolloTestingModule, - ImageModule - ], - declarations: [TableHeaderComponent], - providers: [ - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - {provide: LanguageStore, useValue: languageStoreMock}, - { - provide: ListViewStore, useValue: listviewStoreMock - }, - ], - }) + declarations: [TableHeaderComponent], + imports: [PaginationModule, + BulkActionMenuModule, + AngularSvgIconModule.forRoot(), + ApolloTestingModule, + ImageModule], + providers: [ + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { provide: LanguageStore, useValue: languageStoreMock }, + { + provide: ListViewStore, useValue: listviewStoreMock + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/components/table/table-header/table-header.component.ts b/core/app/core/src/lib/components/table/table-header/table-header.component.ts index ae3fd2485..492aef40a 100644 --- a/core/app/core/src/lib/components/table/table-header/table-header.component.ts +++ b/core/app/core/src/lib/components/table/table-header/table-header.component.ts @@ -25,7 +25,9 @@ */ import {Component, Input} from '@angular/core'; -import {ActionDataSource, PaginationDataSource, SelectionDataSource} from 'common'; +import {ActionDataSource} from '../../../common/actions/action.model'; +import {PaginationDataSource} from '../../../common/components/pagination/pagination.model'; +import {SelectionDataSource} from '../../../common/views/list/selection.model'; import {BulkActionDataSource} from '../../bulk-action-menu/bulk-action-menu.component'; @Component({ diff --git a/core/app/core/src/lib/components/table/table.component.spec.mock.ts b/core/app/core/src/lib/components/table/table.component.spec.mock.ts index 8fcf5243b..74bdf1f43 100644 --- a/core/app/core/src/lib/components/table/table.component.spec.mock.ts +++ b/core/app/core/src/lib/components/table/table.component.spec.mock.ts @@ -26,19 +26,13 @@ import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; -import { - BulkAction, - BulkActionsMap, - ColumnDefinition, - PaginationCount, - PaginationDataSource, - Record, - RecordSelection, - SelectionDataSource, - SelectionStatus, - SortDirection, - SortingSelection -} from 'common'; +import {BulkAction, BulkActionsMap} from '../../common/actions/bulk-action.model'; +import {ColumnDefinition} from '../../common/metadata/list.metadata.model'; +import {PaginationDataSource} from '../../common/components/pagination/pagination.model'; +import {PaginationCount, SortDirection, SortingSelection} from '../../common/views/list/list-navigation.model'; +import {Record} from '../../common/record/record.model'; +import {RecordSelection, SelectionStatus} from '../../common/views/list/record-selection.model'; +import {SelectionDataSource} from '../../common/views/list/selection.model'; import {DataSource} from '@angular/cdk/collections'; import {BulkActionDataSource} from '../bulk-action-menu/bulk-action-menu.component'; import {TableConfig} from './table.model'; diff --git a/core/app/core/src/lib/components/table/table.component.spec.ts b/core/app/core/src/lib/components/table/table.component.spec.ts index f53690271..5b04cb0e6 100644 --- a/core/app/core/src/lib/components/table/table.component.spec.ts +++ b/core/app/core/src/lib/components/table/table.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {TableComponent} from './table.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -48,6 +48,7 @@ import {TableHeaderModule} from './table-header/table-header.module'; import {languageStoreMock} from '../../store/language/language.store.spec.mock'; import {listviewStoreMock} from '../../views/list/store/list-view/list-view.store.spec.mock'; import {ThemeImagesStore} from '../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'table-test-host-component', @@ -63,35 +64,34 @@ describe('TableComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - TableHeaderModule, - TableBodyModule, - TableFooterModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - ApolloTestingModule, - ImageModule, - SortButtonModule, - RouterTestingModule - ], - declarations: [TableComponent], - providers: [ - { - provide: ListViewStore, useValue: listviewStoreMock - }, - { - provide: LanguageStore, useValue: languageStoreMock - }, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - { - provide: MetadataStore, useValue: metadataStoreMock - }, - ], - }) + declarations: [TableComponent], + imports: [TableHeaderModule, + TableBodyModule, + TableFooterModule, + AngularSvgIconModule.forRoot(), + ApolloTestingModule, + ImageModule, + SortButtonModule, + RouterTestingModule], + providers: [ + { + provide: ListViewStore, useValue: listviewStoreMock + }, + { + provide: LanguageStore, useValue: languageStoreMock + }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { + provide: MetadataStore, useValue: metadataStoreMock + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/components/table/table.model.ts b/core/app/core/src/lib/components/table/table.model.ts index 08b1c48ed..bee19f01f 100644 --- a/core/app/core/src/lib/components/table/table.model.ts +++ b/core/app/core/src/lib/components/table/table.model.ts @@ -26,17 +26,13 @@ import {Observable} from 'rxjs'; import {DataSource} from '@angular/cdk/collections'; -import { - ActionDataSource, - ColumnDefinition, - PaginationDataSource, - Record, - RecordSelection, - SelectionDataSource, - SelectionStatus, - SortDirection, - SortingSelection -} from 'common'; +import {ActionDataSource} from '../../common/actions/action.model'; +import {ColumnDefinition} from '../../common/metadata/list.metadata.model'; +import {PaginationDataSource} from '../../common/components/pagination/pagination.model'; +import {Record} from '../../common/record/record.model'; +import {RecordSelection, SelectionStatus} from '../../common/views/list/record-selection.model'; +import {SelectionDataSource} from '../../common/views/list/selection.model'; +import {SortDirection, SortingSelection} from '../../common/views/list/list-navigation.model'; import {BulkActionDataSource} from '../bulk-action-menu/bulk-action-menu.component'; export interface TableConfig { diff --git a/core/app/core/src/lib/components/widget-panel/widget-panel.component.spec.ts b/core/app/core/src/lib/components/widget-panel/widget-panel.component.spec.ts index f6b258527..25466c4b0 100644 --- a/core/app/core/src/lib/components/widget-panel/widget-panel.component.spec.ts +++ b/core/app/core/src/lib/components/widget-panel/widget-panel.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {WidgetPanelComponent} from './widget-panel.component'; import {AngularSvgIconModule} from 'angular-svg-icon'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {of} from 'rxjs'; @@ -39,6 +39,7 @@ import {themeImagesMockData} from '../../store/theme-images/theme-images.store.s import {ImageModule} from '../image/image.module'; import {listviewStoreMock} from '../../views/list/store/list-view/list-view.store.spec.mock'; import {ThemeImagesStore} from '../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('WidgetPanelComponent', () => { let component: WidgetPanelComponent; @@ -46,20 +47,19 @@ describe('WidgetPanelComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - AngularSvgIconModule.forRoot(), - ChartModule, - HttpClientTestingModule, - NoopAnimationsModule, - ApolloTestingModule, - ImageModule - ], - declarations: [WidgetPanelComponent], - providers: [ - {provide: ListViewStore, useValue: listviewStoreMock}, - {provide: ThemeImagesStore, useValue: {images$: of(themeImagesMockData).pipe(take(1))}}, - ], - }) + declarations: [WidgetPanelComponent], + imports: [AngularSvgIconModule.forRoot(), + ChartModule, + NoopAnimationsModule, + ApolloTestingModule, + ImageModule], + providers: [ + { provide: ListViewStore, useValue: listviewStoreMock }, + { provide: ThemeImagesStore, useValue: { images$: of(themeImagesMockData).pipe(take(1)) } }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/containers/favorite-toggle/components/favorite-toggle/favorite-toggle.component.ts b/core/app/core/src/lib/containers/favorite-toggle/components/favorite-toggle/favorite-toggle.component.ts index 4e10f2d27..ac68cc767 100644 --- a/core/app/core/src/lib/containers/favorite-toggle/components/favorite-toggle/favorite-toggle.component.ts +++ b/core/app/core/src/lib/containers/favorite-toggle/components/favorite-toggle/favorite-toggle.component.ts @@ -25,7 +25,8 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {ButtonInterface, Record} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {Record} from '../../../../common/record/record.model'; import {FavoritesService} from '../../../../services/navigation/favorites/favorites.service'; import {ImmediateDebounce} from '../../../../services/utils/immediate-debounce.service'; diff --git a/core/app/core/src/lib/containers/list-filter/actions/delete/saved-filter-delete.action.ts b/core/app/core/src/lib/containers/list-filter/actions/delete/saved-filter-delete.action.ts index 887485bab..7b4c08674 100644 --- a/core/app/core/src/lib/containers/list-filter/actions/delete/saved-filter-delete.action.ts +++ b/core/app/core/src/lib/containers/list-filter/actions/delete/saved-filter-delete.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {MessageService} from '../../../../services/message/message.service'; import {SavedFilterActionData, SavedFilterActionHandler} from '../saved-filter.action'; diff --git a/core/app/core/src/lib/containers/list-filter/actions/save/saved-filter-save.action.ts b/core/app/core/src/lib/containers/list-filter/actions/save/saved-filter-save.action.ts index 04bebd3eb..43587bc81 100644 --- a/core/app/core/src/lib/containers/list-filter/actions/save/saved-filter-save.action.ts +++ b/core/app/core/src/lib/containers/list-filter/actions/save/saved-filter-save.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {MessageService} from '../../../../services/message/message.service'; import {SavedFilterActionData, SavedFilterActionHandler} from '../saved-filter.action'; diff --git a/core/app/core/src/lib/containers/list-filter/actions/saved-filter.action.ts b/core/app/core/src/lib/containers/list-filter/actions/saved-filter.action.ts index e52f6676c..4a506c9b6 100644 --- a/core/app/core/src/lib/containers/list-filter/actions/saved-filter.action.ts +++ b/core/app/core/src/lib/containers/list-filter/actions/saved-filter.action.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionData, ActionHandler} from 'common'; +import {ActionData, ActionHandler} from '../../../common/actions/action.model'; import {SavedFilterStore} from '../store/saved-filter/saved-filter.store'; import {ListFilterStore} from '../store/list-filter/list-filter.store'; diff --git a/core/app/core/src/lib/containers/list-filter/adapters/actions.adapter.ts b/core/app/core/src/lib/containers/list-filter/adapters/actions.adapter.ts index b16d4e4c8..eb03fc555 100644 --- a/core/app/core/src/lib/containers/list-filter/adapters/actions.adapter.ts +++ b/core/app/core/src/lib/containers/list-filter/adapters/actions.adapter.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable} from 'rxjs'; import {map, take} from 'rxjs/operators'; import {AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.spec.ts b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.spec.ts index dbeda52ea..483f49df7 100644 --- a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.spec.ts +++ b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.spec.ts @@ -29,7 +29,7 @@ import {By} from '@angular/platform-browser'; import {RouterTestingModule} from '@angular/router/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {SearchMetaFieldMap} from 'common'; +import {SearchMetaFieldMap} from '../../../../common/metadata/list.metadata.model'; import {map} from 'rxjs/operators'; import {DropdownButtonModule} from '../../../../components/dropdown-button/dropdown-button.module'; import {ButtonModule} from '../../../../components/button/button.module'; diff --git a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.ts b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.ts index 4cf1f0070..d27f265f3 100644 --- a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.ts +++ b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.component.ts @@ -25,7 +25,9 @@ */ import {Component, HostListener, Input, OnDestroy, OnInit} from '@angular/core'; -import {ButtonInterface, Record, ScreenSizeMap} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {Record} from '../../../../common/record/record.model'; +import {ScreenSizeMap} from '../../../../common/services/ui/resize.model'; import {Observable, of, Subscription} from 'rxjs'; import {map, shareReplay} from 'rxjs/operators'; import {FilterConfig} from './list-filter.model'; diff --git a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.model.ts b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.model.ts index e702f5d5e..ca953e3b8 100644 --- a/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.model.ts +++ b/core/app/core/src/lib/containers/list-filter/components/list-filter/list-filter.model.ts @@ -25,7 +25,7 @@ */ import {Observable} from 'rxjs'; -import {ColumnDefinition, SearchMetaFieldMap} from 'common'; +import {ColumnDefinition, SearchMetaFieldMap} from '../../../../common/metadata/list.metadata.model'; import {SavedFilter} from '../../../../store/saved-filters/saved-filter.model'; export interface FilterConfig { diff --git a/core/app/core/src/lib/containers/list-filter/store/list-filter/list-filter.store.ts b/core/app/core/src/lib/containers/list-filter/store/list-filter/list-filter.store.ts index 69c52fa81..5a05082a0 100644 --- a/core/app/core/src/lib/containers/list-filter/store/list-filter/list-filter.store.ts +++ b/core/app/core/src/lib/containers/list-filter/store/list-filter/list-filter.store.ts @@ -27,16 +27,14 @@ import {isEmpty} from 'lodash-es'; import {Injectable} from '@angular/core'; import {StateStore} from '../../../../store/state'; -import { - ButtonInterface, - DropdownButtonInterface, - emptyObject, - Field, - isVoid, - SearchMetaFieldMap, - ViewMode, - SearchCriteriaFieldFilter -} from 'common'; +import {emptyObject} from '../../../../common/utils/object-utils'; +import {isVoid} from '../../../../common/utils/value-utils'; +import {Field} from '../../../../common/record/field.model'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {DropdownButtonInterface} from '../../../../common/components/button/dropdown-button.model'; +import {SearchCriteriaFieldFilter} from '../../../../common/views/list/search-criteria.model'; +import {SearchMetaFieldMap} from '../../../../common/metadata/list.metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {map, take, tap} from 'rxjs/operators'; import {BehaviorSubject, combineLatestWith, Observable, Subscription} from 'rxjs'; import {FilterConfig} from '../../components/list-filter/list-filter.model'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/graphql/api.saved-filters.save.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/graphql/api.saved-filters.save.ts index 67520260e..bb9a394bd 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/graphql/api.saved-filters.save.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/graphql/api.saved-filters.save.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {Apollo} from 'apollo-angular'; -import {Record} from 'common'; +import {Record} from '../../../../../common/record/record.model'; import {ApolloQueryResult} from '@apollo/client/core'; import {RecordSaveGQL} from '../../../../../store/record/graphql/api.record.save'; import {SavedFilter} from '../../../../../store/saved-filters/saved-filter.model'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/record-mappers/saved-search.record-mapper.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/record-mappers/saved-search.record-mapper.ts index fa41de9fc..8090fe438 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/record-mappers/saved-search.record-mapper.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/record-mappers/saved-search.record-mapper.ts @@ -1,4 +1,32 @@ -import {deepClone, Record, RecordMapper} from 'common'; +/** + * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. + * Copyright (C) 2021 SalesAgility Ltd. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License version 3 as published by the + * Free Software Foundation with the addition of the following permission added + * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK + * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE + * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. + * + * This program 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 Affero General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * In accordance with Section 7(b) of the GNU Affero General Public License + * version 3, these Appropriate Legal Notices must retain the display of the + * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably + * feasible for technical reasons, the Appropriate Legal Notices must display + * the words "Supercharged by SuiteCRM". + */ + +import {deepClone} from '../../../../../common/utils/object-utils'; +import {Record} from '../../../../../common/record/record.model'; +import {RecordMapper} from '../../../../../common/record/record-mappers/record-mapper.model'; import {Injectable} from '@angular/core'; import {SavedFilter} from '../../../../../store/saved-filters/saved-filter.model'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.factory.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.factory.ts index 604074d02..febcbb6fd 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.factory.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.factory.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {RecordMapperRegistry, ViewFieldDefinition, ObjectMap} from 'common'; +import {RecordMapperRegistry} from '../../../../common/record/record-mappers/record-mapper.registry'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; import {SavedFilterRecordStore} from './saved-filter-record.store'; import {FieldManager} from '../../../../services/record/field/field.manager'; import {LanguageStore} from '../../../../store/language/language.store'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.ts index 8d6bd099e..1e7f903ad 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter-record.store.ts @@ -24,20 +24,13 @@ * the words "Supercharged by SuiteCRM". */ -import { - ColumnDefinition, - deepClone, - FieldMap, - FieldMetadata, - Option, - Record, - RecordMapperRegistry, - SearchCriteria, - SearchMetaField, - SearchMetaFieldMap, - ViewFieldDefinition, - ObjectMap -} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {ColumnDefinition, SearchMetaField, SearchMetaFieldMap} from '../../../../common/metadata/list.metadata.model'; +import {FieldMap, FieldMetadata, Option} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {RecordMapperRegistry} from '../../../../common/record/record-mappers/record-mapper.registry'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {shareReplay, tap} from 'rxjs/operators'; import {RecordStore} from '../../../../store/record/record.store'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.factory.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.factory.ts index 08b380008..58b5a46eb 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.factory.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.factory.ts @@ -33,7 +33,7 @@ import {RecordManager} from '../../../../services/record/record.manager'; import {SavedFilterStore} from './saved-filter.store'; import {MetadataStore} from '../../../../store/metadata/metadata.store.service'; import {SavedFilterSaveGQL} from './graphql/api.saved-filters.save'; -import {RecordMapperRegistry} from 'common'; +import {RecordMapperRegistry} from '../../../../common/record/record-mappers/record-mapper.registry'; import {BaseSaveRecordMapper} from '../../../../store/record/record-mappers/base-save.record-mapper'; import {SavedSearchRecordMapper} from './record-mappers/saved-search.record-mapper'; import {FieldManager} from '../../../../services/record/field/field.manager'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.model.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.model.ts index 6cd7f1ac7..0ade44afb 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.model.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {SavedFilter} from '../../../../store/saved-filters/saved-filter.model'; export interface FilterContainerData { diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.spec.mock.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.spec.mock.ts index 21251bd4e..6eb9dd53a 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.spec.mock.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.spec.mock.ts @@ -27,7 +27,9 @@ import {SaveFilterStoreFactory} from './saved-filter.store.factory'; import {messageServiceMock} from '../../../../services/message/message.service.spec.mock'; import {RecordFetchGQL} from '../../../../store/record/graphql/api.record.get'; -import {deepClone, Record, RecordMapperRegistry} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {Record} from '../../../../common/record/record.model'; +import {RecordMapperRegistry} from '../../../../common/record/record-mappers/record-mapper.registry'; import {BaseSaveRecordMapper} from '../../../../store/record/record-mappers/base-save.record-mapper'; import {SavedSearchRecordMapper} from './record-mappers/saved-search.record-mapper'; import {Observable, of} from 'rxjs'; diff --git a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.ts b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.ts index fd241146d..6d535ae68 100644 --- a/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.ts +++ b/core/app/core/src/lib/containers/list-filter/store/saved-filter/saved-filter.store.ts @@ -26,17 +26,13 @@ import {inject, Injectable} from '@angular/core'; import {BehaviorSubject, combineLatestWith, forkJoin, Observable, of, Subscription} from 'rxjs'; -import { - ColumnDefinition, - deepClone, - ObjectMap, - Record, - SearchCriteria, - SearchMetaFieldMap, - ViewContext, - ViewFieldDefinition, - ViewMode -} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; +import {ColumnDefinition, SearchMetaFieldMap} from '../../../../common/metadata/list.metadata.model'; +import {ViewContext} from '../../../../common/views/view.model'; +import {ViewMode} from '../../../../common/views/view.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; +import {deepClone} from '../../../../common/utils/object-utils'; import {catchError, distinctUntilChanged, filter, finalize, map, startWith, take, tap} from 'rxjs/operators'; import {StateStore} from '../../../../store/state'; import {MetadataStore, RecordViewMetadata} from '../../../../store/metadata/metadata.store.service'; diff --git a/core/app/core/src/lib/containers/notifications/notifications.component.ts b/core/app/core/src/lib/containers/notifications/notifications.component.ts index b893b537e..499627089 100644 --- a/core/app/core/src/lib/containers/notifications/notifications.component.ts +++ b/core/app/core/src/lib/containers/notifications/notifications.component.ts @@ -25,7 +25,8 @@ */ import {Component, OnInit} from '@angular/core'; -import {SearchCriteria} from 'common'; +import {SearchCriteria} from '../../common/views/list/search-criteria.model'; +import {deepClone} from '../../common/utils/object-utils'; import {of} from 'rxjs'; import {LanguageStore} from '../../store/language/language.store'; import {RecordThreadConfig} from '../record-thread/components/record-thread/record-thread.model'; diff --git a/core/app/core/src/lib/containers/record-list-modal/adapters/filter.adapter.ts b/core/app/core/src/lib/containers/record-list-modal/adapters/filter.adapter.ts index de19d7ca9..498838ede 100644 --- a/core/app/core/src/lib/containers/record-list-modal/adapters/filter.adapter.ts +++ b/core/app/core/src/lib/containers/record-list-modal/adapters/filter.adapter.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {SearchMeta, SearchMetaFieldMap} from 'common'; +import {SearchMeta, SearchMetaFieldMap} from '../../../common/metadata/list.metadata.model'; import {map} from 'rxjs/operators'; import {RecordListModalStore} from '../store/record-list-modal/record-list-modal.store'; import {RecordListModalFilterAdapterInterface} from './adapter.model'; diff --git a/core/app/core/src/lib/containers/record-list-modal/adapters/table.adapter.ts b/core/app/core/src/lib/containers/record-list-modal/adapters/table.adapter.ts index e8320b08d..addf96e80 100644 --- a/core/app/core/src/lib/containers/record-list-modal/adapters/table.adapter.ts +++ b/core/app/core/src/lib/containers/record-list-modal/adapters/table.adapter.ts @@ -25,7 +25,10 @@ */ import {of} from 'rxjs'; -import {ColumnDefinition, Field, Record, SortDirection} from 'common'; +import {ColumnDefinition} from '../../../common/metadata/list.metadata.model'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {SortDirection} from '../../../common/views/list/list-navigation.model'; import {map} from 'rxjs/operators'; import {RecordListModalTableAdapterInterface} from './adapter.model'; import {RecordListModalStore} from '../store/record-list-modal/record-list-modal.store'; diff --git a/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.component.ts b/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.component.ts index ebfe2ae7a..3489ad40e 100644 --- a/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.component.ts +++ b/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.component.ts @@ -27,7 +27,8 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; import {animate, transition, trigger} from '@angular/animations'; -import {ButtonInterface, ModalCloseFeedBack} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ModalCloseFeedBack} from '../../../../common/components/modal/modal.model'; import {Observable, of, Subscription} from 'rxjs'; import {distinctUntilChanged, skip} from 'rxjs/operators'; import {ModalRecordFilterAdapter} from '../../adapters/filter.adapter'; diff --git a/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.model.ts b/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.model.ts index b2a4c38cc..4964c7ff1 100644 --- a/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.model.ts +++ b/core/app/core/src/lib/containers/record-list-modal/components/record-list-modal/record-list-modal.model.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {RecordSelection} from 'common'; -import {Record} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {RecordSelection} from '../../../../common/views/list/record-selection.model'; export interface RecordListModalResult { [key: string]: any; diff --git a/core/app/core/src/lib/containers/record-list-modal/store/record-list-modal/record-list-modal.store.ts b/core/app/core/src/lib/containers/record-list-modal/store/record-list-modal/record-list-modal.store.ts index caa71b429..30d72268e 100644 --- a/core/app/core/src/lib/containers/record-list-modal/store/record-list-modal/record-list-modal.store.ts +++ b/core/app/core/src/lib/containers/record-list-modal/store/record-list-modal/record-list-modal.store.ts @@ -26,7 +26,10 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable} from 'rxjs'; -import {ColumnDefinition, emptyObject, RecordListMeta, RecordSelection, SearchMeta, SelectionStatus} from 'common'; +import {ColumnDefinition, SearchMeta, RecordListMeta} from '../../../../common/metadata/list.metadata.model'; +import {emptyObject} from '../../../../common/utils/object-utils'; +import {RecordSelection, SelectionStatus} from '../../../../common/views/list/record-selection.model'; + import {map, take, tap} from 'rxjs/operators'; import {RecordListStoreFactory} from '../../../../store/record-list/record-list.store.factory'; import {MetadataStore} from '../../../../store/metadata/metadata.store.service'; diff --git a/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.component.ts b/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.component.ts index e209db8fb..b44d4c1ef 100644 --- a/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.component.ts +++ b/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.component.ts @@ -25,7 +25,9 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {ButtonInterface, isVoid, ScreenSizeMap} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ScreenSizeMap} from '../../../../common/services/ui/resize.model'; +import {isVoid} from '../../../../common/utils/value-utils'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {RecordGridConfig} from '../../../../components/record-grid/record-grid.model'; diff --git a/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.model.ts b/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.model.ts index 0ecd1faf7..ae98e49f0 100644 --- a/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.model.ts +++ b/core/app/core/src/lib/containers/record-panel/components/record-panel/record-panel.model.ts @@ -27,7 +27,7 @@ import {BaseRecordActionsAdapter} from '../../../../services/actions/base-record-action.adapter'; import {RecordPanelStore} from '../../store/record-panel/record-panel.store'; import {RecordPanelMetadata} from '../../store/record-panel/record-panel.store.model'; -import {ActionData, ActionHandler} from 'common'; +import {ActionData, ActionHandler} from '../../../../common/actions/action.model'; export interface RecordPanelConfig { klass?: string; diff --git a/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.model.ts b/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.model.ts index 5d21c95b1..a1a382217 100644 --- a/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.model.ts +++ b/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.model.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ViewFieldDefinition, ViewMode} from 'common'; +import {Action} from '../../../../common/actions/action.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; export interface RecordPanelMetadata { title?: string; diff --git a/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.ts b/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.ts index 49e349942..77763d0d1 100644 --- a/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.ts +++ b/core/app/core/src/lib/containers/record-panel/store/record-panel/record-panel.store.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; -import {Record, ViewFieldDefinition, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {map} from 'rxjs/operators'; import {BaseRecordContainerStore} from '../../../../store/record-container/base-record-container.store'; import {RecordPanelMetadata} from './record-panel.store.model'; diff --git a/core/app/core/src/lib/containers/record-thread/actions/item-actions/async-process/async-process.service.ts b/core/app/core/src/lib/containers/record-thread/actions/item-actions/async-process/async-process.service.ts index a6b9ca9e3..2cf9bf408 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/item-actions/async-process/async-process.service.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/item-actions/async-process/async-process.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../../common/views/view.model'; import {RecordThreadItemActionData, RecordThreadItemActionHandler} from '../record-thread-item.action'; @Injectable({ diff --git a/core/app/core/src/lib/containers/record-thread/actions/item-actions/cancel/record-cancel.action.ts b/core/app/core/src/lib/containers/record-thread/actions/item-actions/cancel/record-cancel.action.ts index 55014ed81..2a947ff5b 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/item-actions/cancel/record-cancel.action.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/item-actions/cancel/record-cancel.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {ModalButtonInterface, ViewMode} from 'common'; +import {ModalButtonInterface} from '../../../../../common/components/modal/modal.model'; +import {ViewMode} from '../../../../../common/views/view.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {MessageModalComponent} from '../../../../../components/modal/components/message-modal/message-modal.component'; import {ModuleNavigation} from '../../../../../services/navigation/module-navigation/module-navigation.service'; diff --git a/core/app/core/src/lib/containers/record-thread/actions/item-actions/edit/record-edit.action.ts b/core/app/core/src/lib/containers/record-thread/actions/item-actions/edit/record-edit.action.ts index d156890c2..b2e2d7574 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/item-actions/edit/record-edit.action.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/item-actions/edit/record-edit.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../../common/views/view.model'; import {RecordThreadItemActionData, RecordThreadItemActionHandler} from '../record-thread-item.action'; @Injectable({ diff --git a/core/app/core/src/lib/containers/record-thread/actions/item-actions/record-thread-item.action.ts b/core/app/core/src/lib/containers/record-thread/actions/item-actions/record-thread-item.action.ts index 7c7ce75c6..931e72f32 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/item-actions/record-thread-item.action.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/item-actions/record-thread-item.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../../../common/actions/action.model'; +import {Record} from '../../../../common/record/record.model'; import {ModuleNavigation} from '../../../../services/navigation/module-navigation/module-navigation.service'; import {RecordThreadStore} from '../../store/record-thread/record-thread.store'; import {RecordThreadItemStore} from '../../store/record-thread/record-thread-item.store'; diff --git a/core/app/core/src/lib/containers/record-thread/actions/item-actions/save/record-save.action.ts b/core/app/core/src/lib/containers/record-thread/actions/item-actions/save/record-save.action.ts index ba06985c1..f89ab2e1b 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/item-actions/save/record-save.action.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/item-actions/save/record-save.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {MessageService} from '../../../../../services/message/message.service'; import {ModuleNavigation} from '../../../../../services/navigation/module-navigation/module-navigation.service'; diff --git a/core/app/core/src/lib/containers/record-thread/actions/list-actions/async-process/async-process.service.ts b/core/app/core/src/lib/containers/record-thread/actions/list-actions/async-process/async-process.service.ts index af7eeaad2..ee43af4a8 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/list-actions/async-process/async-process.service.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/list-actions/async-process/async-process.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../../common/views/view.model'; import {RecordThreadListActionData, RecordThreadListActionHandler} from "../record-thread-list.action"; @Injectable({ diff --git a/core/app/core/src/lib/containers/record-thread/actions/list-actions/record-thread-list.action.ts b/core/app/core/src/lib/containers/record-thread/actions/list-actions/record-thread-list.action.ts index 36a9c6ed5..9aeecf3ee 100644 --- a/core/app/core/src/lib/containers/record-thread/actions/list-actions/record-thread-list.action.ts +++ b/core/app/core/src/lib/containers/record-thread/actions/list-actions/record-thread-list.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../../../common/actions/action.model'; +import {Record} from '../../../../common/record/record.model'; import {ModuleNavigation} from '../../../../services/navigation/module-navigation/module-navigation.service'; import {RecordThreadStore} from '../../store/record-thread/record-thread.store'; diff --git a/core/app/core/src/lib/containers/record-thread/adapters/record-thread-item-actions.adapter.ts b/core/app/core/src/lib/containers/record-thread/adapters/record-thread-item-actions.adapter.ts index 04a9c56d1..b32bffd88 100644 --- a/core/app/core/src/lib/containers/record-thread/adapters/record-thread-item-actions.adapter.ts +++ b/core/app/core/src/lib/containers/record-thread/adapters/record-thread-item-actions.adapter.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, isTrue, ModeActions, ViewMode} from 'common'; +import {Action, ActionContext, ModeActions} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {isTrue} from '../../../common/utils/value-utils'; import {combineLatestWith, Observable} from 'rxjs'; import {map, take} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/containers/record-thread/adapters/record-thread-list-actions.adapter.ts b/core/app/core/src/lib/containers/record-thread/adapters/record-thread-list-actions.adapter.ts index 24a796e78..fae05c0ab 100644 --- a/core/app/core/src/lib/containers/record-thread/adapters/record-thread-list-actions.adapter.ts +++ b/core/app/core/src/lib/containers/record-thread/adapters/record-thread-list-actions.adapter.ts @@ -25,9 +25,11 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, isTrue, ModeActions, ViewMode} from 'common'; +import {isTrue} from '../../../common/utils/value-utils'; import {combineLatestWith, Observable, of} from 'rxjs'; import {map} from 'rxjs/operators'; +import {Action, ActionContext, ModeActions} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {LanguageStore} from '../../../store/language/language.store'; import {MessageService} from '../../../services/message/message.service'; diff --git a/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.component.ts b/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.component.ts index d4bda6f2e..cd1be55b1 100644 --- a/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.component.ts +++ b/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.component.ts @@ -29,7 +29,9 @@ import {RecordThreadItemConfig} from './record-thread-item.model'; import {of, Subscription} from 'rxjs'; import {FieldFlexbox, RecordFlexboxConfig} from '../../../../components/record-flexbox/record-flexbox.model'; import {debounceTime, shareReplay} from 'rxjs/operators'; -import {ButtonInterface, Record, StringMap} from 'common'; +import {StringMap} from '../../../../common/types/string-map'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {Record} from '../../../../common/record/record.model'; import {RecordThreadItemActionsAdapter} from '../../adapters/record-thread-item-actions.adapter'; import {RecordThreadItemActionsAdapterFactory} from '../../adapters/record-thread-item-actions.adapter.factory'; diff --git a/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.model.ts b/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.model.ts index 6cd027b6a..e92a373e4 100644 --- a/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.model.ts +++ b/core/app/core/src/lib/containers/record-thread/components/record-thread-item/record-thread-item.model.ts @@ -26,7 +26,7 @@ import {RecordThreadItemStore} from '../../store/record-thread/record-thread-item.store'; import {RecordThreadItemMetadata} from '../../store/record-thread/record-thread-item.store.model'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordThreadStore} from '../../store/record-thread/record-thread.store'; diff --git a/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.component.ts b/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.component.ts index dbee1a403..ee3999995 100644 --- a/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.component.ts +++ b/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.component.ts @@ -32,7 +32,10 @@ import {RecordThreadConfig} from './record-thread.model'; import {map, take, tap} from 'rxjs/operators'; import {RecordThreadItemConfig} from '../record-thread-item/record-thread-item.model'; import {RecordThreadItemStore} from '../../store/record-thread/record-thread-item.store'; -import {AttributeMap, ButtonInterface, isVoid, Record, ViewMode} from 'common'; +import {isVoid} from '../../../../common/utils/value-utils'; +import {Record, AttributeMap} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {RecordThreadItemStoreFactory} from '../../store/record-thread/record-thread-item.store.factory'; import {RecordManager} from '../../../../services/record/record.manager'; import {MessageService} from '../../../../services/message/message.service'; diff --git a/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.model.ts b/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.model.ts index a82ec7778..949eeb64d 100644 --- a/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.model.ts +++ b/core/app/core/src/lib/containers/record-thread/components/record-thread/record-thread.model.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, AttributeMap, FieldDefinitionMap, SearchCriteria} from 'common'; +import {Action} from '../../../../common/actions/action.model'; +import {AttributeMap} from '../../../../common/record/record.model'; +import {FieldDefinitionMap} from '../../../../common/record/field.model'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; import {RecordThreadItemConfig} from '../record-thread-item/record-thread-item.model'; import {Observable} from 'rxjs'; import {RecordThreadStore} from '../../store/record-thread/record-thread.store'; diff --git a/core/app/core/src/lib/containers/record-thread/store/record-thread/base-record-thread.store.ts b/core/app/core/src/lib/containers/record-thread/store/record-thread/base-record-thread.store.ts index ba0d31e40..969f347f0 100644 --- a/core/app/core/src/lib/containers/record-thread/store/record-thread/base-record-thread.store.ts +++ b/core/app/core/src/lib/containers/record-thread/store/record-thread/base-record-thread.store.ts @@ -30,7 +30,7 @@ import {StateStore} from '../../../../store/state'; import {BehaviorSubject, Observable, Subscription} from 'rxjs'; import {RecordList, RecordListStore} from '../../../../store/record-list/record-list.store'; import {RecordListStoreFactory} from '../../../../store/record-list/record-list.store.factory'; -import {Record} from 'common'; +import {Record} from '../../../../common/record/record.model'; import {map, take, tap} from 'rxjs/operators'; import {BaseRecordContainerStore} from '../../../../store/record-container/base-record-container.store'; import {BaseRecordItemStoreFactoryInterface} from './base-record-thread-thread.model'; diff --git a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.model.ts b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.model.ts index 9171a2ccb..24ad4e353 100644 --- a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.model.ts +++ b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.model.ts @@ -25,7 +25,8 @@ */ import {FieldFlexbox} from '../../../../components/record-flexbox/record-flexbox.model'; -import {Action, ViewFieldDefinitionMap} from 'common'; +import {Action} from '../../../../common/actions/action.model'; +import {ViewFieldDefinitionMap} from '../../../../common/metadata/metadata.model'; export interface RecordThreadItemMetadata { headerLayout?: FieldFlexbox; diff --git a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.ts b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.ts index a7aa1db94..21016a901 100644 --- a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.ts +++ b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-item.store.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; -import {Record, ViewFieldDefinition, ViewFieldDefinitionMap, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewFieldDefinition, ViewFieldDefinitionMap} from '../../../../common/metadata/metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {map} from 'rxjs/operators'; import {RecordThreadItemMetadata} from './record-thread-item.store.model'; import {BaseRecordContainerStore} from '../../../../store/record-container/base-record-container.store'; diff --git a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-list.store.model.ts b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-list.store.model.ts index 33f25748a..20ea8f27c 100644 --- a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-list.store.model.ts +++ b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread-list.store.model.ts @@ -24,8 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {FieldFlexbox} from '../../../../components/record-flexbox/record-flexbox.model'; -import {Action} from 'common'; +import {Action} from '../../../../common/actions/action.model'; export interface RecordThreadListMetadata { actions?: Action[]; diff --git a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread.store.ts b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread.store.ts index d9043bad1..8109ba2ad 100644 --- a/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread.store.ts +++ b/core/app/core/src/lib/containers/record-thread/store/record-thread/record-thread.store.ts @@ -29,7 +29,10 @@ import {Injectable} from '@angular/core'; import {RecordListStoreFactory} from '../../../../store/record-list/record-list.store.factory'; import {RecordStoreList} from './base-record-thread.store'; import {Observable, timer} from 'rxjs'; -import {ActionContext, Record, SearchCriteria, SortDirection} from 'common'; +import {ActionContext} from '../../../../common/actions/action.model'; +import {Record} from '../../../../common/record/record.model'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; +import {SortDirection} from '../../../../common/views/list/list-navigation.model'; import {map, takeWhile, tap} from 'rxjs/operators'; import {RecordThreadItemStoreFactory} from './record-thread-item.store.factory'; import {RecordThreadItemMetadata} from './record-thread-item.store.model'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.spec.ts b/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.spec.ts index 2cf33d867..29b26d9dc 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.spec.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.spec.ts @@ -28,9 +28,10 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ChartSidebarWidgetComponent} from './chart-sidebar-widget.component'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('ChartSidebarWidgetComponent', () => { let component: ChartSidebarWidgetComponent; @@ -38,10 +39,10 @@ describe('ChartSidebarWidgetComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ChartSidebarWidgetComponent], - imports: [RouterTestingModule, HttpClientTestingModule, ApolloTestingModule, NoopAnimationsModule], - providers: [], - }) + declarations: [ChartSidebarWidgetComponent], + imports: [RouterTestingModule, ApolloTestingModule, NoopAnimationsModule], + providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.ts b/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.ts index 93f3dc4a3..7211835f5 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/chart-sidebar-widget/chart-sidebar-widget.component.ts @@ -25,7 +25,10 @@ */ import {Component, OnInit} from '@angular/core'; -import {ChartDataSource, ChartMetadata, ChartsWidgetOptions, StatisticsQuery, ViewContext} from 'common'; +import {ChartDataSource} from '../../../../common/containers/chart/chart.model'; +import {ChartMetadata, ChartsWidgetOptions} from '../../../../common/metadata/charts-widget.metadata'; +import {StatisticsQuery} from '../../../../common/statistics/statistics.model'; +import {ViewContext} from '../../../../common/views/view.model'; import {combineLatestWith, Observable, of, Subscription} from 'rxjs'; import {map, take, tap} from 'rxjs/operators'; import {ChartDataStoreFactory} from '../../../../store/chart-data/chart-data.store.factory'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-sidebar-widget.model.ts b/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-sidebar-widget.model.ts index 6ec6a072d..657a66212 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-sidebar-widget.model.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-sidebar-widget.model.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Record, Field} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {Field} from '../../../../common/record/field.model'; export interface HistoryTimelineEntry { title: Field; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-timeline.adapter.service.ts b/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-timeline.adapter.service.ts index 7b0e685c3..71dca274b 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-timeline.adapter.service.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/history-sidebar-widget/history-timeline.adapter.service.ts @@ -28,7 +28,9 @@ import {Injectable} from '@angular/core'; import {HistoryTimelineEntry} from './history-sidebar-widget.model'; import {BehaviorSubject, Observable} from 'rxjs'; import {HistoryTimelineStore} from '../../store/history-timeline/history-timeline.store'; -import {emptyObject, Record, ViewContext} from 'common'; +import {emptyObject} from '../../../../common/utils/object-utils'; +import {Record} from '../../../../common/record/record.model'; +import {ViewContext} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {HistoryTimelineStoreFactory} from './history-timeline.store.factory'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.spec.mock.ts b/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.spec.mock.ts index cf40346f4..66e1441f4 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.spec.mock.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.spec.mock.ts @@ -24,9 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {StatisticsMap, StatisticsQueryMap} from 'common'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; +import {StatisticsMap, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; import {SingleValueStatisticsStoreFactory} from '../../../../store/single-value-statistics/single-value-statistics.store.factory'; import {fieldManagerMock} from '../../../../services/record/field/field.manager.spec.mock'; import {StatisticsFetchGQL} from '../../../../store/statistics/graphql/api.statistics.get'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.ts b/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.ts index d29ac63c8..eeb8663ac 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/record-thread-sidebar-widget/record-thread-sidebar-widget.component.ts @@ -25,19 +25,14 @@ */ import {Component, OnDestroy, OnInit} from '@angular/core'; -import { - Action, - AttributeMap, - deepClone, - FieldDefinitionMap, - isFalse, - isTrue, - Record, - SearchCriteria, - SearchCriteriaFilter, - StringMap, - ViewContext -} from 'common'; +import {isTrue, isFalse} from '../../../../common/utils/value-utils'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {Action} from '../../../../common/actions/action.model'; +import {FieldDefinitionMap} from '../../../../common/record/field.model'; +import {Record, AttributeMap} from '../../../../common/record/record.model'; +import {SearchCriteria, SearchCriteriaFilter} from '../../../../common/views/list/search-criteria.model'; +import {StringMap} from '../../../../common/types/string-map'; +import {ViewContext} from '../../../../common/views/view.model'; import {Observable, of, Subscription} from 'rxjs'; import {LanguageStore} from '../../../../store/language/language.store'; import {BaseWidgetComponent} from '../../../widgets/base-widget.model'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.component.spec.ts b/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.component.spec.ts index 1e2b1a44e..6803e678d 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.component.spec.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.component.spec.ts @@ -27,7 +27,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {CommonModule} from '@angular/common'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {RouterTestingModule} from '@angular/router/testing'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.registry.ts b/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.registry.ts index 43a4604e4..4242ea4cc 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.registry.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/sidebar-widget/sidebar-widget.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {BaseComponentRegistry} from 'common'; +import {BaseComponentRegistry} from '../../../../common/components/registry/base-component.registry'; import {BaseWidgetComponent} from '../../../widgets/base-widget.model'; import {componentTypeMap} from './sidebar-widget.manifest'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.mock.ts b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.mock.ts index cf40346f4..66e1441f4 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.mock.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.mock.ts @@ -24,9 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {StatisticsMap, StatisticsQueryMap} from 'common'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; +import {StatisticsMap, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; import {SingleValueStatisticsStoreFactory} from '../../../../store/single-value-statistics/single-value-statistics.store.factory'; import {fieldManagerMock} from '../../../../services/record/field/field.manager.spec.mock'; import {StatisticsFetchGQL} from '../../../../store/statistics/graphql/api.statistics.get'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.ts b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.ts index 2351da221..3dbf8cd6f 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.spec.ts @@ -28,7 +28,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {StatisticsSidebarWidgetComponent} from './statistics-sidebar-widget.component'; import {Component} from '@angular/core'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {sidebarWidgetStatisticsFactoryMock} from './statistics-sidebar-widget.component.spec.mock'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {CommonModule} from '@angular/common'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.ts b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.ts index 50d201bdd..a524d0fe0 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/components/statistics-sidebar-widget/statistics-sidebar-widget.component.ts @@ -25,7 +25,8 @@ */ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {StatisticWidgetOptions, ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {StatisticWidgetOptions, WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {Subscription} from 'rxjs'; import {LanguageStore} from '../../../../store/language/language.store'; import {BaseWidgetComponent} from '../../../widgets/base-widget.model'; diff --git a/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline-record-list.store.spec.mock.ts b/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline-record-list.store.spec.mock.ts index e9eb8d707..9971dc2aa 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline-record-list.store.spec.mock.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline-record-list.store.spec.mock.ts @@ -32,7 +32,7 @@ import {messageServiceMock} from '../../../../services/message/message.service.s import {systemConfigStoreMock} from '../../../../store/system-config/system-config.store.spec.mock'; import {userPreferenceStoreMock} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {Observable, of} from 'rxjs'; -import {deepClone} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; import {take} from 'rxjs/operators'; /* eslint-disable camelcase, @typescript-eslint/camelcase */ diff --git a/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline.store.ts b/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline.store.ts index ae04834e0..76786087f 100644 --- a/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline.store.ts +++ b/core/app/core/src/lib/containers/sidebar-widget/store/history-timeline/history-timeline.store.ts @@ -29,7 +29,7 @@ import {StateStore} from '../../../../store/state'; import {RecordList, RecordListStore} from '../../../../store/record-list/record-list.store'; import {Observable} from 'rxjs'; import {RecordListStoreFactory} from '../../../../store/record-list/record-list.store.factory'; -import {ViewContext} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; @Injectable() export class HistoryTimelineStore implements StateStore { diff --git a/core/app/core/src/lib/containers/subpanel/actions/async-process/async-process.action.ts b/core/app/core/src/lib/containers/subpanel/actions/async-process/async-process.action.ts index 20ab43306..ac794f1da 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/async-process/async-process.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/async-process/async-process.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../common/views/view.model'; import {SubpanelActionData, SubpanelActionHandler} from '../subpanel.action'; @Injectable({ diff --git a/core/app/core/src/lib/containers/subpanel/actions/clear-filter/clear-filter.action.ts b/core/app/core/src/lib/containers/subpanel/actions/clear-filter/clear-filter.action.ts index dd5d6b9e7..32ce16b9e 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/clear-filter/clear-filter.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/clear-filter/clear-filter.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {SubpanelActionData, SubpanelActionHandler} from '../subpanel.action'; import {SubpanelStore} from "../../store/subpanel/subpanel.store"; diff --git a/core/app/core/src/lib/containers/subpanel/actions/create/create.action.ts b/core/app/core/src/lib/containers/subpanel/actions/create/create.action.ts index b5873525b..8a6abbe6a 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/create/create.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/create/create.action.ts @@ -27,7 +27,9 @@ import {Injectable} from '@angular/core'; import {Params, Router} from '@angular/router'; import {ModuleNameMapper,} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; -import {AttributeMap, isVoid, ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; +import {AttributeMap} from '../../../../common/record/record.model'; +import {isVoid} from '../../../../common/utils/value-utils'; import get from 'lodash-es/get'; import {SubpanelActionData, SubpanelActionHandler} from '../subpanel.action'; diff --git a/core/app/core/src/lib/containers/subpanel/actions/select/select.action.ts b/core/app/core/src/lib/containers/subpanel/actions/select/select.action.ts index d44eb40c0..b9c943dda 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/select/select.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/select/select.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Record, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {SubpanelActionData, SubpanelActionHandler} from '../subpanel.action'; import { RecordListModalComponent diff --git a/core/app/core/src/lib/containers/subpanel/actions/show-filter/show-filter.action.ts b/core/app/core/src/lib/containers/subpanel/actions/show-filter/show-filter.action.ts index b559fbe53..7a2010f94 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/show-filter/show-filter.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/show-filter/show-filter.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {SubpanelActionData, SubpanelActionHandler} from '../subpanel.action'; import {SubpanelStore} from "../../store/subpanel/subpanel.store"; diff --git a/core/app/core/src/lib/containers/subpanel/actions/subpanel.action.ts b/core/app/core/src/lib/containers/subpanel/actions/subpanel.action.ts index b41d172b8..f20ff46a8 100644 --- a/core/app/core/src/lib/containers/subpanel/actions/subpanel.action.ts +++ b/core/app/core/src/lib/containers/subpanel/actions/subpanel.action.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionData, ActionHandler} from 'common'; +import {ActionData, ActionHandler} from '../../../common/actions/action.model'; import {SubpanelStore} from '../store/subpanel/subpanel.store'; export interface SubpanelActionData extends ActionData { diff --git a/core/app/core/src/lib/containers/subpanel/adapters/actions.adapter.ts b/core/app/core/src/lib/containers/subpanel/adapters/actions.adapter.ts index 77a5e292d..a0aed9f6d 100644 --- a/core/app/core/src/lib/containers/subpanel/adapters/actions.adapter.ts +++ b/core/app/core/src/lib/containers/subpanel/adapters/actions.adapter.ts @@ -25,9 +25,12 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, SearchCriteria, SubPanelDefinition, ViewMode} from 'common'; -import {combineLatest, combineLatestWith, Observable} from 'rxjs'; -import {map, take, tap} from 'rxjs/operators'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {SearchCriteria} from '../../../common/views/list/search-criteria.model'; +import {SubPanelDefinition} from '../../../common/metadata/subpanel.metadata.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {combineLatestWith, Observable} from 'rxjs'; +import {map, take} from 'rxjs/operators'; import {AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {LanguageStore, LanguageStrings} from '../../../store/language/language.store'; import {MessageService} from '../../../services/message/message.service'; diff --git a/core/app/core/src/lib/containers/subpanel/adapters/filter.adapter.ts b/core/app/core/src/lib/containers/subpanel/adapters/filter.adapter.ts index bb8d9acdf..db85b5987 100644 --- a/core/app/core/src/lib/containers/subpanel/adapters/filter.adapter.ts +++ b/core/app/core/src/lib/containers/subpanel/adapters/filter.adapter.ts @@ -28,7 +28,7 @@ import {Injectable} from "@angular/core"; import {FilterConfig} from "../../list-filter/components/list-filter/list-filter.model"; import {map} from "rxjs/operators"; import {SavedFilter, SavedFilterMap} from "../../../store/saved-filters/saved-filter.model"; -import {SearchMeta, SearchMetaFieldMap} from "common"; +import {SearchMeta, SearchMetaFieldMap} from '../../../common/metadata/list.metadata.model'; import {SubpanelStore} from "../store/subpanel/subpanel.store"; @Injectable() diff --git a/core/app/core/src/lib/containers/subpanel/adapters/line-actions.adapter.ts b/core/app/core/src/lib/containers/subpanel/adapters/line-actions.adapter.ts index cdd78436c..b209367cb 100644 --- a/core/app/core/src/lib/containers/subpanel/adapters/line-actions.adapter.ts +++ b/core/app/core/src/lib/containers/subpanel/adapters/line-actions.adapter.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable, of} from 'rxjs'; import {map, shareReplay, take} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/containers/subpanel/adapters/table.adapter.ts b/core/app/core/src/lib/containers/subpanel/adapters/table.adapter.ts index eed7cf11b..437893ecc 100644 --- a/core/app/core/src/lib/containers/subpanel/adapters/table.adapter.ts +++ b/core/app/core/src/lib/containers/subpanel/adapters/table.adapter.ts @@ -26,8 +26,10 @@ import {Observable, of} from 'rxjs'; import {Injectable} from '@angular/core'; -import {ActionDataSource, ColumnDefinition, SortDirection, SortingSelection} from 'common'; import {map} from 'rxjs/operators'; +import {ColumnDefinition} from '../../../common/metadata/list.metadata.model'; +import {ActionDataSource} from '../../../common/actions/action.model'; +import {SortDirection, SortingSelection} from '../../../common/views/list/list-navigation.model'; import {TableConfig} from '../../../components/table/table.model'; import {SubpanelStore} from '../store/subpanel/subpanel.store'; import {SubpanelLineActionsAdapterFactory} from './line-actions.adapter.factory'; diff --git a/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.spec.ts b/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.spec.ts index 196d9a9d5..bc01bc844 100644 --- a/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.spec.ts +++ b/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {SubpanelContainerComponent} from './subpanel-container.component'; import {RouterTestingModule} from '@angular/router/testing'; @@ -36,6 +36,7 @@ import {ActionMenuModule} from '../../../../views/list/components/action-menu/ac import {ImageModule} from '../../../../components/image/image.module'; import {ModuleTitleModule} from '../../../../components/module-title/module-title.module'; import {SettingsMenuModule} from '../../../../views/list/components/settings-menu/settings-menu.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'subpanel-test-host-component', @@ -50,20 +51,17 @@ describe('SubpanelContainerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ModuleTitleModule, - ActionMenuModule, - ButtonModule, - SettingsMenuModule, - ApolloTestingModule, - HttpClientTestingModule, - ImageModule, - ListFilterModule, - RouterTestingModule - ], - declarations: [SubpanelContainerComponent, SubpanelContainerComponentTestHostComponent], - providers: [], - }) + declarations: [SubpanelContainerComponent, SubpanelContainerComponentTestHostComponent], + imports: [ModuleTitleModule, + ActionMenuModule, + ButtonModule, + SettingsMenuModule, + ApolloTestingModule, + ImageModule, + ListFilterModule, + RouterTestingModule], + providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()] +}) .compileComponents(); }); diff --git a/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.ts b/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.ts index 3c088c968..dd00da4c7 100644 --- a/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.ts +++ b/core/app/core/src/lib/containers/subpanel/components/subpanel-container/subpanel-container.component.ts @@ -31,7 +31,9 @@ import {SubpanelContainerConfig} from './subpanel-container.model'; import {LanguageStore, LanguageStrings} from '../../../../store/language/language.store'; import {SubpanelStore, SubpanelStoreMap} from '../../store/subpanel/subpanel.store'; import {MaxColumnsCalculator} from '../../../../services/ui/max-columns-calculator/max-columns-calculator.service'; -import {isTrue, ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; +import {isTrue} from '../../../../common/utils/value-utils'; import {GridWidgetConfig, StatisticsQueryArgs} from '../../../../components/grid-widget/grid-widget.component'; import {LocalStorageService} from "../../../../services/local-storage/local-storage.service"; import {FilterConfig} from "../../../list-filter/components/list-filter/list-filter.model"; diff --git a/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.spec.ts b/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.spec.ts index 6712cc5d6..397fcb6b5 100644 --- a/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.spec.ts +++ b/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.spec.ts @@ -25,7 +25,7 @@ */ import {CommonModule} from '@angular/common'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {RouterModule} from '@angular/router'; @@ -42,6 +42,7 @@ import {PanelModule} from '../../../../components/panel/panel.module'; import {LanguageStore} from '../../../../store/language/language.store'; import {metadataStoreMock} from '../../../../store/metadata/metadata.store.spec.mock'; import {ImageModule} from '../../../../components/image/image.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const store = recordviewStoreMock.getSubpanels().contacts; @@ -59,24 +60,23 @@ describe('SubpanelComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ImageModule, - PanelModule, - RouterModule, - ButtonGroupModule, - ApolloTestingModule, - HttpClientTestingModule, - RouterTestingModule - ], - declarations: [SubpanelComponent, SubpanelComponentTestHostComponent], - providers: [ - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: RecordViewStore, useValue: recordviewStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - ], - }) + declarations: [SubpanelComponent, SubpanelComponentTestHostComponent], + imports: [CommonModule, + NgbModule, + ImageModule, + PanelModule, + RouterModule, + ButtonGroupModule, + ApolloTestingModule, + RouterTestingModule], + providers: [ + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: RecordViewStore, useValue: recordviewStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); }); diff --git a/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.ts b/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.ts index ced55232b..555c63f4d 100644 --- a/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.ts +++ b/core/app/core/src/lib/containers/subpanel/components/subpanel/subpanel.component.ts @@ -25,7 +25,9 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {ActionContext, ButtonGroupInterface, ButtonInterface} from 'common'; +import {ActionContext} from '../../../../common/actions/action.model'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../../../common/components/button/button-group.model'; import {Observable} from 'rxjs'; import {TableConfig} from '../../../../components/table/table.model'; import {SubpanelTableAdapter} from '../../adapters/table.adapter'; diff --git a/core/app/core/src/lib/containers/subpanel/line-actions/async-process/async-process.action.ts b/core/app/core/src/lib/containers/subpanel/line-actions/async-process/async-process.action.ts index 58dc23629..9552e2810 100644 --- a/core/app/core/src/lib/containers/subpanel/line-actions/async-process/async-process.action.ts +++ b/core/app/core/src/lib/containers/subpanel/line-actions/async-process/async-process.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../common/views/view.model'; import {SubpanelLineActionData, SubpanelLineActionHandler} from '../line.action'; @Injectable({ diff --git a/core/app/core/src/lib/containers/subpanel/line-actions/line.action.ts b/core/app/core/src/lib/containers/subpanel/line-actions/line.action.ts index 9ecb6c1c0..958c0f0bd 100644 --- a/core/app/core/src/lib/containers/subpanel/line-actions/line.action.ts +++ b/core/app/core/src/lib/containers/subpanel/line-actions/line.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionHandler, Record} from 'common'; +import {Action, ActionHandler} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; import {SubpanelStore} from '../store/subpanel/subpanel.store'; import {LineActionData} from '../../../components/table/line-actions/line.action'; diff --git a/core/app/core/src/lib/containers/subpanel/store/subpanel/subpanel.store.ts b/core/app/core/src/lib/containers/subpanel/store/subpanel/subpanel.store.ts index f8439fd21..77486870d 100644 --- a/core/app/core/src/lib/containers/subpanel/store/subpanel/subpanel.store.ts +++ b/core/app/core/src/lib/containers/subpanel/store/subpanel/subpanel.store.ts @@ -30,21 +30,13 @@ import {RecordList, RecordListStore} from '../../../../store/record-list/record- import {BehaviorSubject, forkJoin, Observable, Subscription} from 'rxjs'; import {RecordListStoreFactory} from '../../../../store/record-list/record-list.store.factory'; import {LanguageStore} from '../../../../store/language/language.store'; -import { - ColumnDefinition, - deepClone, - Record, - RecordListMeta, - SearchCriteria, - SearchCriteriaFilter, - SearchMeta, - Statistic, - StatisticsMap, - StatisticsQuery, - StatisticsQueryMap, - StatisticWidgetOptions, - SubPanelDefinition -} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {Record} from '../../../../common/record/record.model'; +import {SearchCriteria, SearchCriteriaFilter} from '../../../../common/views/list/search-criteria.model'; +import {ColumnDefinition, SearchMeta, RecordListMeta} from '../../../../common/metadata/list.metadata.model'; +import {Statistic, StatisticsQuery, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; +import {StatisticWidgetOptions} from '../../../../common/metadata/widget.metadata'; +import {SubPanelDefinition} from '../../../../common/metadata/subpanel.metadata.model'; import {SingleValueStatisticsStore} from '../../../../store/single-value-statistics/single-value-statistics.store'; import { SingleValueStatisticsStoreFactory diff --git a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.mock.ts b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.mock.ts index 317094e7d..738243df5 100644 --- a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.mock.ts +++ b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.mock.ts @@ -24,9 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {StatisticsMap, StatisticsQueryMap} from 'common'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; +import {StatisticsMap, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; import {SingleValueStatisticsStoreFactory} from '../../../../store/single-value-statistics/single-value-statistics.store.factory'; import {fieldManagerMock} from '../../../../services/record/field/field.manager.spec.mock'; import {StatisticsFetchGQL} from '../../../../store/statistics/graphql/api.statistics.get'; diff --git a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.ts b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.ts index 1e6e15ff6..d9a446663 100644 --- a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.ts +++ b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.spec.ts @@ -28,7 +28,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {StatisticsTopWidgetComponent} from './statistics-top-widget.component'; import {Component} from '@angular/core'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {topWidgetStatisticsFactoryMock} from './statistics-top-widget.component.spec.mock'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {CommonModule} from '@angular/common'; diff --git a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.ts b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.ts index 7d71c1ccd..841ad5cb0 100644 --- a/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.ts +++ b/core/app/core/src/lib/containers/top-widget/components/statistics-top-widget/statistics-top-widget.component.ts @@ -33,7 +33,9 @@ import { import {map, take} from 'rxjs/operators'; import {LanguageStore, LanguageStringMap} from '../../../../store/language/language.store'; import {combineLatestWith, Observable, of, Subscription} from 'rxjs'; -import {SingleValueStatisticsState, StatisticsQuery, ViewContext} from 'common'; +import {StatisticsQuery} from '../../../../common/statistics/statistics.model'; +import {SingleValueStatisticsState} from '../../../../common/statistics/statistics-store.model'; +import {ViewContext} from '../../../../common/views/view.model'; interface StatisticsTopWidgetState { statistics: { [key: string]: SingleValueStatisticsState }; diff --git a/core/app/core/src/lib/containers/top-widget/components/top-widget/top-widget.component.spec.ts b/core/app/core/src/lib/containers/top-widget/components/top-widget/top-widget.component.spec.ts index 960a12900..c5a82dd04 100644 --- a/core/app/core/src/lib/containers/top-widget/components/top-widget/top-widget.component.spec.ts +++ b/core/app/core/src/lib/containers/top-widget/components/top-widget/top-widget.component.spec.ts @@ -25,9 +25,9 @@ */ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; - import {Component} from '@angular/core'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {topWidgetStatisticsFactoryMock} from '../statistics-top-widget/statistics-top-widget.component.spec.mock'; import {CommonModule} from '@angular/common'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; diff --git a/core/app/core/src/lib/containers/widgets/base-widget.model.ts b/core/app/core/src/lib/containers/widgets/base-widget.model.ts index 1839b9749..b0770b1d8 100644 --- a/core/app/core/src/lib/containers/widgets/base-widget.model.ts +++ b/core/app/core/src/lib/containers/widgets/base-widget.model.ts @@ -25,7 +25,8 @@ */ import {Component, Input} from '@angular/core'; -import {WidgetMetadata, ViewContext} from 'common'; +import {ViewContext} from '../../common/views/view.model'; +import {WidgetMetadata} from '../../common/metadata/widget.metadata'; import {Observable} from 'rxjs'; @Component({template: ''}) diff --git a/core/app/core/src/lib/core.ts b/core/app/core/src/lib/core.ts index 9ab09c35a..79a664851 100644 --- a/core/app/core/src/lib/core.ts +++ b/core/app/core/src/lib/core.ts @@ -1,3 +1,46 @@ +export * from './common/actions/action.model'; +export * from './common/actions/bulk-action.model'; +export * from './common/actions/field-logic-action.model'; +export * from './common/components/button/button-group.model'; +export * from './common/components/button/button.model'; +export * from './common/components/button/dropdown-button.model'; +export * from './common/components/modal/modal.model'; +export * from './common/components/pagination/pagination.model'; +export * from './common/components/registry/base-component.registry'; +export * from './common/containers/chart/chart.model'; +export * from './common/menu/menu.model'; +export * from './common/metadata/charts-widget.metadata'; +export * from './common/metadata/list.metadata.model'; +export * from './common/metadata/metadata.model'; +export * from './common/metadata/subpanel.metadata.model'; +export * from './common/metadata/widget.metadata'; +export * from './common/record/favorites.model'; +export * from './common/record/field.model'; +export * from './common/record/recently-viewed.model'; +export * from './common/record/record.model'; +export * from './common/record/record-mappers/record-mapper.model'; +export * from './common/record/record-mappers/record-mapper.registry'; +export * from './common/registry/base-service.registry'; +export * from './common/registry/base-type.registry'; +export * from './common/services/ui/resize.model'; +export * from './common/services/validators/validators.model'; +export * from './common/statistics/statistics-store.model'; +export * from './common/statistics/statistics.model'; +export * from './common/types/boolean-map'; +export * from './common/types/messages'; +export * from './common/types/object-map'; +export * from './common/types/overridable-map'; +export * from './common/types/string-map'; +export * from './common/types/string-matrix'; +export * from './common/types/user'; +export * from './common/utils/object-utils'; +export * from './common/utils/value-utils'; +export * from './common/utils/view-utils'; +export * from './common/views/view.model'; +export * from './common/views/list/list-navigation.model'; +export * from './common/views/list/record-selection.model'; +export * from './common/views/list/search-criteria.model'; +export * from './common/views/list/selection.model'; export * from './components/action-group-menu/action-group-menu.component'; export * from './components/action-group-menu/action-group-menu.module'; export * from './components/bulk-action-menu/bulk-action-menu.component'; @@ -496,6 +539,12 @@ export * from './services/record/field/filter-field.builder'; export * from './services/record/field/form-control.utils'; export * from './services/record/field/group-field.builder'; export * from './services/record/field/line-item.builder'; +export * from './services/record/field/handler/field-handler.model'; +export * from './services/record/field/handler/field-handler.registry'; +export * from './services/record/field/handler/handlers/base.field-handler'; +export * from './services/record/field/handler/handlers/date.field-handler'; +export * from './services/record/field/handler/handlers/default.field-handler'; +export * from './services/record/field/handler/handlers/multienum.field-handler'; export * from './services/record/field/types/multi-enum.value-object-type'; export * from './services/record/relate/relate.service'; export * from './services/record/validation/aync-validator.Interface'; diff --git a/core/app/core/src/lib/fields/base-field.registry.ts b/core/app/core/src/lib/fields/base-field.registry.ts index 68330cd06..e7d3c21ad 100644 --- a/core/app/core/src/lib/fields/base-field.registry.ts +++ b/core/app/core/src/lib/fields/base-field.registry.ts @@ -25,9 +25,10 @@ */ import {Type} from '@angular/core'; -import {OverridableMap} from 'common'; + import {BaseFieldComponent} from './base/base-field.component'; import {FieldComponentMap} from './field.model'; +import {OverridableMap} from "../common/types/overridable-map"; export interface FieldRegistryInterface { register(module: string, type: string, mode: string, component: Type): void; diff --git a/core/app/core/src/lib/fields/base/base-boolean.component.ts b/core/app/core/src/lib/fields/base/base-boolean.component.ts index 666688058..bf1dab85c 100644 --- a/core/app/core/src/lib/fields/base/base-boolean.component.ts +++ b/core/app/core/src/lib/fields/base/base-boolean.component.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {isTrue} from 'common'; -import {Component, OnInit} from '@angular/core'; +import {isTrue} from '../../common/utils/value-utils'; +import {Component} from '@angular/core'; import {BaseFieldComponent} from './base-field.component'; @Component({template: ''}) diff --git a/core/app/core/src/lib/fields/base/base-composite.component.ts b/core/app/core/src/lib/fields/base/base-composite.component.ts index 9c344816a..6fab099b3 100644 --- a/core/app/core/src/lib/fields/base/base-composite.component.ts +++ b/core/app/core/src/lib/fields/base/base-composite.component.ts @@ -29,7 +29,8 @@ import {BaseFieldComponent} from './base-field.component'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; import {StandardFieldRegistry} from '../standard-field.registry'; import {RecordManager} from '../../services/record/record.manager'; -import {emptyObject, Field, FieldAttribute, FieldDefinition} from 'common'; +import {emptyObject} from '../../common/utils/object-utils'; +import {Field, FieldDefinition, FieldAttribute} from '../../common/record/field.model'; import set from 'lodash-es/set'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-display.manager'; diff --git a/core/app/core/src/lib/fields/base/base-enum.component.ts b/core/app/core/src/lib/fields/base/base-enum.component.ts index 8c88a9e54..9830ea1b0 100644 --- a/core/app/core/src/lib/fields/base/base-enum.component.ts +++ b/core/app/core/src/lib/fields/base/base-enum.component.ts @@ -27,7 +27,8 @@ import {BaseFieldComponent} from './base-field.component'; import {Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from 'rxjs'; -import {Field, FieldDefinition, isEmptyString, isVoid, Option} from 'common'; +import {Field, FieldDefinition, Option} from '../../common/record/field.model'; +import {isVoid, isEmptyString} from '../../common/utils/value-utils'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; import { LanguageListStringMap, diff --git a/core/app/core/src/lib/fields/base/base-field.component.ts b/core/app/core/src/lib/fields/base/base-field.component.ts index 094b1aef7..f6571dc8d 100644 --- a/core/app/core/src/lib/fields/base/base-field.component.ts +++ b/core/app/core/src/lib/fields/base/base-field.component.ts @@ -26,7 +26,12 @@ import {Component, computed, inject, Input, OnDestroy, OnInit, signal, Signal} from '@angular/core'; import {FieldComponentInterface} from './field.interface'; -import {AttributeDependency, Field, isVoid, ObjectMap, Record, ViewMode} from 'common'; +import {AttributeDependency} from '../../common/record/field.model'; +import {ObjectMap} from '../../common/types/object-map'; +import {isVoid} from '../../common/utils/value-utils'; +import {Field} from '../../common/record/field.model'; +import {ViewMode} from '../../common/views/view.model'; +import {Record} from '../../common/record/record.model'; import {BehaviorSubject, Observable, Subscription} from 'rxjs'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; import {debounceTime} from 'rxjs/operators'; diff --git a/core/app/core/src/lib/fields/base/base-line-items.component.ts b/core/app/core/src/lib/fields/base/base-line-items.component.ts index bf65c6729..aec6d375e 100644 --- a/core/app/core/src/lib/fields/base/base-line-items.component.ts +++ b/core/app/core/src/lib/fields/base/base-line-items.component.ts @@ -28,19 +28,15 @@ import {Component, inject, OnDestroy, OnInit} from '@angular/core'; import {BaseFieldComponent} from './base-field.component'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; import {RecordManager} from '../../services/record/record.manager'; -import { - emptyObject, - Field, - FieldAttribute, - FieldDefinition, - FieldLogicMap, - isEditable, - isTrue, - LineActionEvent, - Record, - StringMap, - ViewMode -} from 'common'; +import {isTrue} from '../../common/utils/value-utils'; +import {emptyObject} from '../../common/utils/object-utils'; +import {isEditable} from '../../common/utils/view-utils'; +import {Field, FieldDefinition, FieldAttribute} from '../../common/record/field.model'; +import {FieldLogicMap} from '../../common/actions/field-logic-action.model'; +import {LineActionEvent} from '../../common/actions/field-logic-action.model'; +import {Record} from '../../common/record/record.model'; +import {StringMap} from '../../common/types/string-map'; +import {ViewMode} from '../../common/views/view.model'; import set from 'lodash-es/set'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; import {FieldManager} from '../../services/record/field/field.manager'; diff --git a/core/app/core/src/lib/fields/base/base-multienum.component.ts b/core/app/core/src/lib/fields/base/base-multienum.component.ts index 5c4f4eae3..11e19d08d 100644 --- a/core/app/core/src/lib/fields/base/base-multienum.component.ts +++ b/core/app/core/src/lib/fields/base/base-multienum.component.ts @@ -31,7 +31,7 @@ import {LanguageStore} from '../../store/language/language.store'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-display.manager'; import {isArray, isEmpty, isEqual, uniqBy} from 'lodash-es'; -import { isVoid } from 'common'; +import {isVoid} from '../../common/utils/value-utils'; @Component({template: ''}) export class BaseMultiEnumComponent extends BaseEnumComponent { diff --git a/core/app/core/src/lib/fields/base/base-name.component.ts b/core/app/core/src/lib/fields/base/base-name.component.ts index 0854f6ae4..3b9ad2f21 100644 --- a/core/app/core/src/lib/fields/base/base-name.component.ts +++ b/core/app/core/src/lib/fields/base/base-name.component.ts @@ -25,7 +25,8 @@ */ import {BaseFieldComponent} from './base-field.component'; -import {Field, Record} from 'common'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; import {Component} from '@angular/core'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; diff --git a/core/app/core/src/lib/fields/base/base-relate.component.ts b/core/app/core/src/lib/fields/base/base-relate.component.ts index dde1d45df..75d993d01 100644 --- a/core/app/core/src/lib/fields/base/base-relate.component.ts +++ b/core/app/core/src/lib/fields/base/base-relate.component.ts @@ -27,7 +27,8 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Observable, of} from 'rxjs'; import {catchError, map, tap} from 'rxjs/operators'; -import {AttributeMap, Record} from 'common'; +import {AttributeMap} from '../../common/record/record.model'; +import {Record} from '../../common/record/record.model'; import {ModuleNameMapper} from '../../services/navigation/module-name-mapper/module-name-mapper.service'; import {BaseFieldComponent} from './base-field.component'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/fields/base/field.interface.ts b/core/app/core/src/lib/fields/base/field.interface.ts index 894513f57..28978ec35 100644 --- a/core/app/core/src/lib/fields/base/field.interface.ts +++ b/core/app/core/src/lib/fields/base/field.interface.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {Field} from 'common'; +import {Field} from '../../common/record/field.model'; export interface FieldComponentInterface { field?: Field; diff --git a/core/app/core/src/lib/fields/boolean/templates/detail/boolean.component.spec.ts b/core/app/core/src/lib/fields/boolean/templates/detail/boolean.component.spec.ts index 076ef124b..6733ee9c9 100644 --- a/core/app/core/src/lib/fields/boolean/templates/detail/boolean.component.spec.ts +++ b/core/app/core/src/lib/fields/boolean/templates/detail/boolean.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BooleanDetailFieldComponent} from './boolean.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/boolean/templates/edit/boolean.component.spec.ts b/core/app/core/src/lib/fields/boolean/templates/edit/boolean.component.spec.ts index b75a3fc8d..84c5084eb 100644 --- a/core/app/core/src/lib/fields/boolean/templates/edit/boolean.component.spec.ts +++ b/core/app/core/src/lib/fields/boolean/templates/edit/boolean.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BooleanEditFieldComponent} from './boolean.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/currency/templates/detail/currency.component.spec.ts b/core/app/core/src/lib/fields/currency/templates/detail/currency.component.spec.ts index bb0aa2d94..2df8b1968 100644 --- a/core/app/core/src/lib/fields/currency/templates/detail/currency.component.spec.ts +++ b/core/app/core/src/lib/fields/currency/templates/detail/currency.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BehaviorSubject, of} from 'rxjs'; import {CurrencyDetailFieldComponent} from './currency.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceMockStore} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/date/templates/detail/date.component.spec.ts b/core/app/core/src/lib/fields/date/templates/detail/date.component.spec.ts index ee9f9c7d6..432c385b6 100644 --- a/core/app/core/src/lib/fields/date/templates/detail/date.component.spec.ts +++ b/core/app/core/src/lib/fields/date/templates/detail/date.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BehaviorSubject} from 'rxjs'; import {CommonModule} from '@angular/common'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/date/templates/edit/date.component.spec.ts b/core/app/core/src/lib/fields/date/templates/edit/date.component.spec.ts index e2c7bb392..eaeaceb89 100644 --- a/core/app/core/src/lib/fields/date/templates/edit/date.component.spec.ts +++ b/core/app/core/src/lib/fields/date/templates/edit/date.component.spec.ts @@ -29,7 +29,7 @@ import {Component} from '@angular/core'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {BehaviorSubject, of} from 'rxjs'; import {CommonModule} from '@angular/common'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {DateEditFieldComponent} from './date.component'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/date/templates/edit/date.component.ts b/core/app/core/src/lib/fields/date/templates/edit/date.component.ts index 2e80098ef..f548c3e76 100644 --- a/core/app/core/src/lib/fields/date/templates/edit/date.component.ts +++ b/core/app/core/src/lib/fields/date/templates/edit/date.component.ts @@ -26,8 +26,8 @@ import {Component, OnDestroy, OnInit,} from '@angular/core'; import {NgbDateAdapter, NgbDateParserFormatter, NgbDateStruct, NgbInputDatepicker} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonInterface, isEmptyString, isVoid} from 'common'; -import {BaseDateTimeComponent} from '../../../base/datetime/base-datetime.component'; +import {isVoid, isEmptyString} from '../../../../common/utils/value-utils'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {DateParserFormatter} from '../../../base/datetime/date/date-parser-formatter.service'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/date/templates/filter/date.component.spec.ts b/core/app/core/src/lib/fields/date/templates/filter/date.component.spec.ts index 8a1c78211..9e0cca499 100644 --- a/core/app/core/src/lib/fields/date/templates/filter/date.component.spec.ts +++ b/core/app/core/src/lib/fields/date/templates/filter/date.component.spec.ts @@ -33,7 +33,7 @@ import {SystemConfigStore} from '../../../../store/system-config/system-config.s import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {userPreferenceStoreMock} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {DateFilterFieldComponent} from './date.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; @Component({ selector: 'date-filter-field-test-host-component', diff --git a/core/app/core/src/lib/fields/date/templates/filter/date.component.ts b/core/app/core/src/lib/fields/date/templates/filter/date.component.ts index 974335ad8..37efd0fe0 100644 --- a/core/app/core/src/lib/fields/date/templates/filter/date.component.ts +++ b/core/app/core/src/lib/fields/date/templates/filter/date.component.ts @@ -26,7 +26,7 @@ import {Component, OnDestroy, OnInit,} from '@angular/core'; import {NgbDateAdapter, NgbDateParserFormatter, NgbDateStruct} from '@ng-bootstrap/ng-bootstrap'; -import {isEmptyString, isVoid} from 'common'; +import {isVoid, isEmptyString} from '../../../../common/utils/value-utils'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {DateParserFormatter} from '../../../base/datetime/date/date-parser-formatter.service'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.spec.ts b/core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.spec.ts index f1dff3430..d669d6e02 100644 --- a/core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.spec.ts +++ b/core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.spec.ts @@ -29,7 +29,7 @@ import {Component} from '@angular/core'; import {DateTimeDetailFieldComponent} from './datetime.component'; import {CommonModule} from '@angular/common'; import {BehaviorSubject} from 'rxjs'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {UserPreferenceMockStore} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {DatetimeFormatter} from '../../../../services/formatters/datetime/datetime-formatter.service'; diff --git a/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.spec.ts b/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.spec.ts index b7a4873e5..91e90b502 100644 --- a/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.spec.ts +++ b/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {DateTimeEditFieldComponent} from './datetime.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {BehaviorSubject} from 'rxjs'; diff --git a/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.ts b/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.ts index 153667ab4..a32784683 100644 --- a/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.ts +++ b/core/app/core/src/lib/fields/datetime/templates/edit/datetime.component.ts @@ -26,7 +26,8 @@ import {Component, OnDestroy, OnInit, ViewChild,} from '@angular/core'; import {NgbCalendar, NgbDateStruct, NgbPopover, NgbPopoverConfig, NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonInterface, isEmptyString, isVoid} from 'common'; +import {isVoid, isEmptyString} from '../../../../common/utils/value-utils'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {BaseDateTimeComponent} from '../../../base/datetime/base-datetime.component'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {DatetimeFormatter} from "../../../../services/formatters/datetime/datetime-formatter.service"; diff --git a/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.spec.ts b/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.spec.ts index a99162f08..d18988d02 100644 --- a/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.spec.ts +++ b/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {DateTimeFilterFieldComponent} from './datetime.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {BehaviorSubject} from 'rxjs'; diff --git a/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.ts b/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.ts index 819230a68..657fc9857 100644 --- a/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.ts +++ b/core/app/core/src/lib/fields/datetime/templates/filter/datetime.component.ts @@ -26,7 +26,8 @@ import {Component, OnDestroy, OnInit, ViewChild,} from '@angular/core'; import {NgbCalendar, NgbDateStruct, NgbPopover, NgbPopoverConfig, NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; -import {ButtonInterface, isEmptyString} from 'common'; +import {isEmptyString} from '../../../../common/utils/value-utils'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {BaseDateTimeComponent} from '../../../base/datetime/base-datetime.component'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {DatetimeFormatter} from "../../../../services/formatters/datetime/datetime-formatter.service"; diff --git a/core/app/core/src/lib/fields/dropdownenum/templates/detail/dropdownenum.component.spec.ts b/core/app/core/src/lib/fields/dropdownenum/templates/detail/dropdownenum.component.spec.ts index 8dfe3512e..80567486b 100644 --- a/core/app/core/src/lib/fields/dropdownenum/templates/detail/dropdownenum.component.spec.ts +++ b/core/app/core/src/lib/fields/dropdownenum/templates/detail/dropdownenum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, OnDestroy, OnInit} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BehaviorSubject, of, Subscription} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.spec.ts b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.spec.ts index cd2682368..4a54b790d 100644 --- a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.spec.ts +++ b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts index 47678d690..71c004348 100644 --- a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts +++ b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts @@ -28,7 +28,7 @@ import {Component} from '@angular/core'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {BaseEnumComponent} from '../../../base/base-enum.component'; import {LanguageStore} from '../../../../store/language/language.store'; -import {Option} from 'common'; +import {Option} from '../../../../common/record/field.model'; import {FieldLogicManager} from '../../../field-logic/field-logic.manager'; import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager'; diff --git a/core/app/core/src/lib/fields/dynamic-field/dynamic-field.component.ts b/core/app/core/src/lib/fields/dynamic-field/dynamic-field.component.ts index 6cf6a155f..e608972db 100644 --- a/core/app/core/src/lib/fields/dynamic-field/dynamic-field.component.ts +++ b/core/app/core/src/lib/fields/dynamic-field/dynamic-field.component.ts @@ -34,7 +34,10 @@ import { Signal, Type } from '@angular/core'; -import {EDITABLE_VIEW_MODES, Field, Record, StringMap, ViewMode} from 'common'; +import {Record} from '../../common/record/record.model'; +import {Field} from '../../common/record/field.model'; +import {EDITABLE_VIEW_MODES, ViewMode} from '../../common/views/view.model'; +import {StringMap} from '../../common/types/string-map'; import {Router} from '@angular/router'; import {ModuleNameMapper} from '../../services/navigation/module-name-mapper/module-name-mapper.service'; import {ModuleNavigation} from '../../services/navigation/module-navigation/module-navigation.service'; diff --git a/core/app/core/src/lib/fields/email/templates/detail/email.component.spec.ts b/core/app/core/src/lib/fields/email/templates/detail/email.component.spec.ts index 40b7916f1..e930cefd9 100644 --- a/core/app/core/src/lib/fields/email/templates/detail/email.component.spec.ts +++ b/core/app/core/src/lib/fields/email/templates/detail/email.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {EmailDetailFieldsComponent} from './email.component'; import {Component} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/email/templates/list/email.component.spec.ts b/core/app/core/src/lib/fields/email/templates/list/email.component.spec.ts index 863709b5c..3c42cccd3 100644 --- a/core/app/core/src/lib/fields/email/templates/list/email.component.spec.ts +++ b/core/app/core/src/lib/fields/email/templates/list/email.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {EmailListFieldsComponent} from './email.component'; import {Component} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/enum/templates/detail/enum.component.spec.ts b/core/app/core/src/lib/fields/enum/templates/detail/enum.component.spec.ts index 379843688..c6466bc41 100644 --- a/core/app/core/src/lib/fields/enum/templates/detail/enum.component.spec.ts +++ b/core/app/core/src/lib/fields/enum/templates/detail/enum.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, OnDestroy, OnInit} from '@angular/core'; import {EnumDetailFieldComponent} from './enum.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BehaviorSubject, of, Subscription} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/enum/templates/edit/enum.component.spec.ts b/core/app/core/src/lib/fields/enum/templates/edit/enum.component.spec.ts index d3cb829e0..e72ab8763 100644 --- a/core/app/core/src/lib/fields/enum/templates/edit/enum.component.spec.ts +++ b/core/app/core/src/lib/fields/enum/templates/edit/enum.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {EnumEditFieldComponent} from './enum.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {TagInputModule} from 'ngx-chips'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/core/app/core/src/lib/fields/field-logic-display/display-type/display-type.action.ts b/core/app/core/src/lib/fields/field-logic-display/display-type/display-type.action.ts index be07fbc2b..8d06ea738 100644 --- a/core/app/core/src/lib/fields/field-logic-display/display-type/display-type.action.ts +++ b/core/app/core/src/lib/fields/field-logic-display/display-type/display-type.action.ts @@ -26,7 +26,10 @@ import {Injectable} from '@angular/core'; import {FieldLogicDisplayActionData, FieldLogicDisplayActionHandler} from '../field-logic-display.action'; -import {Action, StringArrayMap, StringArrayMatrix, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {ActiveFieldsChecker} from "../../../services/condition-operators/active-fields-checker.service"; diff --git a/core/app/core/src/lib/fields/field-logic-display/field-logic-display.action.ts b/core/app/core/src/lib/fields/field-logic-display/field-logic-display.action.ts index 55274c3f5..d0b61704b 100644 --- a/core/app/core/src/lib/fields/field-logic-display/field-logic-display.action.ts +++ b/core/app/core/src/lib/fields/field-logic-display/field-logic-display.action.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Field, Panel, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; export interface FieldLogicDisplayActionData extends ActionData { field: Field, diff --git a/core/app/core/src/lib/fields/field-logic-display/field-logic-display.manager.ts b/core/app/core/src/lib/fields/field-logic-display/field-logic-display.manager.ts index 49b6639d3..59a257096 100644 --- a/core/app/core/src/lib/fields/field-logic-display/field-logic-display.manager.ts +++ b/core/app/core/src/lib/fields/field-logic-display/field-logic-display.manager.ts @@ -27,7 +27,10 @@ import {Injectable} from '@angular/core'; import {BaseActionManager} from '../../services/actions/base-action-manager.service'; import {FieldLogicDisplayActionData} from './field-logic-display.action'; -import {Action, ActionContext, Field, Record, ViewMode, DisplayType} from 'common'; +import {Action, ActionContext} from '../../common/actions/action.model'; +import {DisplayType, Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; import {DisplayTypeAction} from './display-type/display-type.action'; @Injectable({ diff --git a/core/app/core/src/lib/fields/field-logic/currency-conversion/update-base-currency.action.ts b/core/app/core/src/lib/fields/field-logic/currency-conversion/update-base-currency.action.ts index 252170dc2..2f2778fb8 100644 --- a/core/app/core/src/lib/fields/field-logic/currency-conversion/update-base-currency.action.ts +++ b/core/app/core/src/lib/fields/field-logic/currency-conversion/update-base-currency.action.ts @@ -25,7 +25,11 @@ */ import {Injectable} from '@angular/core'; -import {Action, Field, Record, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; + import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; import {CurrencyService} from '../../../services/currency/currency.service'; diff --git a/core/app/core/src/lib/fields/field-logic/currency-conversion/update-currency.action.ts b/core/app/core/src/lib/fields/field-logic/currency-conversion/update-currency.action.ts index d4c04ac95..f3181cdfb 100644 --- a/core/app/core/src/lib/fields/field-logic/currency-conversion/update-currency.action.ts +++ b/core/app/core/src/lib/fields/field-logic/currency-conversion/update-currency.action.ts @@ -25,7 +25,10 @@ */ import {Injectable} from '@angular/core'; -import {Action, Field, Record, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; import {CurrencyService} from '../../../services/currency/currency.service'; diff --git a/core/app/core/src/lib/fields/field-logic/display-type-backend/display-type-backend.action.ts b/core/app/core/src/lib/fields/field-logic/display-type-backend/display-type-backend.action.ts index 2d6d6c78a..03cc7e5c1 100644 --- a/core/app/core/src/lib/fields/field-logic/display-type-backend/display-type-backend.action.ts +++ b/core/app/core/src/lib/fields/field-logic/display-type-backend/display-type-backend.action.ts @@ -25,18 +25,16 @@ */ import {Injectable} from '@angular/core'; -import { - Action, - deepClone, - DisplayType, - MapEntry, - Record, - RecordMapper, - RecordMapperRegistry, - StringArrayMap, - StringArrayMatrix, - ViewMode -} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {deepClone} from '../../../common/utils/object-utils'; +import {MapEntry} from '../../../common/types/overridable-map'; +import {DisplayType} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {RecordMapper} from '../../../common/record/record-mappers/record-mapper.model'; +import {RecordMapperRegistry} from '../../../common/record/record-mappers/record-mapper.registry'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {ProcessService} from '../../../services/process/process.service'; diff --git a/core/app/core/src/lib/fields/field-logic/display-type/field-logic-display-type.action.ts b/core/app/core/src/lib/fields/field-logic/display-type/field-logic-display-type.action.ts index 229aefb3d..7102aa4b8 100644 --- a/core/app/core/src/lib/fields/field-logic/display-type/field-logic-display-type.action.ts +++ b/core/app/core/src/lib/fields/field-logic/display-type/field-logic-display-type.action.ts @@ -27,7 +27,12 @@ import { isEmpty } from 'lodash-es'; import {Injectable} from '@angular/core'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; -import {Action, DisplayType, Field, Record, StringArrayMap, StringArrayMatrix, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {DisplayType, Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {ConditionOperatorManager} from '../../../services/condition-operators/condition-operator.manager'; /** diff --git a/core/app/core/src/lib/fields/field-logic/email-primary-select/email-primary-select.action.ts b/core/app/core/src/lib/fields/field-logic/email-primary-select/email-primary-select.action.ts index 1eb0d4d3e..21f3af98b 100644 --- a/core/app/core/src/lib/fields/field-logic/email-primary-select/email-primary-select.action.ts +++ b/core/app/core/src/lib/fields/field-logic/email-primary-select/email-primary-select.action.ts @@ -26,7 +26,10 @@ import {Injectable} from '@angular/core'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; -import {Action, Field, isTrue, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {Field} from '../../../common/record/field.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {isTrue} from '../../../common/utils/value-utils'; @Injectable({ providedIn: 'root' diff --git a/core/app/core/src/lib/fields/field-logic/field-logic.action.ts b/core/app/core/src/lib/fields/field-logic/field-logic.action.ts index 938260ea1..daeba86c1 100644 --- a/core/app/core/src/lib/fields/field-logic/field-logic.action.ts +++ b/core/app/core/src/lib/fields/field-logic/field-logic.action.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Field, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; export interface FieldLogicActionData extends ActionData { field: Field, diff --git a/core/app/core/src/lib/fields/field-logic/field-logic.manager.ts b/core/app/core/src/lib/fields/field-logic/field-logic.manager.ts index 15b3341e3..0c2c2983a 100644 --- a/core/app/core/src/lib/fields/field-logic/field-logic.manager.ts +++ b/core/app/core/src/lib/fields/field-logic/field-logic.manager.ts @@ -27,7 +27,10 @@ import {Injectable} from '@angular/core'; import {BaseActionManager} from '../../services/actions/base-action-manager.service'; import {FieldLogicActionData, FieldLogicActionHandlerMap} from './field-logic.action'; -import {Action, ActionContext, Field, ModeActions, Record, ViewMode} from 'common'; +import {Action, ActionContext, ModeActions} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; import {FieldLogicDisplayTypeAction} from './display-type/field-logic-display-type.action'; import {EmailPrimarySelectAction} from './email-primary-select/email-primary-select.action'; import {RequiredAction} from './required/required.action'; diff --git a/core/app/core/src/lib/fields/field-logic/required/required.action.ts b/core/app/core/src/lib/fields/field-logic/required/required.action.ts index 4fd59fbf2..8337324e2 100644 --- a/core/app/core/src/lib/fields/field-logic/required/required.action.ts +++ b/core/app/core/src/lib/fields/field-logic/required/required.action.ts @@ -25,7 +25,10 @@ */ import {Injectable} from '@angular/core'; -import {Action, StringArrayMap, StringArrayMatrix, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; import {RequiredValidator} from '../../../services/record/validation/validators/required.validator'; import {ActiveFieldsChecker} from "../../../services/condition-operators/active-fields-checker.service"; diff --git a/core/app/core/src/lib/fields/field-logic/update-flex-relate-module/update-flex-relate-module.action.ts b/core/app/core/src/lib/fields/field-logic/update-flex-relate-module/update-flex-relate-module.action.ts index 777cbb165..8225a0cc1 100644 --- a/core/app/core/src/lib/fields/field-logic/update-flex-relate-module/update-flex-relate-module.action.ts +++ b/core/app/core/src/lib/fields/field-logic/update-flex-relate-module/update-flex-relate-module.action.ts @@ -25,7 +25,10 @@ */ import {Injectable} from '@angular/core'; -import {Action, Field, Record, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; @Injectable({ diff --git a/core/app/core/src/lib/fields/field-logic/update-value-backend/update-value-backend.action.ts b/core/app/core/src/lib/fields/field-logic/update-value-backend/update-value-backend.action.ts index ae946f15c..7e5ee5755 100644 --- a/core/app/core/src/lib/fields/field-logic/update-value-backend/update-value-backend.action.ts +++ b/core/app/core/src/lib/fields/field-logic/update-value-backend/update-value-backend.action.ts @@ -25,18 +25,16 @@ */ import {Injectable} from '@angular/core'; -import { - Action, - deepClone, - Field, - MapEntry, - Record, - RecordMapper, - RecordMapperRegistry, - StringArrayMap, - StringArrayMatrix, - ViewMode -} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {deepClone} from '../../../common/utils/object-utils'; +import {MapEntry} from '../../../common/types/overridable-map'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {RecordMapper} from '../../../common/record/record-mappers/record-mapper.model'; +import {RecordMapperRegistry} from '../../../common/record/record-mappers/record-mapper.registry'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; import {ProcessService} from '../../../services/process/process.service'; diff --git a/core/app/core/src/lib/fields/field-logic/update-value/update-value.action.ts b/core/app/core/src/lib/fields/field-logic/update-value/update-value.action.ts index cb6750627..748dd7ff8 100644 --- a/core/app/core/src/lib/fields/field-logic/update-value/update-value.action.ts +++ b/core/app/core/src/lib/fields/field-logic/update-value/update-value.action.ts @@ -26,7 +26,12 @@ import {Injectable} from '@angular/core'; import {FieldLogicActionData, FieldLogicActionHandler} from '../field-logic.action'; -import {Action, Field, Record, StringArrayMap, StringArrayMatrix, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; +import {Field} from '../../../common/record/field.model'; +import {StringArrayMap} from '../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../common/types/string-matrix'; +import {ViewMode} from '../../../common/views/view.model'; import {ActiveFieldsChecker} from "../../../services/condition-operators/active-fields-checker.service"; @Injectable({ diff --git a/core/app/core/src/lib/fields/field.component.spec.ts b/core/app/core/src/lib/fields/field.component.spec.ts index edd6b126f..4c821f9f2 100644 --- a/core/app/core/src/lib/fields/field.component.spec.ts +++ b/core/app/core/src/lib/fields/field.component.spec.ts @@ -35,7 +35,7 @@ import {TagInputModule} from 'ngx-chips'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {Field} from 'common'; +import {Field} from '../common/record/field.model'; import {UserPreferenceMockStore} from '../store/user-preference/user-preference.store.spec.mock'; import {SystemConfigStore} from '../store/system-config/system-config.store'; import {UserPreferenceStore} from '../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/field.component.ts b/core/app/core/src/lib/fields/field.component.ts index 40a5c1964..0a2b46a6e 100644 --- a/core/app/core/src/lib/fields/field.component.ts +++ b/core/app/core/src/lib/fields/field.component.ts @@ -26,7 +26,8 @@ import {Component, HostBinding, Input, OnInit} from '@angular/core'; import {viewFieldsMap} from './field.manifest'; -import {Field, Record, ViewMode} from 'common'; +import {Field} from '../common/record/field.model'; +import {Record} from '../common/record/record.model'; import {FieldRegistry} from './field.registry'; @Component({ diff --git a/core/app/core/src/lib/fields/field.registry.ts b/core/app/core/src/lib/fields/field.registry.ts index e6f1b5c5f..d5fbdee53 100644 --- a/core/app/core/src/lib/fields/field.registry.ts +++ b/core/app/core/src/lib/fields/field.registry.ts @@ -25,7 +25,7 @@ */ import {Injectable, Type} from '@angular/core'; -import {OverridableMap} from 'common'; +import {OverridableMap} from '../common/types/overridable-map'; import {BaseFieldComponent} from './base/base-field.component'; import {viewFieldsMap} from './field.manifest'; import {FieldComponentMap} from './field.model'; diff --git a/core/app/core/src/lib/fields/float/templates/detail/float.component.spec.ts b/core/app/core/src/lib/fields/float/templates/detail/float.component.spec.ts index 1b1c3091f..0e94115a6 100644 --- a/core/app/core/src/lib/fields/float/templates/detail/float.component.spec.ts +++ b/core/app/core/src/lib/fields/float/templates/detail/float.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {BehaviorSubject, of} from 'rxjs'; import {FloatDetailFieldComponent} from './float.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceMockStore} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/fullname/templates/detail/fullname.component.spec.ts b/core/app/core/src/lib/fields/fullname/templates/detail/fullname.component.spec.ts index 28de950d1..c72225f85 100644 --- a/core/app/core/src/lib/fields/fullname/templates/detail/fullname.component.spec.ts +++ b/core/app/core/src/lib/fields/fullname/templates/detail/fullname.component.spec.ts @@ -27,7 +27,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {FullNameDetailFieldsComponent} from './fullname.component'; import {Component} from '@angular/core'; -import {Field, Record} from 'common'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/group-field/group-field.component.spec.ts b/core/app/core/src/lib/fields/group-field/group-field.component.spec.ts index f5379ff10..4bd979aae 100644 --- a/core/app/core/src/lib/fields/group-field/group-field.component.spec.ts +++ b/core/app/core/src/lib/fields/group-field/group-field.component.spec.ts @@ -33,7 +33,7 @@ import {TagInputModule} from 'ngx-chips'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {Record} from 'common'; +import {Record} from '../../common/record/record.model'; import {baseFieldModules} from '../base-fields.manifest'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; import {UserPreferenceStore} from '../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/group-field/group-field.component.ts b/core/app/core/src/lib/fields/group-field/group-field.component.ts index b3ad70014..b4bd6d070 100644 --- a/core/app/core/src/lib/fields/group-field/group-field.component.ts +++ b/core/app/core/src/lib/fields/group-field/group-field.component.ts @@ -25,7 +25,8 @@ */ import {AfterViewInit, Component, ElementRef, HostListener, signal, ViewChild, WritableSignal} from '@angular/core'; -import {Field, FieldDefinition, ViewMode} from 'common'; +import {Field, FieldDefinition} from '../../common/record/field.model'; +import {ViewMode} from '../../common/views/view.model'; import {BaseFieldComponent} from '../base/base-field.component'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/fields/int/templates/detail/int.component.spec.ts b/core/app/core/src/lib/fields/int/templates/detail/int.component.spec.ts index e048b3e49..0e276c3a5 100644 --- a/core/app/core/src/lib/fields/int/templates/detail/int.component.spec.ts +++ b/core/app/core/src/lib/fields/int/templates/detail/int.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {IntDetailFieldComponent} from './int.component'; import {Component} from '@angular/core'; import {BehaviorSubject, of} from 'rxjs'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceMockStore} from '../../../../store/user-preference/user-preference.store.spec.mock'; import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/line-items/line-items.component.ts b/core/app/core/src/lib/fields/line-items/line-items.component.ts index 4f3eb5ca0..36aec9986 100644 --- a/core/app/core/src/lib/fields/line-items/line-items.component.ts +++ b/core/app/core/src/lib/fields/line-items/line-items.component.ts @@ -29,7 +29,8 @@ import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.s import {RecordManager} from '../../services/record/record.manager'; import {FieldLogicManager} from '../field-logic/field-logic.manager'; import {BaseLineItemsComponent} from '../base/base-line-items.component'; -import {ButtonInterface, EDITABLE_VIEW_MODES, ObjectMap, ViewMode} from 'common'; +import {ObjectMap} from '../../common/types/object-map'; +import {ButtonInterface} from '../../common/components/button/button.model'; import {FieldManager} from '../../services/record/field/field.manager'; import {FieldRegistry} from '../field.registry'; import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-display.manager'; diff --git a/core/app/core/src/lib/fields/multienum/templates/detail/multienum.component.spec.ts b/core/app/core/src/lib/fields/multienum/templates/detail/multienum.component.spec.ts index 50459b699..413a88021 100644 --- a/core/app/core/src/lib/fields/multienum/templates/detail/multienum.component.spec.ts +++ b/core/app/core/src/lib/fields/multienum/templates/detail/multienum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, OnDestroy, OnInit} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BehaviorSubject, of, Subscription} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {MultiEnumDetailFieldComponent} from './multienum.component'; diff --git a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.spec.ts b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.spec.ts index 574f1bd0b..fe81e264c 100644 --- a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.spec.ts +++ b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {TagInputModule} from 'ngx-chips'; import {UntypedFormControl, FormsModule} from '@angular/forms'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts index 53df2ea37..40a9afe05 100644 --- a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts +++ b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts @@ -34,7 +34,7 @@ import {ScreenSizeObserverService} from "../../../../services/ui/screen-size-obs import {take} from "rxjs/operators"; import {SystemConfigStore} from "../../../../store/system-config/system-config.store"; import {PrimeNGConfig} from "primeng/api"; -import {ButtonInterface} from "common"; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {MultiSelect} from "primeng/multiselect"; @Component({ diff --git a/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.spec.ts b/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.spec.ts index 4e5527a91..1ca6df9a2 100644 --- a/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.spec.ts +++ b/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {MultiEnumFilterFieldComponent} from './multienum.component'; import {UntypedFormControl, FormsModule} from '@angular/forms'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {TagInputModule} from 'ngx-chips'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/core/app/core/src/lib/fields/phone/templates/detail/phone.component.spec.ts b/core/app/core/src/lib/fields/phone/templates/detail/phone.component.spec.ts index da3096eb8..1c3aa5560 100644 --- a/core/app/core/src/lib/fields/phone/templates/detail/phone.component.spec.ts +++ b/core/app/core/src/lib/fields/phone/templates/detail/phone.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {PhoneDetailFieldComponent} from './phone.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/radioenum/templates/detail/radioenum.component.spec.ts b/core/app/core/src/lib/fields/radioenum/templates/detail/radioenum.component.spec.ts index 58875bb75..e5ca517bc 100644 --- a/core/app/core/src/lib/fields/radioenum/templates/detail/radioenum.component.spec.ts +++ b/core/app/core/src/lib/fields/radioenum/templates/detail/radioenum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, OnDestroy, OnInit} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BehaviorSubject, of, Subscription} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.spec.ts b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.spec.ts index e04c36ba7..422ee8c38 100644 --- a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.spec.ts +++ b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts index 59ea5d232..695cd61cf 100644 --- a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts +++ b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts @@ -27,8 +27,8 @@ import {Component} from '@angular/core'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {BaseEnumComponent} from '../../../base/base-enum.component'; +import {Option} from '../../../../common/record/field.model'; import {LanguageListStringMap, LanguageStore} from '../../../../store/language/language.store'; -import {Option, isEmptyString} from 'common'; import {UntypedFormGroup} from '@angular/forms'; import {FieldLogicManager} from '../../../field-logic/field-logic.manager'; import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager'; diff --git a/core/app/core/src/lib/fields/relate/templates/detail/relate.component.spec.ts b/core/app/core/src/lib/fields/relate/templates/detail/relate.component.spec.ts index d3e2236e3..21b7a804d 100644 --- a/core/app/core/src/lib/fields/relate/templates/detail/relate.component.spec.ts +++ b/core/app/core/src/lib/fields/relate/templates/detail/relate.component.spec.ts @@ -27,7 +27,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {RelateDetailFieldComponent} from './relate.component'; import {Component} from '@angular/core'; -import {Field, Record} from 'common'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; import {RouterTestingModule} from '@angular/router/testing'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; diff --git a/core/app/core/src/lib/fields/relate/templates/edit/relate.component.spec.ts b/core/app/core/src/lib/fields/relate/templates/edit/relate.component.spec.ts index 71808ce7a..37459caf9 100644 --- a/core/app/core/src/lib/fields/relate/templates/edit/relate.component.spec.ts +++ b/core/app/core/src/lib/fields/relate/templates/edit/relate.component.spec.ts @@ -26,7 +26,8 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {Field, Record} from 'common'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; import {RouterTestingModule} from '@angular/router/testing'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/core/app/core/src/lib/fields/relate/templates/edit/relate.component.ts b/core/app/core/src/lib/fields/relate/templates/edit/relate.component.ts index cfbeb748a..dbd0d9c69 100644 --- a/core/app/core/src/lib/fields/relate/templates/edit/relate.component.ts +++ b/core/app/core/src/lib/fields/relate/templates/edit/relate.component.ts @@ -25,7 +25,10 @@ */ import {Component, ElementRef, ViewChild} from '@angular/core'; -import {AttributeMap, ButtonInterface, emptyObject, Field, Record} from 'common'; +import {emptyObject} from '../../../../common/utils/object-utils'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {Field} from '../../../../common/record/field.model'; +import {Record, AttributeMap} from '../../../../common/record/record.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/fields/relate/templates/filter/relate.component.spec.ts b/core/app/core/src/lib/fields/relate/templates/filter/relate.component.spec.ts index 3a1053a82..33ea9fc28 100644 --- a/core/app/core/src/lib/fields/relate/templates/filter/relate.component.spec.ts +++ b/core/app/core/src/lib/fields/relate/templates/filter/relate.component.spec.ts @@ -26,7 +26,9 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {Field, Record, SearchCriteriaFieldFilter} from 'common'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {SearchCriteriaFieldFilter} from '../../../../common/views/list/search-criteria.model'; import {RouterTestingModule} from '@angular/router/testing'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/core/app/core/src/lib/fields/relate/templates/filter/relate.component.ts b/core/app/core/src/lib/fields/relate/templates/filter/relate.component.ts index e7df6c22a..a2032e144 100644 --- a/core/app/core/src/lib/fields/relate/templates/filter/relate.component.ts +++ b/core/app/core/src/lib/fields/relate/templates/filter/relate.component.ts @@ -25,7 +25,12 @@ */ import {Component, ElementRef, ViewChild} from '@angular/core'; -import {AttributeMap, ButtonInterface, deepClone, Field, ObjectMap, Record} from 'common'; +import {AttributeMap} from '../../../../common/record/record.model'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {ObjectMap} from '../../../../common/types/object-map'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/fields/text/templates/detail/text.component.spec.ts b/core/app/core/src/lib/fields/text/templates/detail/text.component.spec.ts index a280e6924..a4238f1ff 100644 --- a/core/app/core/src/lib/fields/text/templates/detail/text.component.spec.ts +++ b/core/app/core/src/lib/fields/text/templates/detail/text.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {TextDetailFieldComponent} from './text.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/text/templates/edit/text.component.spec.ts b/core/app/core/src/lib/fields/text/templates/edit/text.component.spec.ts index b91989192..82147d63e 100644 --- a/core/app/core/src/lib/fields/text/templates/edit/text.component.spec.ts +++ b/core/app/core/src/lib/fields/text/templates/edit/text.component.spec.ts @@ -37,7 +37,7 @@ import {userPreferenceStoreMock} from '../../../../store/user-preference/user-pr import {DatetimeFormatter} from '../../../../services/formatters/datetime/datetime-formatter.service'; import {numberFormatterMock} from '../../../../services/formatters/number/number-formatter.spec.mock'; import {NumberFormatter} from '../../../../services/formatters/number/number-formatter.service'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; @Component({ selector: 'text-edit-field-test-host-component', diff --git a/core/app/core/src/lib/fields/url/templates/detail/url.component.spec.ts b/core/app/core/src/lib/fields/url/templates/detail/url.component.spec.ts index 868facb49..7c6d03951 100644 --- a/core/app/core/src/lib/fields/url/templates/detail/url.component.spec.ts +++ b/core/app/core/src/lib/fields/url/templates/detail/url.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {UrlDetailFieldComponent} from './url.component'; -import {Field, FieldMetadata} from 'common'; +import {Field, FieldMetadata} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/varchar/templates/detail/varchar.component.spec.ts b/core/app/core/src/lib/fields/varchar/templates/detail/varchar.component.spec.ts index 905ccd295..ee7cc34fe 100644 --- a/core/app/core/src/lib/fields/varchar/templates/detail/varchar.component.spec.ts +++ b/core/app/core/src/lib/fields/varchar/templates/detail/varchar.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {VarcharDetailFieldComponent} from './varchar.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/varchar/templates/edit/varchar.component.spec.ts b/core/app/core/src/lib/fields/varchar/templates/edit/varchar.component.spec.ts index dfd0f8a03..50de84236 100644 --- a/core/app/core/src/lib/fields/varchar/templates/edit/varchar.component.spec.ts +++ b/core/app/core/src/lib/fields/varchar/templates/edit/varchar.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {VarcharEditFieldComponent} from './varchar.component'; import {UntypedFormControl, FormsModule} from '@angular/forms'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {dateFormatterMock} from '../../../../services/formatters/datetime/date-formatter.service.spec.mock'; import {DateFormatter} from '../../../../services/formatters/datetime/date-formatter.service'; diff --git a/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.spec.ts b/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.spec.ts index 076c990ba..7930963e5 100644 --- a/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.spec.ts +++ b/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; import {VarcharFilterFieldComponent} from './filter.component'; -import {Field} from 'common'; +import {Field} from '../../../../common/record/field.model'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {UntypedFormControl} from '@angular/forms'; import {VarcharFilterFieldModule} from './filter.module'; diff --git a/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.ts b/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.ts index a20027cea..880eb08d8 100644 --- a/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.ts +++ b/core/app/core/src/lib/fields/varchar/templates/filter/filter.component.ts @@ -25,7 +25,7 @@ */ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {isVoid} from 'common'; +import {isVoid} from '../../../../common/utils/value-utils'; import {BaseFieldComponent} from '../../../base/base-field.component'; import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; import {FieldLogicManager} from '../../../field-logic/field-logic.manager'; diff --git a/core/app/core/src/lib/services/actions/action-logic-handler.ts b/core/app/core/src/lib/services/actions/action-logic-handler.ts index f82b943f4..2795f98e7 100644 --- a/core/app/core/src/lib/services/actions/action-logic-handler.ts +++ b/core/app/core/src/lib/services/actions/action-logic-handler.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData} from 'common'; +import {Action, ActionData} from '../../common/actions/action.model'; export abstract class ActionLogicHandler { diff --git a/core/app/core/src/lib/services/actions/base-action-manager.service.ts b/core/app/core/src/lib/services/actions/base-action-manager.service.ts index 78a6c0d0c..3f29e68c5 100644 --- a/core/app/core/src/lib/services/actions/base-action-manager.service.ts +++ b/core/app/core/src/lib/services/actions/base-action-manager.service.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionData, ActionHandler, ActionHandlerMap, ActionManager, ViewMode} from 'common'; +import {Action, ActionData, ActionHandler, ActionHandlerMap, ActionManager} from '../../common/actions/action.model'; +import {ViewMode} from '../../common/views/view.model'; @Injectable({ providedIn: 'root', diff --git a/core/app/core/src/lib/services/actions/base-action.adapter.ts b/core/app/core/src/lib/services/actions/base-action.adapter.ts index fee60f51d..605bc77be 100644 --- a/core/app/core/src/lib/services/actions/base-action.adapter.ts +++ b/core/app/core/src/lib/services/actions/base-action.adapter.ts @@ -31,10 +31,10 @@ import { ActionDataSource, ActionHandler, ActionManager, - ModeActions, - Record, - ViewMode -} from 'common'; + ModeActions +} from '../../common/actions/action.model'; +import {Record} from '../../common/record/record.model'; +import {ViewMode} from '../../common/views/view.model'; import {Observable} from 'rxjs'; import {take} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/services/actions/base-record-action.adapter.ts b/core/app/core/src/lib/services/actions/base-record-action.adapter.ts index ece6cd4d9..e8cc280df 100644 --- a/core/app/core/src/lib/services/actions/base-record-action.adapter.ts +++ b/core/app/core/src/lib/services/actions/base-record-action.adapter.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, ActionManager} from 'common'; +import {Action, ActionContext, ActionManager} from '../../common/actions/action.model'; import {AsyncActionInput, AsyncActionService} from '../process/processes/async-action/async-action'; import {MessageService} from '../message/message.service'; import {ConfirmationModalService} from '../modals/confirmation-modal.service'; diff --git a/core/app/core/src/lib/services/auth/auth-guard.service.ts b/core/app/core/src/lib/services/auth/auth-guard.service.ts index dc14f76b3..5ecf2153f 100644 --- a/core/app/core/src/lib/services/auth/auth-guard.service.ts +++ b/core/app/core/src/lib/services/auth/auth-guard.service.ts @@ -33,7 +33,8 @@ import {Process} from '../process/process.service'; import {AsyncActionInput, AsyncActionService} from '../process/processes/async-action/async-action'; import {AppStateStore} from '../../store/app-state/app-state.store'; import {RouteConverter, RouteInfo} from '../navigation/route-converter/route-converter.service'; -import {emptyObject, isEmptyString} from 'common'; +import {isEmptyString} from '../../common/utils/value-utils'; +import {emptyObject} from '../../common/utils/object-utils'; import {LanguageStore} from '../../store/language/language.store'; import {NotificationStore} from '../../store/notification/notification.store'; diff --git a/core/app/core/src/lib/services/auth/auth.service.spec.ts b/core/app/core/src/lib/services/auth/auth.service.spec.ts index 4a5bc53b4..652c70894 100644 --- a/core/app/core/src/lib/services/auth/auth.service.spec.ts +++ b/core/app/core/src/lib/services/auth/auth.service.spec.ts @@ -26,7 +26,7 @@ import {TestBed} from '@angular/core/testing'; import {AuthService} from './auth.service'; -import {HttpHeaders, HttpParams} from '@angular/common/http'; +import { HttpHeaders, HttpParams } from '@angular/common/http'; import {of} from 'rxjs'; import {localStorageServiceMock} from '../local-storage/local-storage.service.spec.mock'; diff --git a/core/app/core/src/lib/services/auth/auth.service.ts b/core/app/core/src/lib/services/auth/auth.service.ts index d6bc3b17d..58279b35e 100644 --- a/core/app/core/src/lib/services/auth/auth.service.ts +++ b/core/app/core/src/lib/services/auth/auth.service.ts @@ -26,10 +26,11 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; -import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http'; +import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http'; import {BehaviorSubject, Observable, Subscription, throwError} from 'rxjs'; import {catchError, distinctUntilChanged, filter, finalize, take} from 'rxjs/operators'; -import {isEmptyString, isTrue, User} from 'common'; +import {User} from '../../common/types/user'; +import {isTrue, isEmptyString} from '../../common/utils/value-utils'; import {MessageService} from '../message/message.service'; import {StateManager} from '../../store/state-manager'; import {LanguageStore} from '../../store/language/language.store'; diff --git a/core/app/core/src/lib/services/auth/error.interceptor.ts b/core/app/core/src/lib/services/auth/error.interceptor.ts index 1abaf1d1f..7cb47c94a 100644 --- a/core/app/core/src/lib/services/auth/error.interceptor.ts +++ b/core/app/core/src/lib/services/auth/error.interceptor.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor} from '@angular/common/http'; +import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http'; import {Observable, throwError} from 'rxjs'; import {catchError} from 'rxjs/operators'; diff --git a/core/app/core/src/lib/services/condition-operators/active-fields-checker.service.ts b/core/app/core/src/lib/services/condition-operators/active-fields-checker.service.ts index ac5b12cc8..9850d1bf1 100644 --- a/core/app/core/src/lib/services/condition-operators/active-fields-checker.service.ts +++ b/core/app/core/src/lib/services/condition-operators/active-fields-checker.service.ts @@ -25,7 +25,13 @@ */ import {Injectable} from '@angular/core'; -import {Field, Record, StringArrayMap, StringArrayMatrix, isFalse, isTrue, LogicRuleValues} from "common"; +import {Record} from '../../common/record/record.model'; +import {Field} from '../../common/record/field.model'; +import {StringArrayMap} from '../../common/types/string-map'; +import {StringArrayMatrix} from '../../common/types/string-matrix'; +import {isFalse} from ''; +import {isTrue} from ''; +import {LogicRuleValues} from ''; import {isEmpty} from "lodash-es"; import {ConditionOperatorManager} from "./condition-operator.manager"; diff --git a/core/app/core/src/lib/services/condition-operators/condition-operator.action.ts b/core/app/core/src/lib/services/condition-operators/condition-operator.action.ts index aaf5b61aa..67a1b632f 100644 --- a/core/app/core/src/lib/services/condition-operators/condition-operator.action.ts +++ b/core/app/core/src/lib/services/condition-operators/condition-operator.action.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionData, Field, Record, LogicRuleValues} from 'common'; +import {ActionData} from '../../common/actions/action.model'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {LogicRuleValues} from '../../common/metadata/metadata.model'; export interface ConditionOperatorActionData extends ActionData { field: Field, diff --git a/core/app/core/src/lib/services/condition-operators/condition-operator.model.ts b/core/app/core/src/lib/services/condition-operators/condition-operator.model.ts index d69dd8b11..d08d48b7b 100644 --- a/core/app/core/src/lib/services/condition-operators/condition-operator.model.ts +++ b/core/app/core/src/lib/services/condition-operators/condition-operator.model.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Field, Record, LogicRuleValues} from 'common'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {LogicRuleValues} from '../../common/metadata/metadata.model'; export interface ConditionOperatorModel { key: string; diff --git a/core/app/core/src/lib/services/condition-operators/greater-than/greater-than.action.ts b/core/app/core/src/lib/services/condition-operators/greater-than/greater-than.action.ts index 0a40b4c75..958a5f3de 100644 --- a/core/app/core/src/lib/services/condition-operators/greater-than/greater-than.action.ts +++ b/core/app/core/src/lib/services/condition-operators/greater-than/greater-than.action.ts @@ -26,7 +26,9 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field,LogicRuleValues} from 'common'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; import {ConditionOperatorModel} from '../condition-operator.model'; @Injectable({ diff --git a/core/app/core/src/lib/services/condition-operators/is-empty/is-empty.action.ts b/core/app/core/src/lib/services/condition-operators/is-empty/is-empty.action.ts index a461a315f..4a841da8a 100644 --- a/core/app/core/src/lib/services/condition-operators/is-empty/is-empty.action.ts +++ b/core/app/core/src/lib/services/condition-operators/is-empty/is-empty.action.ts @@ -26,7 +26,10 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field, isEmptyString, LogicRuleValues} from 'common'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; +import {isEmptyString} from '../../../common/utils/value-utils'; +import {Record} from '../../../common/record/record.model'; +import {Field} from '../../../common/record/field.model'; import {ConditionOperatorModel} from '../condition-operator.model'; @Injectable({ diff --git a/core/app/core/src/lib/services/condition-operators/is-equal/is-equal.action.ts b/core/app/core/src/lib/services/condition-operators/is-equal/is-equal.action.ts index 86ec5bbfd..6444dee94 100644 --- a/core/app/core/src/lib/services/condition-operators/is-equal/is-equal.action.ts +++ b/core/app/core/src/lib/services/condition-operators/is-equal/is-equal.action.ts @@ -26,7 +26,9 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field, LogicRuleValues, isTrue, isFalse} from 'common'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; import {ConditionOperatorModel} from '../condition-operator.model'; @Injectable({ diff --git a/core/app/core/src/lib/services/condition-operators/less-than/less-than.action.ts b/core/app/core/src/lib/services/condition-operators/less-than/less-than.action.ts index b53de9948..d9ad793b2 100644 --- a/core/app/core/src/lib/services/condition-operators/less-than/less-than.action.ts +++ b/core/app/core/src/lib/services/condition-operators/less-than/less-than.action.ts @@ -26,7 +26,9 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field, LogicRuleValues} from 'common'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; import {ConditionOperatorModel} from '../condition-operator.model'; @Injectable({ diff --git a/core/app/core/src/lib/services/condition-operators/not-empty/not-empty.action.ts b/core/app/core/src/lib/services/condition-operators/not-empty/not-empty.action.ts index 1c52aa829..f66479252 100644 --- a/core/app/core/src/lib/services/condition-operators/not-empty/not-empty.action.ts +++ b/core/app/core/src/lib/services/condition-operators/not-empty/not-empty.action.ts @@ -26,8 +26,11 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field, isEmptyString, LogicRuleValues} from 'common'; import {ConditionOperatorModel} from '../condition-operator.model'; +import {isEmptyString} from '../../../common/utils/value-utils'; +import {Record} from '../../../common/record/record.model'; +import {Field} from '../../../common/record/field.model'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; @Injectable({ providedIn: 'root' diff --git a/core/app/core/src/lib/services/condition-operators/not-equal/not-equal.action.ts b/core/app/core/src/lib/services/condition-operators/not-equal/not-equal.action.ts index 9ff6f4f2f..3c9e7ce08 100644 --- a/core/app/core/src/lib/services/condition-operators/not-equal/not-equal.action.ts +++ b/core/app/core/src/lib/services/condition-operators/not-equal/not-equal.action.ts @@ -26,7 +26,9 @@ import {Injectable} from '@angular/core'; import {ConditionOperatorActionHandler} from '../condition-operator.action'; -import {Record, Field, LogicRuleValues} from 'common'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {LogicRuleValues} from '../../../common/metadata/metadata.model'; import {ConditionOperatorModel} from '../condition-operator.model'; @Injectable({ diff --git a/core/app/core/src/lib/services/currency/currency.service.ts b/core/app/core/src/lib/services/currency/currency.service.ts index e3530e924..ab44a9c74 100644 --- a/core/app/core/src/lib/services/currency/currency.service.ts +++ b/core/app/core/src/lib/services/currency/currency.service.ts @@ -26,7 +26,8 @@ import {Injectable} from '@angular/core'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; -import {Field, Record} from 'common'; +import {Field} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; import {divide, multiply, round} from 'mathjs'; import {UserPreferenceStore} from '../../store/user-preference/user-preference.store'; diff --git a/core/app/core/src/lib/services/extensions/extension-loader.service.ts b/core/app/core/src/lib/services/extensions/extension-loader.service.ts index f3f806af2..67758b8aa 100644 --- a/core/app/core/src/lib/services/extensions/extension-loader.service.ts +++ b/core/app/core/src/lib/services/extensions/extension-loader.service.ts @@ -30,7 +30,7 @@ import {LoadChildrenCallback} from '@angular/router'; import {map} from 'rxjs/operators'; import {loadRemoteModule} from '@angular-architects/module-federation-runtime'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; -import {isFalse} from 'common'; +import {isFalse} from '../../common/utils/value-utils'; interface ExtensionConfig { remoteEntry?: string, diff --git a/core/app/core/src/lib/services/formatters/currency/currency-formatter.service.ts b/core/app/core/src/lib/services/formatters/currency/currency-formatter.service.ts index e13ce9bb5..f4afd5cd4 100644 --- a/core/app/core/src/lib/services/formatters/currency/currency-formatter.service.ts +++ b/core/app/core/src/lib/services/formatters/currency/currency-formatter.service.ts @@ -29,7 +29,7 @@ import {UserPreferenceStore} from '../../../store/user-preference/user-preferenc import {formatCurrency, formatNumber} from '@angular/common'; import {NumberFormatter} from '../number/number-formatter.service'; import {FormatOptions, Formatter} from '../formatter.model'; -import {isVoid} from 'common'; +import {isVoid} from '../../../common/utils/value-utils'; export interface CurrencyFormat { iso4217: string; diff --git a/core/app/core/src/lib/services/formatters/formatter.model.ts b/core/app/core/src/lib/services/formatters/formatter.model.ts index 671332d3c..4831ba9bb 100644 --- a/core/app/core/src/lib/services/formatters/formatter.model.ts +++ b/core/app/core/src/lib/services/formatters/formatter.model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ViewMode} from 'common'; +import {ViewMode} from '../../common/views/view.model'; export interface FormatOptions { [key: string]: any; diff --git a/core/app/core/src/lib/services/formatters/number/number-formatter.service.ts b/core/app/core/src/lib/services/formatters/number/number-formatter.service.ts index 784553335..622df4319 100644 --- a/core/app/core/src/lib/services/formatters/number/number-formatter.service.ts +++ b/core/app/core/src/lib/services/formatters/number/number-formatter.service.ts @@ -28,7 +28,7 @@ import {Inject, Injectable, LOCALE_ID} from '@angular/core'; import {UserPreferenceStore} from '../../../store/user-preference/user-preference.store'; import {formatNumber} from '@angular/common'; import {FormatOptions, Formatter} from '../formatter.model'; -import {isFalse, isVoid} from 'common'; +import {isFalse, isVoid} from '../../../common/utils/value-utils'; import {FormControlUtils} from '../../record/field/form-control.utils'; @Injectable({ diff --git a/core/app/core/src/lib/services/language/dynamic-label.service.spec.ts b/core/app/core/src/lib/services/language/dynamic-label.service.spec.ts index 2ceaa4608..003527a55 100644 --- a/core/app/core/src/lib/services/language/dynamic-label.service.spec.ts +++ b/core/app/core/src/lib/services/language/dynamic-label.service.spec.ts @@ -26,7 +26,7 @@ import {TestBed} from '@angular/core/testing'; import {dynamicLabelsMock} from './dynamic-label.service.spec.mock'; -import {Field, FieldDefinition} from 'common'; +import {Field, FieldDefinition} from '../../common/record/field.model'; describe('DynamicLabel', () => { const service = dynamicLabelsMock; diff --git a/core/app/core/src/lib/services/language/dynamic-label.service.ts b/core/app/core/src/lib/services/language/dynamic-label.service.ts index 42bd27696..d5003304f 100644 --- a/core/app/core/src/lib/services/language/dynamic-label.service.ts +++ b/core/app/core/src/lib/services/language/dynamic-label.service.ts @@ -26,7 +26,9 @@ import {Injectable} from '@angular/core'; import {DataTypeFormatter} from '../formatters/data-type.formatter.service'; -import {Field, FieldMap, isVoid, StringMap} from 'common'; +import {StringMap} from '../../common/types/string-map'; +import {isVoid} from '../../common/utils/value-utils'; +import {Field, FieldMap} from '../../common/record/field.model'; import {LanguageStore} from '../../store/language/language.store'; import get from 'lodash-es/get'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/services/message/message.service.ts b/core/app/core/src/lib/services/message/message.service.ts index 49c5c78e5..1a3740eb2 100644 --- a/core/app/core/src/lib/services/message/message.service.ts +++ b/core/app/core/src/lib/services/message/message.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {Message, MessageTypes} from 'common'; +import {Message, MessageTypes} from '../../common/types/messages'; import {BehaviorSubject, Observable} from 'rxjs'; import {SystemConfigStore} from '../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/services/modals/confirmation-modal.service.ts b/core/app/core/src/lib/services/modals/confirmation-modal.service.ts index 413a74aba..d61f169f0 100644 --- a/core/app/core/src/lib/services/modals/confirmation-modal.service.ts +++ b/core/app/core/src/lib/services/modals/confirmation-modal.service.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {MessageModalComponent} from '../../components/modal/components/message-modal/message-modal.component'; -import {ModalButtonInterface} from 'common'; +import {ModalButtonInterface} from '../../common/components/modal/modal.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; @Injectable({ diff --git a/core/app/core/src/lib/services/modals/select-modal.service.ts b/core/app/core/src/lib/services/modals/select-modal.service.ts index bbabd8fa5..b1c1fbe80 100644 --- a/core/app/core/src/lib/services/modals/select-modal.service.ts +++ b/core/app/core/src/lib/services/modals/select-modal.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {Record} from 'common'; +import {Record} from '../../common/record/record.model'; import {RecordListModalComponent} from '../../containers/record-list-modal/components/record-list-modal/record-list-modal.component'; import {RecordListModalResult} from '../../containers/record-list-modal/components/record-list-modal/record-list-modal.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; diff --git a/core/app/core/src/lib/services/navigation/action-name-mapper/action-name-mapper.service.ts b/core/app/core/src/lib/services/navigation/action-name-mapper/action-name-mapper.service.ts index cfa0f9b4e..97a06721f 100644 --- a/core/app/core/src/lib/services/navigation/action-name-mapper/action-name-mapper.service.ts +++ b/core/app/core/src/lib/services/navigation/action-name-mapper/action-name-mapper.service.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; -import {StringMap} from 'common'; +import {StringMap} from '../../../common/types/string-map'; @Injectable({providedIn: 'root'}) export class ActionNameMapper { diff --git a/core/app/core/src/lib/services/navigation/favorites/favorites.service.ts b/core/app/core/src/lib/services/navigation/favorites/favorites.service.ts index 4d8b322f0..47396ef36 100644 --- a/core/app/core/src/lib/services/navigation/favorites/favorites.service.ts +++ b/core/app/core/src/lib/services/navigation/favorites/favorites.service.ts @@ -1,6 +1,33 @@ +/** + * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. + * Copyright (C) 2022 SalesAgility Ltd. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License version 3 as published by the + * Free Software Foundation with the addition of the following permission added + * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK + * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE + * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. + * + * This program 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 Affero General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * In accordance with Section 7(b) of the GNU Affero General Public License + * version 3, these Appropriate Legal Notices must retain the display of the + * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably + * feasible for technical reasons, the Appropriate Legal Notices must display + * the words "Supercharged by SuiteCRM". + */ + import {Injectable} from '@angular/core'; import {MetadataStore} from '../../../store/metadata/metadata.store.service'; -import {deepClone, Favorite} from 'common'; +import {Favorite} from '../../../common/record/favorites.model'; +import {deepClone} from '../../../common/utils/object-utils'; import {ProcessService} from '../../process/process.service'; import {take} from 'rxjs/operators'; diff --git a/core/app/core/src/lib/services/navigation/legacy-entrypoint-link-builder/legacy-entrypoint-link-builder.service.ts b/core/app/core/src/lib/services/navigation/legacy-entrypoint-link-builder/legacy-entrypoint-link-builder.service.ts index 2e98b8f6d..015ae602c 100644 --- a/core/app/core/src/lib/services/navigation/legacy-entrypoint-link-builder/legacy-entrypoint-link-builder.service.ts +++ b/core/app/core/src/lib/services/navigation/legacy-entrypoint-link-builder/legacy-entrypoint-link-builder.service.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {Params} from '@angular/router'; -import {HttpParams} from "@angular/common/http"; +import { HttpParams } from "@angular/common/http"; @Injectable({providedIn: 'root'}) export class LegacyEntrypointLinkBuilder { diff --git a/core/app/core/src/lib/services/navigation/link-route-async-action/link-route-async-action.service.ts b/core/app/core/src/lib/services/navigation/link-route-async-action/link-route-async-action.service.ts index 908262014..3f867c3ce 100644 --- a/core/app/core/src/lib/services/navigation/link-route-async-action/link-route-async-action.service.ts +++ b/core/app/core/src/lib/services/navigation/link-route-async-action/link-route-async-action.service.ts @@ -26,7 +26,8 @@ import {Injectable} from '@angular/core'; import {AsyncActionInput, AsyncActionService} from '../../process/processes/async-action/async-action'; -import {Field, Record} from 'common'; +import {Field} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; @Injectable({ providedIn: 'root', diff --git a/core/app/core/src/lib/services/navigation/module-name-mapper/module-name-mapper.service.ts b/core/app/core/src/lib/services/navigation/module-name-mapper/module-name-mapper.service.ts index 0a75a1c73..6317e4353 100644 --- a/core/app/core/src/lib/services/navigation/module-name-mapper/module-name-mapper.service.ts +++ b/core/app/core/src/lib/services/navigation/module-name-mapper/module-name-mapper.service.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; -import {StringMap} from 'common'; +import {StringMap} from '../../../common/types/string-map'; @Injectable({providedIn: 'root'}) export class ModuleNameMapper { diff --git a/core/app/core/src/lib/services/navigation/module-navigation/module-navigation.service.ts b/core/app/core/src/lib/services/navigation/module-navigation/module-navigation.service.ts index ddbc80c65..83189e729 100644 --- a/core/app/core/src/lib/services/navigation/module-navigation/module-navigation.service.ts +++ b/core/app/core/src/lib/services/navigation/module-navigation/module-navigation.service.ts @@ -28,7 +28,8 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; import {ModuleAction, NavbarModule, Navigation} from '../../../store/navigation/navigation.store'; import {LanguageListStringMap, LanguageStrings} from '../../../store/language/language.store'; -import {MenuItem, Record} from 'common'; +import {MenuItem} from '../../../common/menu/menu.model'; +import {Record} from '../../../common/record/record.model'; import {ModuleNameMapper} from '../module-name-mapper/module-name-mapper.service'; import {ActionNameMapper} from '../action-name-mapper/action-name-mapper.service'; diff --git a/core/app/core/src/lib/services/navigation/recently-viewed/recently-viewed.service.ts b/core/app/core/src/lib/services/navigation/recently-viewed/recently-viewed.service.ts index bca022883..497656817 100644 --- a/core/app/core/src/lib/services/navigation/recently-viewed/recently-viewed.service.ts +++ b/core/app/core/src/lib/services/navigation/recently-viewed/recently-viewed.service.ts @@ -1,6 +1,33 @@ +/** + * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. + * Copyright (C) 2022 SalesAgility Ltd. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License version 3 as published by the + * Free Software Foundation with the addition of the following permission added + * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK + * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE + * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. + * + * This program 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 Affero General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * In accordance with Section 7(b) of the GNU Affero General Public License + * version 3, these Appropriate Legal Notices must retain the display of the + * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably + * feasible for technical reasons, the Appropriate Legal Notices must display + * the words "Supercharged by SuiteCRM". + */ import {Injectable} from '@angular/core'; import {MetadataStore} from '../../../store/metadata/metadata.store.service'; -import {deepClone, RecentlyViewed, ViewMode} from 'common'; +import {RecentlyViewed} from '../../../common/record/recently-viewed.model'; +import {deepClone} from '../../../common/utils/object-utils'; +import {ViewMode} from '../../../common/views/view.model'; import {ProcessService} from '../../process/process.service'; import {take} from 'rxjs/operators'; import {ActivatedRouteSnapshot} from '@angular/router'; diff --git a/core/app/core/src/lib/services/navigation/route-converter/route-converter.service.ts b/core/app/core/src/lib/services/navigation/route-converter/route-converter.service.ts index 43d08b00d..79267ba51 100644 --- a/core/app/core/src/lib/services/navigation/route-converter/route-converter.service.ts +++ b/core/app/core/src/lib/services/navigation/route-converter/route-converter.service.ts @@ -32,7 +32,7 @@ import { UrlSegment, UrlSegmentGroup, UrlTree } from '@angular/router'; -import {HttpParams} from '@angular/common/http'; +import { HttpParams } from '@angular/common/http'; import {ModuleNameMapper} from '../module-name-mapper/module-name-mapper.service'; import {ActionNameMapper} from '../action-name-mapper/action-name-mapper.service'; import {SystemConfigStore} from '../../../store/system-config/system-config.store'; diff --git a/core/app/core/src/lib/services/process/processes/async-action/async-action.ts b/core/app/core/src/lib/services/process/processes/async-action/async-action.ts index ac01694ac..500ec2ec0 100644 --- a/core/app/core/src/lib/services/process/processes/async-action/async-action.ts +++ b/core/app/core/src/lib/services/process/processes/async-action/async-action.ts @@ -31,7 +31,9 @@ import {Process, ProcessService} from '../../process.service'; import {AppStateStore} from '../../../../store/app-state/app-state.store'; import {MessageService} from '../../../message/message.service'; import {AsyncActionHandler} from './async-action.model'; -import {Record, SearchCriteria, SortingSelection} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; +import {SortingSelection} from '../../../../common/views/list/list-navigation.model'; import {RedirectAsyncAction} from './actions/redirect/redirect.async-action'; import {ExportAsyncAction} from './actions/export/export.async-action'; import {NoopAsyncAction} from './actions/noop/noop.async-action'; diff --git a/core/app/core/src/lib/services/record/field/attribute.builder.ts b/core/app/core/src/lib/services/record/field/attribute.builder.ts index 1c862c462..14ecff79b 100644 --- a/core/app/core/src/lib/services/record/field/attribute.builder.ts +++ b/core/app/core/src/lib/services/record/field/attribute.builder.ts @@ -25,7 +25,9 @@ */ import {FieldBuilder} from './field.builder'; -import {Field, FieldAttribute, FieldDefinition, FieldMap, Record, ViewFieldDefinition} from 'common'; +import {Field, FieldAttribute, FieldMap, FieldDefinition} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {ValidationManager} from '../validation/validation.manager'; import {DataTypeFormatter} from '../../formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/services/record/field/field-object-type.manifest.ts b/core/app/core/src/lib/services/record/field/field-object-type.manifest.ts index 9b1c7711a..d72257a85 100644 --- a/core/app/core/src/lib/services/record/field/field-object-type.manifest.ts +++ b/core/app/core/src/lib/services/record/field/field-object-type.manifest.ts @@ -25,7 +25,7 @@ */ import {FieldObjectTypeMap} from "./field-object.model"; -import {BaseField} from 'common'; +import {BaseField} from '../../../common/record/field.model'; import {MultiEnumField} from "./types/multi-enum.value-object-type"; diff --git a/core/app/core/src/lib/services/record/field/field-object-type.registry.ts b/core/app/core/src/lib/services/record/field/field-object-type.registry.ts index db3c72fd8..3f84668eb 100644 --- a/core/app/core/src/lib/services/record/field/field-object-type.registry.ts +++ b/core/app/core/src/lib/services/record/field/field-object-type.registry.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {BaseField, BaseTypeRegistry} from 'common'; +import {BaseField} from '../../../common/record/field.model'; +import {BaseTypeRegistry} from '../../../common/registry/base-type.registry'; import {FieldObjectTypeMap} from "./field-object.model"; import {baseObjectFieldsTypeMap} from "./field-object-type.manifest"; diff --git a/core/app/core/src/lib/services/record/field/field-object.model.ts b/core/app/core/src/lib/services/record/field/field-object.model.ts index 2d2678e18..01df13acd 100644 --- a/core/app/core/src/lib/services/record/field/field-object.model.ts +++ b/core/app/core/src/lib/services/record/field/field-object.model.ts @@ -25,7 +25,7 @@ */ import {Type} from '@angular/core'; -import {BaseField} from 'common'; +import {BaseField} from '../../../common/record/field.model'; export interface FieldObjectTypeMap { [key: string]: Type diff --git a/core/app/core/src/lib/services/record/field/field.builder.ts b/core/app/core/src/lib/services/record/field/field.builder.ts index ce4ba1a1d..8670524fe 100644 --- a/core/app/core/src/lib/services/record/field/field.builder.ts +++ b/core/app/core/src/lib/services/record/field/field.builder.ts @@ -27,20 +27,12 @@ import {Injectable} from '@angular/core'; import {ValidationManager} from '../validation/validation.manager'; import {DataTypeFormatter} from '../../formatters/data-type.formatter.service'; -import { - AttributeDependency, - BaseField, - DisplayType, - Field, - FieldDefinition, - FieldLogic, - FieldLogicMap, - isFalse, - isTrue, - ObjectMap, - Record, - ViewFieldDefinition -} from 'common'; +import {isTrue} from '../../../common/utils/value-utils'; +import {ObjectMap} from '../../../common/types/object-map'; +import {AttributeDependency, BaseField, DisplayType, Field, FieldDefinition} from '../../../common/record/field.model'; +import {FieldLogic, FieldLogicMap} from '../../../common/actions/field-logic-action.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {AsyncValidatorFn, UntypedFormArray, UntypedFormControl, ValidatorFn} from '@angular/forms'; import {LanguageStore} from '../../../store/language/language.store'; import get from 'lodash-es/get'; diff --git a/core/app/core/src/lib/services/record/field/field.manager.ts b/core/app/core/src/lib/services/record/field/field.manager.ts index 5e8897f2c..88deaf903 100644 --- a/core/app/core/src/lib/services/record/field/field.manager.ts +++ b/core/app/core/src/lib/services/record/field/field.manager.ts @@ -25,7 +25,9 @@ */ import {isEmpty} from 'lodash-es'; -import {Field, FieldDefinition, Record, ViewFieldDefinition} from 'common'; +import {Field, FieldDefinition} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {Injectable} from '@angular/core'; import {SavedFilter} from '../../../store/saved-filters/saved-filter.model'; diff --git a/core/app/core/src/lib/services/record/field/filter-attribute.builder.ts b/core/app/core/src/lib/services/record/field/filter-attribute.builder.ts index 1c6269e2e..49b3297a2 100644 --- a/core/app/core/src/lib/services/record/field/filter-attribute.builder.ts +++ b/core/app/core/src/lib/services/record/field/filter-attribute.builder.ts @@ -28,7 +28,9 @@ import {Injectable} from '@angular/core'; import {ValidationManager} from '../validation/validation.manager'; import {DataTypeFormatter} from '../../formatters/data-type.formatter.service'; import {SavedFilter} from '../../../store/saved-filters/saved-filter.model'; -import {Field, FieldAttribute, FieldDefinition, Record, ViewFieldDefinition} from 'common'; +import {Field, FieldAttribute, FieldDefinition} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {FilterFieldBuilder} from './filter-field.builder'; import isObjectLike from 'lodash-es/isObjectLike'; diff --git a/core/app/core/src/lib/services/record/field/filter-field.builder.ts b/core/app/core/src/lib/services/record/field/filter-field.builder.ts index 757a70c29..1ee7d1ed4 100644 --- a/core/app/core/src/lib/services/record/field/filter-field.builder.ts +++ b/core/app/core/src/lib/services/record/field/filter-field.builder.ts @@ -29,15 +29,10 @@ import {Injectable} from '@angular/core'; import {ValidationManager} from '../validation/validation.manager'; import {DataTypeFormatter} from '../../formatters/data-type.formatter.service'; import {SavedFilter} from '../../../store/saved-filters/saved-filter.model'; -import { - deepClone, - Field, - FieldDefinition, - Option, - SearchCriteria, - SearchCriteriaFieldFilter, - ViewFieldDefinition -} from 'common'; +import {deepClone} from '../../../common/utils/object-utils'; +import {Field, FieldDefinition, Option} from '../../../common/record/field.model'; +import {SearchCriteria, SearchCriteriaFieldFilter} from '../../../common/views/list/search-criteria.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {AsyncValidatorFn, ValidatorFn} from '@angular/forms'; import {FieldObjectRegistry} from "./field-object-type.registry"; diff --git a/core/app/core/src/lib/services/record/field/group-field.builder.ts b/core/app/core/src/lib/services/record/field/group-field.builder.ts index c263e7f17..5d1b107dd 100644 --- a/core/app/core/src/lib/services/record/field/group-field.builder.ts +++ b/core/app/core/src/lib/services/record/field/group-field.builder.ts @@ -25,7 +25,8 @@ */ import {FieldBuilder} from './field.builder'; -import {Record, ViewFieldDefinition} from 'common'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {Injectable} from '@angular/core'; import {ValidationManager} from '../validation/validation.manager'; diff --git a/core/app/core/src/lib/services/record/field/handler/field-handler.model.ts b/core/app/core/src/lib/services/record/field/handler/field-handler.model.ts index c70ad5733..7b366955c 100644 --- a/core/app/core/src/lib/services/record/field/handler/field-handler.model.ts +++ b/core/app/core/src/lib/services/record/field/handler/field-handler.model.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {BaseField, Record} from 'common'; +import {BaseField} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; export interface FieldHandler { initDefaultValue(field: T, record: Record): void; diff --git a/core/app/core/src/lib/services/record/field/handler/field-handler.registry.ts b/core/app/core/src/lib/services/record/field/handler/field-handler.registry.ts index 529717ff9..ae3e9af76 100644 --- a/core/app/core/src/lib/services/record/field/handler/field-handler.registry.ts +++ b/core/app/core/src/lib/services/record/field/handler/field-handler.registry.ts @@ -29,7 +29,7 @@ import {FieldHandler, FieldHandlerMap} from "./field-handler.model"; import {DateFieldHandler} from "./handlers/date.field-handler"; import {MultiEnumFieldHandler} from "./handlers/multienum.field-handler"; import {DefaultFieldHandler} from "./handlers/default.field-handler"; -import {BaseServiceRegistry} from "common"; +import {BaseServiceRegistry} from '../../../../common/registry/base-service.registry'; @Injectable({ providedIn: 'root' diff --git a/core/app/core/src/lib/services/record/field/handler/handlers/base.field-handler.ts b/core/app/core/src/lib/services/record/field/handler/handlers/base.field-handler.ts index 6219879be..66b2f1a57 100644 --- a/core/app/core/src/lib/services/record/field/handler/handlers/base.field-handler.ts +++ b/core/app/core/src/lib/services/record/field/handler/handlers/base.field-handler.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ import {Injectable} from "@angular/core"; -import {BaseField, Record} from "common"; +import {BaseField} from '../../../../../common/record/field.model'; +import {Record} from '../../../../../common/record/record.model'; import {FieldHandler} from "../field-handler.model"; @Injectable({ diff --git a/core/app/core/src/lib/services/record/field/handler/handlers/date.field-handler.ts b/core/app/core/src/lib/services/record/field/handler/handlers/date.field-handler.ts index 102169807..91e448da9 100644 --- a/core/app/core/src/lib/services/record/field/handler/handlers/date.field-handler.ts +++ b/core/app/core/src/lib/services/record/field/handler/handlers/date.field-handler.ts @@ -27,7 +27,8 @@ import {Injectable} from "@angular/core"; import {ProcessService} from "../../../../process/process.service"; import {take} from "rxjs/operators"; import {AsyncActionInput} from "../../../../process/processes/async-action/async-action"; -import {BaseField, Field, Record} from "common"; +import {BaseField, Field} from '../../../../../common/record/field.model'; +import {Record} from '../../../../../common/record/record.model'; import {BaseFieldHandler} from "./base.field-handler"; import {MessageService} from "../../../../message/message.service"; @Injectable({ diff --git a/core/app/core/src/lib/services/record/field/handler/handlers/default.field-handler.ts b/core/app/core/src/lib/services/record/field/handler/handlers/default.field-handler.ts index c924d5270..4c09778b5 100644 --- a/core/app/core/src/lib/services/record/field/handler/handlers/default.field-handler.ts +++ b/core/app/core/src/lib/services/record/field/handler/handlers/default.field-handler.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ import {Injectable} from "@angular/core"; -import {BaseField} from "common"; +import {BaseField} from '../../../../../common/record/field.model'; import {BaseFieldHandler} from "./base.field-handler"; @Injectable({ diff --git a/core/app/core/src/lib/services/record/field/handler/handlers/multienum.field-handler.ts b/core/app/core/src/lib/services/record/field/handler/handlers/multienum.field-handler.ts index eac8b6170..88f2a29ec 100644 --- a/core/app/core/src/lib/services/record/field/handler/handlers/multienum.field-handler.ts +++ b/core/app/core/src/lib/services/record/field/handler/handlers/multienum.field-handler.ts @@ -26,7 +26,7 @@ import {MultiEnumField} from "../../types/multi-enum.value-object-type"; import {trimEnd, trimStart} from "lodash-es"; import {Injectable} from "@angular/core"; -import {Record} from "common"; +import {Record} from '../../../../../common/record/record.model'; import {BaseFieldHandler} from "./base.field-handler"; @Injectable({ diff --git a/core/app/core/src/lib/services/record/field/line-item.builder.ts b/core/app/core/src/lib/services/record/field/line-item.builder.ts index 7ff5e418a..35b81d590 100644 --- a/core/app/core/src/lib/services/record/field/line-item.builder.ts +++ b/core/app/core/src/lib/services/record/field/line-item.builder.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {deepClone, Field, FieldDefinition, FieldMap, Record, ViewFieldDefinition} from 'common'; +import {deepClone} from '../../../common/utils/object-utils'; +import {Field, FieldMap, FieldDefinition} from '../../../common/record/field.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {LanguageStore} from '../../../store/language/language.store'; import {ValidationManager} from '../validation/validation.manager'; import {DataTypeFormatter} from '../../formatters/data-type.formatter.service'; diff --git a/core/app/core/src/lib/services/record/field/types/multi-enum.value-object-type.ts b/core/app/core/src/lib/services/record/field/types/multi-enum.value-object-type.ts index ae793cebc..083db165a 100644 --- a/core/app/core/src/lib/services/record/field/types/multi-enum.value-object-type.ts +++ b/core/app/core/src/lib/services/record/field/types/multi-enum.value-object-type.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {BaseField} from 'common'; -import {isArray, isString, trimEnd, trimStart} from "lodash-es"; +import {BaseField} from '../../../../common/record/field.model'; +import {isArray, isString} from "lodash-es"; export class MultiEnumField extends BaseField { diff --git a/core/app/core/src/lib/services/record/record.manager.ts b/core/app/core/src/lib/services/record/record.manager.ts index 54803f1ba..88ee6aea1 100644 --- a/core/app/core/src/lib/services/record/record.manager.ts +++ b/core/app/core/src/lib/services/record/record.manager.ts @@ -25,7 +25,10 @@ */ import {Injectable} from '@angular/core'; -import {FieldDefinitionMap, FieldMap, isVoid, Record, ViewFieldDefinition} from 'common'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; +import {FieldMap, FieldDefinitionMap} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {isVoid} from '../../common/utils/value-utils'; import {UntypedFormGroup} from '@angular/forms'; import {LanguageStore} from '../../store/language/language.store'; import {FieldManager} from './field/field.manager'; diff --git a/core/app/core/src/lib/services/record/relate/relate.service.ts b/core/app/core/src/lib/services/record/relate/relate.service.ts index 99dc32c8c..5d5157dbc 100644 --- a/core/app/core/src/lib/services/record/relate/relate.service.ts +++ b/core/app/core/src/lib/services/record/relate/relate.service.ts @@ -28,7 +28,7 @@ import {Injectable} from '@angular/core'; import {RecordListStoreFactory} from '../../../store/record-list/record-list.store.factory'; import {RecordListStore} from '../../../store/record-list/record-list.store'; import {map, shareReplay, take} from 'rxjs/operators'; -import {Record} from 'common'; +import {Record} from '../../../common/record/record.model'; import {Observable} from 'rxjs'; @Injectable() diff --git a/core/app/core/src/lib/services/record/validation/aync-validator.Interface.ts b/core/app/core/src/lib/services/record/validation/aync-validator.Interface.ts index 3707ac07a..46fa3780b 100644 --- a/core/app/core/src/lib/services/record/validation/aync-validator.Interface.ts +++ b/core/app/core/src/lib/services/record/validation/aync-validator.Interface.ts @@ -24,8 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; +import {Record} from '../../../common/record/record.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; import {AsyncValidatorFn} from '@angular/forms'; export interface AsyncValidatorInterface { diff --git a/core/app/core/src/lib/services/record/validation/validation.manager.ts b/core/app/core/src/lib/services/record/validation/validation.manager.ts index d7c3898fc..35d94c2b4 100644 --- a/core/app/core/src/lib/services/record/validation/validation.manager.ts +++ b/core/app/core/src/lib/services/record/validation/validation.manager.ts @@ -26,7 +26,11 @@ import {Injectable} from '@angular/core'; import {ValidatorInterface} from './validator.Interface'; -import {MapEntry, OverridableMap, Record, StringMap, StringMatrix, ViewFieldDefinition} from 'common'; +import {StringMatrix} from '../../../common/types/string-matrix'; +import {StringMap} from '../../../common/types/string-map'; +import {MapEntry, OverridableMap} from '../../../common/types/overridable-map'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; +import {Record} from '../../../common/record/record.model'; import {AsyncValidatorFn, ValidatorFn} from '@angular/forms'; import {AsyncValidatorInterface} from './aync-validator.Interface'; import {RequiredValidator} from './validators/required.validator'; diff --git a/core/app/core/src/lib/services/record/validation/validator.Interface.ts b/core/app/core/src/lib/services/record/validation/validator.Interface.ts index 024b03e85..f615629ba 100644 --- a/core/app/core/src/lib/services/record/validation/validator.Interface.ts +++ b/core/app/core/src/lib/services/record/validation/validator.Interface.ts @@ -24,9 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; -import {StandardValidatorFn} from 'common'; +import {Record} from '../../../common/record/record.model'; +import {StandardValidatorFn} from '../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../common/metadata/metadata.model'; export interface ValidatorInterface { applies(record: Record, viewField: ViewFieldDefinition): boolean; diff --git a/core/app/core/src/lib/services/record/validation/validators/currency.validator.ts b/core/app/core/src/lib/services/record/validation/validators/currency.validator.ts index a97473b53..3eb4f6992 100644 --- a/core/app/core/src/lib/services/record/validation/validators/currency.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/currency.validator.ts @@ -26,11 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {NumberFormatter} from '../../../formatters/number/number-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const currencyValidator = (formatter: NumberFormatter): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/date.validator.ts b/core/app/core/src/lib/services/record/validation/validators/date.validator.ts index 46cb17eb7..0fb4564a0 100644 --- a/core/app/core/src/lib/services/record/validation/validators/date.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/date.validator.ts @@ -26,12 +26,12 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {DateFormatter} from '../../../formatters/datetime/date-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; import {FormControlUtils} from '../../field/form-control.utils'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const dateValidator = (formatter: DateFormatter, userFormat: string): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/datetime.validator.ts b/core/app/core/src/lib/services/record/validation/validators/datetime.validator.ts index 1f115dd69..ccde0cb6e 100644 --- a/core/app/core/src/lib/services/record/validation/validators/datetime.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/datetime.validator.ts @@ -26,11 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {DatetimeFormatter} from '../../../formatters/datetime/datetime-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const dateTimeValidator = (formatter: DatetimeFormatter, userFormat: string): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/duplicate-email.validator.ts b/core/app/core/src/lib/services/record/validation/validators/duplicate-email.validator.ts index 0bfbed1b1..8e128150f 100644 --- a/core/app/core/src/lib/services/record/validation/validators/duplicate-email.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/duplicate-email.validator.ts @@ -26,8 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Field, Record, StandardValidationErrors, StandardValidatorFn, ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const duplicateEmailValidator = (viewField: ViewFieldDefinition, record: Record): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/email.validator.ts b/core/app/core/src/lib/services/record/validation/validators/email.validator.ts index ca557dfcb..8f96ba4ce 100644 --- a/core/app/core/src/lib/services/record/validation/validators/email.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/email.validator.ts @@ -26,9 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record, StandardValidationErrors, StandardValidatorFn, ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {EmailFormatter} from '../../../formatters/email/email-formatter.service'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const emailValidator = (formatter: EmailFormatter, customValidationRegex?: string): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/float.validator.ts b/core/app/core/src/lib/services/record/validation/validators/float.validator.ts index ed9ae2626..246260a1d 100644 --- a/core/app/core/src/lib/services/record/validation/validators/float.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/float.validator.ts @@ -26,11 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {NumberFormatter} from '../../../formatters/number/number-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const floatValidator = (formatter: NumberFormatter): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/int.validator.ts b/core/app/core/src/lib/services/record/validation/validators/int.validator.ts index f4959dc03..9ec12a6af 100644 --- a/core/app/core/src/lib/services/record/validation/validators/int.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/int.validator.ts @@ -26,11 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {NumberFormatter} from '../../../formatters/number/number-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const intValidator = (formatter: NumberFormatter): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/phone.validator.ts b/core/app/core/src/lib/services/record/validation/validators/phone.validator.ts index 097747387..6e6ff191c 100644 --- a/core/app/core/src/lib/services/record/validation/validators/phone.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/phone.validator.ts @@ -26,11 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Record} from 'common'; -import {ViewFieldDefinition} from 'common'; import {Injectable} from '@angular/core'; import {PhoneFormatter} from '../../../formatters/phone/phone-formatter.service'; -import {StandardValidationErrors, StandardValidatorFn} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const phoneValidator = (formatter: PhoneFormatter, customRegex?: string): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/record/validation/validators/primary-email.validator.ts b/core/app/core/src/lib/services/record/validation/validators/primary-email.validator.ts index a29301939..6360fcdc6 100644 --- a/core/app/core/src/lib/services/record/validation/validators/primary-email.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/primary-email.validator.ts @@ -26,7 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Field, isTrue, Record, StandardValidationErrors, StandardValidatorFn, ViewFieldDefinition} from 'common'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; +import {isTrue} from '../../../../common/utils/value-utils'; import {Injectable} from '@angular/core'; export const primaryEmailValidator = (viewField: ViewFieldDefinition, record: Record): StandardValidatorFn => ( diff --git a/core/app/core/src/lib/services/record/validation/validators/range.validator.ts b/core/app/core/src/lib/services/record/validation/validators/range.validator.ts index 8096ce26f..4ef5bd780 100644 --- a/core/app/core/src/lib/services/record/validation/validators/range.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/range.validator.ts @@ -26,15 +26,11 @@ import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl, Validators} from '@angular/forms'; -import { - FieldDefinition, - Record, - StandardValidationErrors, - StandardValidatorFn, - ValidationDefinition, - ViewFieldDefinition -} from 'common'; +import {FieldDefinition, ValidationDefinition} from '../../../../common/record/field.model'; import {Injectable} from '@angular/core'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; import {isNumber} from "lodash-es"; export const minValidator = (min: number): StandardValidatorFn => ( diff --git a/core/app/core/src/lib/services/record/validation/validators/required.validator.ts b/core/app/core/src/lib/services/record/validation/validators/required.validator.ts index ba730c2d5..6a97e86ec 100644 --- a/core/app/core/src/lib/services/record/validation/validators/required.validator.ts +++ b/core/app/core/src/lib/services/record/validation/validators/required.validator.ts @@ -27,8 +27,11 @@ import {Injectable} from '@angular/core'; import {ValidatorInterface} from '../validator.Interface'; import {AbstractControl} from '@angular/forms'; -import {Field, isTrue, Record, StandardValidationErrors, StandardValidatorFn, ViewFieldDefinition} from 'common'; +import {isTrue} from '../../../../common/utils/value-utils'; import {FormControlUtils} from '../../field/form-control.utils'; +import {Record} from '../../../../common/record/record.model'; +import {StandardValidatorFn, StandardValidationErrors} from '../../../../common/services/validators/validators.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; export const requiredValidator = (utils: FormControlUtils): StandardValidatorFn => ( (control: AbstractControl): StandardValidationErrors | null => { diff --git a/core/app/core/src/lib/services/statistics/series/mapper/data-type-mapper/data-type.series-mapper.ts b/core/app/core/src/lib/services/statistics/series/mapper/data-type-mapper/data-type.series-mapper.ts index 5a409c24e..d63c7e476 100644 --- a/core/app/core/src/lib/services/statistics/series/mapper/data-type-mapper/data-type.series-mapper.ts +++ b/core/app/core/src/lib/services/statistics/series/mapper/data-type-mapper/data-type.series-mapper.ts @@ -27,7 +27,8 @@ import {Injectable} from '@angular/core'; import {DataTypeUnitConverter} from '../../../../unit-converters/data-type.unit-converter.service'; import {SeriesVisitor} from '../series-traverser.service'; -import {DataItem, ObjectMap} from 'common'; +import {DataItem} from '../../../../../common/containers/chart/chart.model'; +import {ObjectMap} from '../../../../../common/types/object-map'; @Injectable({ providedIn: 'root' diff --git a/core/app/core/src/lib/services/statistics/series/mapper/series-mapper.service.ts b/core/app/core/src/lib/services/statistics/series/mapper/series-mapper.service.ts index 9c9f160c2..8feff09b6 100644 --- a/core/app/core/src/lib/services/statistics/series/mapper/series-mapper.service.ts +++ b/core/app/core/src/lib/services/statistics/series/mapper/series-mapper.service.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {ObjectMap, SeriesResult} from 'common'; +import {SeriesResult} from '../../../../common/containers/chart/chart.model'; +import {ObjectMap} from '../../../../common/types/object-map'; import {SeriesTraverser, SeriesVisitor, SeriesVisitorMap} from './series-traverser.service'; import {DataTypeSeriesMapper} from './data-type-mapper/data-type.series-mapper'; diff --git a/core/app/core/src/lib/services/statistics/series/mapper/series-traverser.service.ts b/core/app/core/src/lib/services/statistics/series/mapper/series-traverser.service.ts index c3f7f40ce..ecc316c8b 100644 --- a/core/app/core/src/lib/services/statistics/series/mapper/series-traverser.service.ts +++ b/core/app/core/src/lib/services/statistics/series/mapper/series-traverser.service.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {DataItem, ObjectMap, SeriesResult} from 'common'; +import {DataItem, SeriesResult} from '../../../../common/containers/chart/chart.model'; +import {ObjectMap} from '../../../../common/types/object-map'; export interface SeriesVisitor { diff --git a/core/app/core/src/lib/services/unit-converters/unit-converter.model.ts b/core/app/core/src/lib/services/unit-converters/unit-converter.model.ts index 02dfe9c3b..aa23f2340 100644 --- a/core/app/core/src/lib/services/unit-converters/unit-converter.model.ts +++ b/core/app/core/src/lib/services/unit-converters/unit-converter.model.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ViewMode} from 'common'; +import {ViewMode} from '../../common/views/view.model'; export interface UnitConverterOptions { mode?: ViewMode; diff --git a/core/app/core/src/lib/services/user/user.service.ts b/core/app/core/src/lib/services/user/user.service.ts index 9ee028887..c2671d4c8 100644 --- a/core/app/core/src/lib/services/user/user.service.ts +++ b/core/app/core/src/lib/services/user/user.service.ts @@ -24,9 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { User } from 'common'; +import {Injectable} from '@angular/core'; +import {HttpClient} from '@angular/common/http'; +import {User} from '../../common/types/user'; @Injectable({ providedIn: 'root' }) export class UserService { diff --git a/core/app/core/src/lib/store/admin-metadata/admin-metadata.model.ts b/core/app/core/src/lib/store/admin-metadata/admin-metadata.model.ts index 6832fcc1f..def2ee8c1 100644 --- a/core/app/core/src/lib/store/admin-metadata/admin-metadata.model.ts +++ b/core/app/core/src/lib/store/admin-metadata/admin-metadata.model.ts @@ -23,7 +23,7 @@ * feasible for technical reasons, the Appropriate Legal Notices must display * the words "Supercharged by SuiteCRM". */ -import {ObjectMap} from 'common'; +import {ObjectMap} from '../../common/types/object-map'; export interface AdminMetadata { adminPanel?: AdminMetadataModel[]; diff --git a/core/app/core/src/lib/store/admin-metadata/admin-metadata.store.ts b/core/app/core/src/lib/store/admin-metadata/admin-metadata.store.ts index 667b3f6b8..e38ed98ce 100644 --- a/core/app/core/src/lib/store/admin-metadata/admin-metadata.store.ts +++ b/core/app/core/src/lib/store/admin-metadata/admin-metadata.store.ts @@ -29,7 +29,8 @@ import {BehaviorSubject, Observable, of} from 'rxjs'; import {distinctUntilChanged, map, shareReplay} from 'rxjs/operators'; import {AppStateStore} from '../app-state/app-state.store'; import {StateStore} from '../state'; -import {deepClone, ObjectMap} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {ObjectMap} from '../../common/types/object-map'; import {AdminMetadata} from './admin-metadata.model'; diff --git a/core/app/core/src/lib/store/app-metadata/app-metadata.store.service.ts b/core/app/core/src/lib/store/app-metadata/app-metadata.store.service.ts index e8c342895..346c74a41 100644 --- a/core/app/core/src/lib/store/app-metadata/app-metadata.store.service.ts +++ b/core/app/core/src/lib/store/app-metadata/app-metadata.store.service.ts @@ -28,7 +28,7 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {catchError, map, shareReplay, tap} from 'rxjs/operators'; import {EntityGQL} from '../../services/api/graphql-api/api.entity.get'; -import {deepClone, emptyObject} from 'common'; +import {deepClone, emptyObject} from '../../common/utils/object-utils'; import {StateStore} from '../state'; import {LanguageStore, LanguageStrings} from '../language/language.store'; import {SystemConfigStore} from '../system-config/system-config.store'; diff --git a/core/app/core/src/lib/store/app-state/app-state.store.ts b/core/app/core/src/lib/store/app-state/app-state.store.ts index dfeb775f9..a9e883ed0 100644 --- a/core/app/core/src/lib/store/app-state/app-state.store.ts +++ b/core/app/core/src/lib/store/app-state/app-state.store.ts @@ -27,7 +27,9 @@ import {Injectable, signal} from '@angular/core'; import {BehaviorSubject, combineLatestWith, Observable, Subscription} from 'rxjs'; import {distinctUntilChanged, map} from 'rxjs/operators'; -import {deepClone, isVoid, User} from 'common'; +import {isVoid} from '../../common/utils/value-utils'; +import {deepClone} from '../../common/utils/object-utils'; +import {User} from '../../common/types/user'; import {StateStore} from '../state'; import {LoadingBufferFactory} from '../../services/ui/loading-buffer/loading-buffer.factory'; import {LoadingBuffer} from '../../services/ui/loading-buffer/loading-buffer.service'; diff --git a/core/app/core/src/lib/store/chart-data/chart-data.store.spec.mock.ts b/core/app/core/src/lib/store/chart-data/chart-data.store.spec.mock.ts index cb4b697ed..80d4a5044 100644 --- a/core/app/core/src/lib/store/chart-data/chart-data.store.spec.mock.ts +++ b/core/app/core/src/lib/store/chart-data/chart-data.store.spec.mock.ts @@ -25,7 +25,7 @@ */ import {StatisticsFetchGQL} from '../statistics/graphql/api.statistics.get'; -import {StatisticsMap, StatisticsQueryMap} from 'common'; +import {StatisticsMap, StatisticsQueryMap} from '../../common/statistics/statistics.model'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {ChartDataStoreFactory} from './chart-data.store.factory'; diff --git a/core/app/core/src/lib/store/chart-data/chart-data.store.ts b/core/app/core/src/lib/store/chart-data/chart-data.store.ts index 0a1ee5427..ab09282e0 100644 --- a/core/app/core/src/lib/store/chart-data/chart-data.store.ts +++ b/core/app/core/src/lib/store/chart-data/chart-data.store.ts @@ -26,16 +26,11 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; -import { - ChartDataSource, - ChartOptionMap, - ChartOptions, - deepClone, - SeriesResult, - SeriesStatistic, - Statistic, - StatisticsQuery -} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {SeriesStatistic, Statistic, StatisticsQuery} from '../../common/statistics/statistics.model'; +import {SeriesResult} from '../../common/containers/chart/chart.model'; +import {ChartOptions} from '../../common/metadata/charts-widget.metadata'; +import {ChartDataSource, ChartOptionMap} from '../../common/containers/chart/chart.model'; import {distinctUntilChanged, map, shareReplay} from 'rxjs/operators'; import {SeriesStatisticsState, SeriesStatisticsStore} from '../series-statistics/series-statistics.store'; import {StatisticsFetchGQL} from '../statistics/graphql/api.statistics.get'; diff --git a/core/app/core/src/lib/store/global-recently-viewed/global-recently-viewed.store.ts b/core/app/core/src/lib/store/global-recently-viewed/global-recently-viewed.store.ts index 0f0938932..499d06b5c 100644 --- a/core/app/core/src/lib/store/global-recently-viewed/global-recently-viewed.store.ts +++ b/core/app/core/src/lib/store/global-recently-viewed/global-recently-viewed.store.ts @@ -28,7 +28,8 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {distinctUntilChanged, map, shareReplay} from 'rxjs/operators'; import {StateStore} from '../state'; -import {deepClone, GlobalRecentlyViewed, RecentlyViewed} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {RecentlyViewed, GlobalRecentlyViewed} from '../../common/record/recently-viewed.model'; const initialState: GlobalRecentlyViewed = { diff --git a/core/app/core/src/lib/store/language/language.store.ts b/core/app/core/src/lib/store/language/language.store.ts index e372dca7d..21c10de19 100644 --- a/core/app/core/src/lib/store/language/language.store.ts +++ b/core/app/core/src/lib/store/language/language.store.ts @@ -29,7 +29,8 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, combineLatest, combineLatestWith, forkJoin, Observable, of} from 'rxjs'; import {distinctUntilChanged, first, map, shareReplay, take, tap} from 'rxjs/operators'; import {EntityGQL} from '../../services/api/graphql-api/api.entity.get'; -import {deepClone, emptyObject, StringMap} from 'common'; +import {StringMap} from '../../common/types/string-map'; +import {deepClone, emptyObject} from '../../common/utils/object-utils'; import {StateStore} from '../state'; import {LocalStorageService} from '../../services/local-storage/local-storage.service'; import {Process, ProcessService} from '../../services/process/process.service'; diff --git a/core/app/core/src/lib/store/metadata/metadata.store.service.ts b/core/app/core/src/lib/store/metadata/metadata.store.service.ts index 1b356e505..10a27af5e 100644 --- a/core/app/core/src/lib/store/metadata/metadata.store.service.ts +++ b/core/app/core/src/lib/store/metadata/metadata.store.service.ts @@ -28,23 +28,15 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {distinctUntilChanged, map, shareReplay, tap} from 'rxjs/operators'; import {EntityGQL} from '../../services/api/graphql-api/api.entity.get'; -import { - Action, - ColumnDefinition, - deepClone, - Favorite, - FieldActions, - FieldDefinitionMap, - ListViewMeta, - MassUpdateMeta, - Panel, - RecentlyViewed, - SearchMeta, - SubPanelMeta, - WidgetMetadata, - TabDefinitions, - ObjectMap -} from 'common'; +import {Action} from '../../common/actions/action.model'; +import {ColumnDefinition, ListViewMeta, MassUpdateMeta, SearchMeta} from '../../common/metadata/list.metadata.model'; +import {FieldDefinitionMap} from '../../common/record/field.model'; +import {deepClone} from '../../common/utils/object-utils'; +import {RecentlyViewed} from '../../common/record/recently-viewed.model'; +import {Favorite} from '../../common/record/favorites.model'; +import {Panel, TabDefinitions} from '../../common/metadata/metadata.model'; +import {SubPanelMeta} from '../../common/metadata/subpanel.metadata.model'; +import {WidgetMetadata} from '../../common/metadata/widget.metadata'; import {StateStore} from '../state'; import {AppStateStore} from '../app-state/app-state.store'; diff --git a/core/app/core/src/lib/store/navigation/navigation.store.ts b/core/app/core/src/lib/store/navigation/navigation.store.ts index 09e79fa73..b00ab873c 100644 --- a/core/app/core/src/lib/store/navigation/navigation.store.ts +++ b/core/app/core/src/lib/store/navigation/navigation.store.ts @@ -30,7 +30,8 @@ import {distinctUntilChanged, map, shareReplay, tap} from 'rxjs/operators'; import {EntityGQL} from '../../services/api/graphql-api/api.entity.get'; import {StateStore} from '../state'; -import {deepClone, ObjectMap} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {ObjectMap} from '../../common/types/object-map'; import {Params} from '@angular/router'; export interface Navigation { diff --git a/core/app/core/src/lib/store/notification/notification.store.ts b/core/app/core/src/lib/store/notification/notification.store.ts index 58d24f357..01499d807 100644 --- a/core/app/core/src/lib/store/notification/notification.store.ts +++ b/core/app/core/src/lib/store/notification/notification.store.ts @@ -28,7 +28,7 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of, timer} from 'rxjs'; import {distinctUntilChanged, map, shareReplay, take, tap} from 'rxjs/operators'; import {StateStore} from '../state'; -import {deepClone} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; import {RecordThreadStore} from '../../containers/record-thread/store/record-thread/record-thread.store'; import {NotificationsService} from './notifications.service'; import {AppStateStore} from '../app-state/app-state.store'; diff --git a/core/app/core/src/lib/store/notification/notifications.service.ts b/core/app/core/src/lib/store/notification/notifications.service.ts index eaf1bffac..95c290f20 100644 --- a/core/app/core/src/lib/store/notification/notifications.service.ts +++ b/core/app/core/src/lib/store/notification/notifications.service.ts @@ -27,7 +27,10 @@ import {Injectable} from '@angular/core'; import {RecordThreadStore} from '../../containers/record-thread/store/record-thread/record-thread.store'; import {SystemConfigStore} from '../system-config/system-config.store'; -import {deepClone, Field, Record, SearchCriteria} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {Record} from '../../common/record/record.model'; +import {Field} from '../../common/record/field.model'; +import {SearchCriteria} from '../../common/views/list/search-criteria.model'; import {RecordThreadItemMetadata} from '../../containers/record-thread/store/record-thread/record-thread-item.store.model'; import { RecordThreadConfig, diff --git a/core/app/core/src/lib/store/record-container/base-record-container.store.ts b/core/app/core/src/lib/store/record-container/base-record-container.store.ts index fd1918060..f6eca443c 100644 --- a/core/app/core/src/lib/store/record-container/base-record-container.store.ts +++ b/core/app/core/src/lib/store/record-container/base-record-container.store.ts @@ -25,7 +25,11 @@ */ import {BehaviorSubject, forkJoin, Observable, of, Subscription} from 'rxjs'; -import {deepClone, Record, ViewContext, ViewFieldDefinition, ViewMode} from 'common'; +import {ViewContext} from '../../common/views/view.model'; +import {deepClone} from '../../common/utils/object-utils'; +import {Record} from '../../common/record/record.model'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; +import {ViewMode} from '../../common/views/view.model'; import {catchError, distinctUntilChanged, finalize, map, take, tap} from 'rxjs/operators'; import {RecordStore} from '../record/record.store'; import {AppStateStore} from '../app-state/app-state.store'; diff --git a/core/app/core/src/lib/store/record-container/record-container.store.model.ts b/core/app/core/src/lib/store/record-container/record-container.store.model.ts index 81edfa795..3e8fe1450 100644 --- a/core/app/core/src/lib/store/record-container/record-container.store.model.ts +++ b/core/app/core/src/lib/store/record-container/record-container.store.model.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Panel, ViewFieldDefinitionMap, ViewMode} from 'common'; +import {Panel, ViewFieldDefinitionMap} from '../../common/metadata/metadata.model'; +import {ViewMode} from '../../common/views/view.model'; export interface RecordContainerState { module?: string; diff --git a/core/app/core/src/lib/store/record-list/graphql/api.list.get.ts b/core/app/core/src/lib/store/record-list/graphql/api.list.get.ts index 43c27ba08..7c6df83b8 100644 --- a/core/app/core/src/lib/store/record-list/graphql/api.list.get.ts +++ b/core/app/core/src/lib/store/record-list/graphql/api.list.get.ts @@ -28,7 +28,9 @@ import {Injectable} from '@angular/core'; import {Apollo, gql} from 'apollo-angular'; import {Observable} from 'rxjs'; import {ApolloQueryResult} from '@apollo/client/core'; -import {Pagination, Record, SearchCriteria, SortingSelection} from 'common'; +import {Pagination, SortingSelection} from '../../../common/views/list/list-navigation.model'; +import {Record} from '../../../common/record/record.model'; +import {SearchCriteria} from '../../../common/views/list/search-criteria.model'; import {map} from 'rxjs/operators'; import {RecordList} from '../record-list.store'; import {isInteger, toInteger} from "lodash-es"; diff --git a/core/app/core/src/lib/store/record-list/record-list.store.spec.mock.ts b/core/app/core/src/lib/store/record-list/record-list.store.spec.mock.ts index bc7801474..6d24f20d5 100644 --- a/core/app/core/src/lib/store/record-list/record-list.store.spec.mock.ts +++ b/core/app/core/src/lib/store/record-list/record-list.store.spec.mock.ts @@ -32,7 +32,7 @@ import {messageServiceMock} from '../../services/message/message.service.spec.mo import {systemConfigStoreMock} from '../system-config/system-config.store.spec.mock'; import {userPreferenceStoreMock} from '../user-preference/user-preference.store.spec.mock'; import {Observable, of} from 'rxjs'; -import {deepClone} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; /* eslint-disable camelcase, @typescript-eslint/camelcase */ export const recordListMockData = { diff --git a/core/app/core/src/lib/store/record-list/record-list.store.ts b/core/app/core/src/lib/store/record-list/record-list.store.ts index e9945422f..71ca7d755 100644 --- a/core/app/core/src/lib/store/record-list/record-list.store.ts +++ b/core/app/core/src/lib/store/record-list/record-list.store.ts @@ -24,22 +24,15 @@ * the words "Supercharged by SuiteCRM". */ -import { - deepClone, - emptyObject, - ObjectMap, - PageSelection, - Pagination, - PaginationCount, - PaginationDataSource, - Record, - RecordSelection, - SearchCriteria, - SelectionDataSource, - SelectionStatus, - SortDirection, - SortingSelection -} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {emptyObject} from '../../common/utils/object-utils'; +import {ObjectMap} from '../../common/types/object-map'; +import {Pagination, PageSelection, PaginationCount, SortDirection, SortingSelection} from '../../common/views/list/list-navigation.model'; +import {PaginationDataSource} from '../../common/components/pagination/pagination.model'; +import {Record} from '../../common/record/record.model'; +import {RecordSelection, SelectionStatus} from '../../common/views/list/record-selection.model'; +import {SearchCriteria} from '../../common/views/list/search-criteria.model'; +import {SelectionDataSource} from '../../common/views/list/selection.model'; import {BehaviorSubject, combineLatestWith, Observable, of, Subscription} from 'rxjs'; import {catchError, distinctUntilChanged, map, shareReplay, take, tap} from 'rxjs/operators'; import {StateStore} from '../state'; diff --git a/core/app/core/src/lib/store/record/graphql/api.record.save.ts b/core/app/core/src/lib/store/record/graphql/api.record.save.ts index 5009753a7..0d69abbaf 100644 --- a/core/app/core/src/lib/store/record/graphql/api.record.save.ts +++ b/core/app/core/src/lib/store/record/graphql/api.record.save.ts @@ -27,7 +27,8 @@ import {Injectable} from '@angular/core'; import {Apollo, gql} from 'apollo-angular'; import {Observable} from 'rxjs'; -import {deepClone, Record} from 'common'; +import {deepClone} from '../../../common/utils/object-utils'; +import {Record} from '../../../common/record/record.model'; import {map} from 'rxjs/operators'; import {ApolloQueryResult} from '@apollo/client/core'; diff --git a/core/app/core/src/lib/store/record/record-mappers/base-save.record-mapper.ts b/core/app/core/src/lib/store/record/record-mappers/base-save.record-mapper.ts index 7a8f566f7..eac23a684 100644 --- a/core/app/core/src/lib/store/record/record-mappers/base-save.record-mapper.ts +++ b/core/app/core/src/lib/store/record/record-mappers/base-save.record-mapper.ts @@ -1,4 +1,32 @@ -import {deepClone, Record, RecordMapper} from 'common'; +/** + * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. + * Copyright (C) 2021 SalesAgility Ltd. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License version 3 as published by the + * Free Software Foundation with the addition of the following permission added + * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK + * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE + * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. + * + * This program 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 Affero General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * In accordance with Section 7(b) of the GNU Affero General Public License + * version 3, these Appropriate Legal Notices must retain the display of the + * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably + * feasible for technical reasons, the Appropriate Legal Notices must display + * the words "Supercharged by SuiteCRM". + */ + +import {RecordMapper} from '../../../common/record/record-mappers/record-mapper.model'; +import {Record} from '../../../common/record/record.model'; +import {deepClone} from '../../../common/utils/object-utils'; import {Injectable} from '@angular/core'; import {isNil} from "lodash-es"; diff --git a/core/app/core/src/lib/store/record/record.store.factory.ts b/core/app/core/src/lib/store/record/record.store.factory.ts index 021dd9457..d7e58252d 100644 --- a/core/app/core/src/lib/store/record/record.store.factory.ts +++ b/core/app/core/src/lib/store/record/record.store.factory.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {RecordMapperRegistry, ViewFieldDefinition, ObjectMap} from 'common'; +import {RecordMapperRegistry, ViewFieldDefinition} from 'common'; import {RecordStore} from './record.store'; import {Observable} from 'rxjs'; import {RecordFetchGQL} from './graphql/api.record.get'; @@ -33,6 +33,8 @@ import {RecordSaveGQL} from './graphql/api.record.save'; import {MessageService} from '../../services/message/message.service'; import {RecordManager} from '../../services/record/record.manager'; import {BaseSaveRecordMapper} from './record-mappers/base-save.record-mapper'; +import {RecordMapperRegistry} from '../../common/record/record-mappers/record-mapper.registry'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; @Injectable({ providedIn: 'root', diff --git a/core/app/core/src/lib/store/record/record.store.ts b/core/app/core/src/lib/store/record/record.store.ts index cc4eaf599..c847d91a6 100644 --- a/core/app/core/src/lib/store/record/record.store.ts +++ b/core/app/core/src/lib/store/record/record.store.ts @@ -24,13 +24,18 @@ * the words "Supercharged by SuiteCRM". */ -import {deepClone, MapEntry, Record, RecordMapper, RecordMapperRegistry, ViewFieldDefinition, ObjectMap} from 'common'; import {BehaviorSubject, Observable, Subscription, throwError} from 'rxjs'; import {catchError, distinctUntilChanged, filter, map, shareReplay, startWith, take, tap} from 'rxjs/operators'; import {RecordFetchGQL} from './graphql/api.record.get'; import {RecordSaveGQL} from './graphql/api.record.save'; import {MessageService} from '../../services/message/message.service'; import {RecordManager} from '../../services/record/record.manager'; +import {deepClone} from '../../common/utils/object-utils'; +import {Record} from '../../common/record/record.model'; +import {RecordMapper} from '../../common/record/record-mappers/record-mapper.model'; +import {RecordMapperRegistry} from '../../common/record/record-mappers/record-mapper.registry'; +import {ViewFieldDefinition} from '../../common/metadata/metadata.model'; +import {MapEntry} from '../../common/types/overridable-map'; import {signal} from "@angular/core"; const initialState = { diff --git a/core/app/core/src/lib/store/saved-filters/filter-list.store.spec.mock.ts b/core/app/core/src/lib/store/saved-filters/filter-list.store.spec.mock.ts index d2a69af14..294e55ac9 100644 --- a/core/app/core/src/lib/store/saved-filters/filter-list.store.spec.mock.ts +++ b/core/app/core/src/lib/store/saved-filters/filter-list.store.spec.mock.ts @@ -31,7 +31,8 @@ import {messageServiceMock} from '../../services/message/message.service.spec.mo import {systemConfigStoreMock} from '../system-config/system-config.store.spec.mock'; import {userPreferenceStoreMock} from '../user-preference/user-preference.store.spec.mock'; import {Observable, of} from 'rxjs'; -import {deepClone, User} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {User} from '../../common/types/user'; import {AuthService} from '../../services/auth/auth.service'; import {moduleNameMapperMock} from '../../services/navigation/module-name-mapper/module-name-mapper.service.spec.mock'; import {FilterListStoreFactory} from './filter-list.store.factory'; diff --git a/core/app/core/src/lib/store/saved-filters/filter-list.store.ts b/core/app/core/src/lib/store/saved-filters/filter-list.store.ts index af73d8847..b6b1f8e16 100644 --- a/core/app/core/src/lib/store/saved-filters/filter-list.store.ts +++ b/core/app/core/src/lib/store/saved-filters/filter-list.store.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {StringMap} from 'common'; +import {StringMap} from '../../common/types/string-map'; import {Observable} from 'rxjs'; import {AuthService} from '../../services/auth/auth.service'; import {RecordListStore} from '../record-list/record-list.store'; diff --git a/core/app/core/src/lib/store/saved-filters/graphql/api.list.get.ts b/core/app/core/src/lib/store/saved-filters/graphql/api.list.get.ts index 827dd4dac..c6fe753ef 100644 --- a/core/app/core/src/lib/store/saved-filters/graphql/api.list.get.ts +++ b/core/app/core/src/lib/store/saved-filters/graphql/api.list.get.ts @@ -27,7 +27,8 @@ import {Injectable} from '@angular/core'; import {Apollo} from 'apollo-angular'; import {Observable} from 'rxjs'; -import {Pagination, SearchCriteria, SortingSelection} from 'common'; +import {Pagination, SortingSelection} from '../../../common/views/list/list-navigation.model'; +import {SearchCriteria} from '../../../common/views/list/search-criteria.model'; import {ListGQL} from '../../record-list/graphql/api.list.get'; import {SavedFilter, SavedFilterList} from '../saved-filter.model'; diff --git a/core/app/core/src/lib/store/saved-filters/saved-filter.model.ts b/core/app/core/src/lib/store/saved-filters/saved-filter.model.ts index 4407f3b9d..e14c49570 100644 --- a/core/app/core/src/lib/store/saved-filters/saved-filter.model.ts +++ b/core/app/core/src/lib/store/saved-filters/saved-filter.model.ts @@ -1,4 +1,32 @@ -import {Field, FieldMap, Record, SearchCriteria} from 'common'; +/** + * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. + * Copyright (C) 2021 SalesAgility Ltd. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License version 3 as published by the + * Free Software Foundation with the addition of the following permission added + * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK + * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE + * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. + * + * This program 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 Affero General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * In accordance with Section 7(b) of the GNU Affero General Public License + * version 3, these Appropriate Legal Notices must retain the display of the + * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably + * feasible for technical reasons, the Appropriate Legal Notices must display + * the words "Supercharged by SuiteCRM". + */ + +import {Field, FieldMap} from '../../common/record/field.model'; +import {Record} from '../../common/record/record.model'; +import {SearchCriteria} from '../../common/views/list/search-criteria.model'; import {RecordList} from '../record-list/record-list.store'; import {UntypedFormGroup} from '@angular/forms'; diff --git a/core/app/core/src/lib/store/series-statistics/series-statistics.store.ts b/core/app/core/src/lib/store/series-statistics/series-statistics.store.ts index 0c098fdd2..86bcf46d6 100644 --- a/core/app/core/src/lib/store/series-statistics/series-statistics.store.ts +++ b/core/app/core/src/lib/store/series-statistics/series-statistics.store.ts @@ -26,13 +26,13 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable} from 'rxjs'; -import {deepClone} from 'common'; -import {SeriesStatistic, StatisticsQuery} from 'common'; import {StatisticsFetchGQL} from '../statistics/graphql/api.statistics.get'; import {StatisticsStore} from '../statistics/statistics.store'; import {distinctUntilChanged, map} from 'rxjs/operators'; -import {SeriesResult} from 'common'; -import {StatisticsState} from 'common'; +import {SeriesResult} from '../../common/containers/chart/chart.model'; +import {StatisticsState} from '../../common/statistics/statistics-store.model'; +import {deepClone} from '../../common/utils/object-utils'; +import {SeriesStatistic, StatisticsQuery} from '../../common/statistics/statistics.model'; const initialState = { module: '', diff --git a/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.spec.mock.ts b/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.spec.mock.ts index 883b6d5af..78e5656c5 100644 --- a/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.spec.mock.ts +++ b/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.spec.mock.ts @@ -26,7 +26,7 @@ import {SingleValueStatisticsStoreFactory} from './single-value-statistics.store.factory'; import {StatisticsFetchGQL} from '../statistics/graphql/api.statistics.get'; -import {StatisticsMap, StatisticsQueryMap} from 'common'; +import {StatisticsMap, StatisticsQueryMap} from '../../common/statistics/statistics.model'; import {Observable, of} from 'rxjs'; import {shareReplay} from 'rxjs/operators'; import {fieldManagerMock} from '../../services/record/field/field.manager.spec.mock'; diff --git a/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.ts b/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.ts index 72109ac33..6cda72694 100644 --- a/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.ts +++ b/core/app/core/src/lib/store/single-value-statistics/single-value-statistics.store.ts @@ -26,21 +26,13 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable} from 'rxjs'; -import {deepClone} from 'common'; -import { - SingleValueStatistic, - SingleValueStatisticsData, - Statistic, - StatisticsQuery -} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; import {StatisticsFetchGQL} from '../statistics/graphql/api.statistics.get'; import {StatisticsStore} from '../statistics/statistics.store'; import {distinctUntilChanged, map} from 'rxjs/operators'; import {FieldManager} from '../../services/record/field/field.manager'; -import { - SingleValueStatisticsState, - SingleValueStatisticsStoreInterface -} from 'common'; +import {SingleValueStatistic, SingleValueStatisticsData, Statistic, StatisticsQuery} from '../../common/statistics/statistics.model'; +import {SingleValueStatisticsState, SingleValueStatisticsStoreInterface} from '../../common/statistics/statistics-store.model'; const initialState = { module: '', diff --git a/core/app/core/src/lib/store/statistics/graphql/api.statistics.get.ts b/core/app/core/src/lib/store/statistics/graphql/api.statistics.get.ts index 28f7b36f3..0da4863c6 100644 --- a/core/app/core/src/lib/store/statistics/graphql/api.statistics.get.ts +++ b/core/app/core/src/lib/store/statistics/graphql/api.statistics.get.ts @@ -27,7 +27,7 @@ import {Injectable} from '@angular/core'; import {Apollo, gql} from 'apollo-angular'; import {Observable} from 'rxjs'; -import {Statistic, StatisticsMap, StatisticsQueryMap} from 'common'; +import {Statistic, StatisticsMap, StatisticsQueryMap} from '../../../common/statistics/statistics.model'; import {map} from 'rxjs/operators'; import {ApolloQueryResult} from '@apollo/client/core'; diff --git a/core/app/core/src/lib/store/statistics/statistics-batch.service.ts b/core/app/core/src/lib/store/statistics/statistics-batch.service.ts index 0637e034f..90a547a3e 100644 --- a/core/app/core/src/lib/store/statistics/statistics-batch.service.ts +++ b/core/app/core/src/lib/store/statistics/statistics-batch.service.ts @@ -27,7 +27,7 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {StatisticsFetchGQL} from './graphql/api.statistics.get'; -import {StatisticsMap, StatisticsQueryMap} from 'common'; +import {StatisticsMap, StatisticsQueryMap} from '../../common/statistics/statistics.model'; @Injectable({ diff --git a/core/app/core/src/lib/store/statistics/statistics.store.ts b/core/app/core/src/lib/store/statistics/statistics.store.ts index bb7c10afa..eb9353c32 100644 --- a/core/app/core/src/lib/store/statistics/statistics.store.ts +++ b/core/app/core/src/lib/store/statistics/statistics.store.ts @@ -27,7 +27,10 @@ import {Injectable} from '@angular/core'; import {StateStore} from '../state'; import {BehaviorSubject, Observable, of} from 'rxjs'; -import {deepClone, Statistic, StatisticsMap, StatisticsQuery, StatisticsState, ViewContext} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; +import {StatisticsState} from '../../common/statistics/statistics-store.model'; +import {StatisticsQuery, Statistic, StatisticsMap} from '../../common/statistics/statistics.model'; +import {ViewContext} from '../../common/views/view.model'; import {distinctUntilChanged, map, shareReplay, tap} from 'rxjs/operators'; import {StatisticsFetchGQL} from './graphql/api.statistics.get'; diff --git a/core/app/core/src/lib/store/system-config/system-config.store.ts b/core/app/core/src/lib/store/system-config/system-config.store.ts index e3a41fca4..d0a71ca77 100644 --- a/core/app/core/src/lib/store/system-config/system-config.store.ts +++ b/core/app/core/src/lib/store/system-config/system-config.store.ts @@ -27,9 +27,8 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {distinctUntilChanged, map, shareReplay, tap} from 'rxjs/operators'; - import {CollectionGQL} from '../../services/api/graphql-api/api.collection.get'; -import {deepClone} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; import {StateStore} from '../state'; export interface SystemConfig { diff --git a/core/app/core/src/lib/store/theme-images/theme-images.store.ts b/core/app/core/src/lib/store/theme-images/theme-images.store.ts index 374aeb4a2..00830749b 100644 --- a/core/app/core/src/lib/store/theme-images/theme-images.store.ts +++ b/core/app/core/src/lib/store/theme-images/theme-images.store.ts @@ -27,11 +27,10 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {distinctUntilChanged, map, shareReplay, tap} from 'rxjs/operators'; - import {EntityGQL} from '../../services/api/graphql-api/api.entity.get'; import {AppStateStore} from '../app-state/app-state.store'; import {StateStore} from '../state'; -import {deepClone, emptyObject} from 'common'; +import {deepClone, emptyObject} from '../../common/utils/object-utils'; import {SvgIconRegistryService} from 'angular-svg-icon'; export interface ThemeImage { diff --git a/core/app/core/src/lib/store/user-preference/user-preference.store.ts b/core/app/core/src/lib/store/user-preference/user-preference.store.ts index 9313c168c..c4041bfb6 100644 --- a/core/app/core/src/lib/store/user-preference/user-preference.store.ts +++ b/core/app/core/src/lib/store/user-preference/user-preference.store.ts @@ -27,9 +27,8 @@ import {Injectable} from '@angular/core'; import {BehaviorSubject, Observable, of, Subscription} from 'rxjs'; import {debounceTime, distinctUntilChanged, map, shareReplay, take, tap} from 'rxjs/operators'; - import {CollectionGQL} from '../../services/api/graphql-api/api.collection.get'; -import {deepClone} from 'common'; +import {deepClone} from '../../common/utils/object-utils'; import {StateStore} from '../state'; import {SystemConfigStore} from '../system-config/system-config.store'; import {ProcessService} from '../../services/process/process.service'; diff --git a/core/app/core/src/lib/store/view/view.store.ts b/core/app/core/src/lib/store/view/view.store.ts index 12433e046..c00a7f218 100644 --- a/core/app/core/src/lib/store/view/view.store.ts +++ b/core/app/core/src/lib/store/view/view.store.ts @@ -33,8 +33,7 @@ import {LanguageListStringMap, LanguageStore, LanguageStringMap, LanguageStrings import {NavbarModule, Navigation, NavigationStore} from '../navigation/navigation.store'; import {ModuleNavigation} from '../../services/navigation/module-navigation/module-navigation.service'; import {Metadata, MetadataStore} from '../metadata/metadata.store.service'; -import {SearchMeta} from 'common'; - +import {SearchMeta} from '../../common/metadata/list.metadata.model'; export interface AppData { appState: AppState; diff --git a/core/app/core/src/lib/views/create/components/create-view/create-record.component.ts b/core/app/core/src/lib/views/create/components/create-view/create-record.component.ts index 6419ca85f..a671e68f8 100644 --- a/core/app/core/src/lib/views/create/components/create-view/create-record.component.ts +++ b/core/app/core/src/lib/views/create/components/create-view/create-record.component.ts @@ -31,7 +31,8 @@ import {CreateViewStore} from '../../store/create-view/create-view.store'; import {RecordViewStore} from '../../../record/store/record-view/record-view.store'; import {RecordViewModel} from '../../../record/store/record-view/record-view.store.model'; import {AppStateStore} from '../../../../store/app-state/app-state.store'; -import {Action, ActionContext, ViewContext, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../../common/actions/action.model'; +import {ViewMode, ViewContext} from '../../../../common/views/view.model'; import {RecordActionsAdapter} from "../../../record/adapters/actions.adapter"; import {RecordViewSidebarWidgetService} from "../../../record/services/record-view-sidebar-widget.service"; import {filter, map} from "rxjs/operators"; diff --git a/core/app/core/src/lib/views/create/store/create-view/create-view.store.ts b/core/app/core/src/lib/views/create/store/create-view/create-view.store.ts index 325b66144..e4d31d44b 100644 --- a/core/app/core/src/lib/views/create/store/create-view/create-view.store.ts +++ b/core/app/core/src/lib/views/create/store/create-view/create-view.store.ts @@ -42,7 +42,8 @@ import {LocalStorageService} from '../../../../services/local-storage/local-stor import {SubpanelStoreFactory} from '../../../../containers/subpanel/store/subpanel/subpanel.store.factory'; import {AuthService} from '../../../../services/auth/auth.service'; import {MessageService} from '../../../../services/message/message.service'; -import {Record, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordStoreFactory} from '../../../../store/record/record.store.factory'; import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; import {PanelLogicManager} from '../../../../components/panel-logic/panel-logic.manager'; diff --git a/core/app/core/src/lib/views/install/actions/install-view.action.ts b/core/app/core/src/lib/views/install/actions/install-view.action.ts index 397defdc1..0cafbebb9 100644 --- a/core/app/core/src/lib/views/install/actions/install-view.action.ts +++ b/core/app/core/src/lib/views/install/actions/install-view.action.ts @@ -24,7 +24,7 @@ * the words "Supercharged by SuiteCRM". */ -import {ActionData, ActionHandler} from 'common'; +import {ActionData, ActionHandler} from '../../../common/actions/action.model'; import {InstallViewStore} from '../store/install-view/install-view.store'; export interface InstallViewActionData extends ActionData { diff --git a/core/app/core/src/lib/views/install/actions/install/install.action.ts b/core/app/core/src/lib/views/install/actions/install/install.action.ts index 6e51a59fd..9e68e96ef 100644 --- a/core/app/core/src/lib/views/install/actions/install/install.action.ts +++ b/core/app/core/src/lib/views/install/actions/install/install.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Record, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {InstallViewActionData, InstallViewActionHandler} from '../install-view.action'; import {MessageService} from '../../../../services/message/message.service'; diff --git a/core/app/core/src/lib/views/install/adapters/actions.adapter.ts b/core/app/core/src/lib/views/install/adapters/actions.adapter.ts index a6c3ca8de..6cc245569 100644 --- a/core/app/core/src/lib/views/install/adapters/actions.adapter.ts +++ b/core/app/core/src/lib/views/install/adapters/actions.adapter.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, ModeActions, ViewMode} from 'common'; +import {Action, ActionContext, ModeActions} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; import {MetadataStore} from '../../../store/metadata/metadata.store.service'; diff --git a/core/app/core/src/lib/views/install/adapters/install-content.adapter.ts b/core/app/core/src/lib/views/install/adapters/install-content.adapter.ts index f13419036..2841316e8 100644 --- a/core/app/core/src/lib/views/install/adapters/install-content.adapter.ts +++ b/core/app/core/src/lib/views/install/adapters/install-content.adapter.ts @@ -27,7 +27,9 @@ import {combineLatestWith, Observable, of} from 'rxjs'; import {Injectable} from '@angular/core'; import {map, shareReplay} from 'rxjs/operators'; -import {Panel, PanelRow, Record, ViewMode} from 'common'; +import {Panel, PanelRow} from '../../../common/metadata/metadata.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; import {MetadataStore} from '../../../store/metadata/metadata.store.service'; import {RecordContentConfig, RecordContentDataSource} from '../../../components/record-content/record-content.model'; import {LanguageStore} from '../../../store/language/language.store'; diff --git a/core/app/core/src/lib/views/install/components/install-header/install-header.component.ts b/core/app/core/src/lib/views/install/components/install-header/install-header.component.ts index f22d7afce..f2e600346 100644 --- a/core/app/core/src/lib/views/install/components/install-header/install-header.component.ts +++ b/core/app/core/src/lib/views/install/components/install-header/install-header.component.ts @@ -27,7 +27,9 @@ import {Component} from '@angular/core'; import {map} from 'rxjs/operators'; import {InstallActionsAdapter} from '../../adapters/actions.adapter'; -import {ActionContext, Record} from 'common'; +import {ActionContext} from '../../../../common/actions/action.model'; +import {Record} from '../../../../common/record/record.model'; + import {InstallViewStore} from '../../store/install-view/install-view.store'; @Component({ diff --git a/core/app/core/src/lib/views/install/components/install-view/install-view.component.ts b/core/app/core/src/lib/views/install/components/install-view/install-view.component.ts index a3378a1dc..e2eb0f0e2 100644 --- a/core/app/core/src/lib/views/install/components/install-view/install-view.component.ts +++ b/core/app/core/src/lib/views/install/components/install-view/install-view.component.ts @@ -27,7 +27,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Observable} from 'rxjs'; import {ActivatedRoute} from '@angular/router'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {InstallViewStore} from '../../store/install-view/install-view.store'; import {InstallViewModel} from '../../store/install-view/install-view.store.model'; diff --git a/core/app/core/src/lib/views/install/store/install-view/install-view.store.model.ts b/core/app/core/src/lib/views/install/store/install-view/install-view.store.model.ts index ffb1b12c9..7f6cef2b7 100644 --- a/core/app/core/src/lib/views/install/store/install-view/install-view.store.model.ts +++ b/core/app/core/src/lib/views/install/store/install-view/install-view.store.model.ts @@ -24,7 +24,10 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, Panel, Record, ViewMode} from 'common'; +import {Action} from '../../../../common/actions/action.model'; +import {Panel} from '../../../../common/metadata/metadata.model'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordTemplateMetadata} from '../../../../store/metadata/metadata.store.service'; export interface InstallViewModel { diff --git a/core/app/core/src/lib/views/install/store/install-view/install-view.store.ts b/core/app/core/src/lib/views/install/store/install-view/install-view.store.ts index 01951ca10..2f916c9c7 100644 --- a/core/app/core/src/lib/views/install/store/install-view/install-view.store.ts +++ b/core/app/core/src/lib/views/install/store/install-view/install-view.store.ts @@ -25,25 +25,16 @@ */ import {Injectable} from '@angular/core'; -import {BehaviorSubject, combineLatest, combineLatestWith, Observable, of, Subscription} from 'rxjs'; -import { - Action, - deepClone, - Field, - FieldDefinition, - FieldMetadata, - isVoid, - Option, - Panel, - PanelCell, - PanelRow, - Record, - ViewContext, - ViewFieldDefinition, - ViewMode, - TabDefinition, - TabDefinitions -} from 'common'; +import {BehaviorSubject, combineLatestWith, Observable, of, Subscription} from 'rxjs'; +import {isVoid} from '../../../../common/utils/value-utils'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {Action} from '../../../../common/actions/action.model'; +import {Field, FieldDefinition, FieldMetadata, Option} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {Panel, PanelCell, PanelRow, TabDefinition, TabDefinitions} from '../../../../common/metadata/metadata.model'; +import {ViewContext} from '../../../../common/views/view.model'; +import {ViewFieldDefinition} from '../../../../common/metadata/metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {distinctUntilChanged, map, shareReplay} from 'rxjs/operators'; import {InstallViewMetadata, InstallViewModel, InstallViewState} from './install-view.store.model'; import {StateStore} from '../../../../store/state'; diff --git a/core/app/core/src/lib/views/list/actions/record-panel/bulk-action/run-bulk-action.record-panel.action.ts b/core/app/core/src/lib/views/list/actions/record-panel/bulk-action/run-bulk-action.record-panel.action.ts index 952ac8ca2..f1fcaff7d 100644 --- a/core/app/core/src/lib/views/list/actions/record-panel/bulk-action/run-bulk-action.record-panel.action.ts +++ b/core/app/core/src/lib/views/list/actions/record-panel/bulk-action/run-bulk-action.record-panel.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {isFalse, ViewMode} from 'common'; +import {ViewMode} from '../../../../../common/views/view.model'; +import {isFalse} from '../../../../../common/utils/value-utils'; import {take} from 'rxjs/operators'; import {Process} from '../../../../../services/process/process.service'; import {ConfirmationModalService} from '../../../../../services/modals/confirmation-modal.service'; diff --git a/core/app/core/src/lib/views/list/actions/record-panel/cancel/cancel.record-panel.action.ts b/core/app/core/src/lib/views/list/actions/record-panel/cancel/cancel.record-panel.action.ts index 442b9bf20..97cf826a1 100644 --- a/core/app/core/src/lib/views/list/actions/record-panel/cancel/cancel.record-panel.action.ts +++ b/core/app/core/src/lib/views/list/actions/record-panel/cancel/cancel.record-panel.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../../common/views/view.model'; import {ListViewRecordPanelActionData, ListViewRecordPanelActionHandler} from '../record-panel.action'; @Injectable({ diff --git a/core/app/core/src/lib/views/list/actions/record-panel/record-panel.action.ts b/core/app/core/src/lib/views/list/actions/record-panel/record-panel.action.ts index 137c5f9f4..e38368d36 100644 --- a/core/app/core/src/lib/views/list/actions/record-panel/record-panel.action.ts +++ b/core/app/core/src/lib/views/list/actions/record-panel/record-panel.action.ts @@ -29,7 +29,7 @@ import { RecordPanelActionHandler } from '../../../../containers/record-panel/components/record-panel/record-panel.model'; import {ListViewStore} from '../../store/list-view/list-view.store'; -import {Action} from 'common'; +import {Action} from '../../../../common/actions/action.model'; export interface ListViewRecordPanelActionData extends RecordPanelActionData { listStore: ListViewStore; diff --git a/core/app/core/src/lib/views/list/adapters/bulk-actions.adapter.ts b/core/app/core/src/lib/views/list/adapters/bulk-actions.adapter.ts index 6808a6a12..836382a85 100644 --- a/core/app/core/src/lib/views/list/adapters/bulk-actions.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/bulk-actions.adapter.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; -import {BulkActionsMap, isFalse, Record} from 'common'; +import {BulkActionsMap} from '../../../common/actions/bulk-action.model'; +import {Record} from '../../../common/record/record.model'; +import {isFalse} from '../../../common/utils/value-utils'; import {Observable} from 'rxjs'; import {map, take} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/views/list/adapters/filter.adapter.ts b/core/app/core/src/lib/views/list/adapters/filter.adapter.ts index fcf0fe17e..60742522c 100644 --- a/core/app/core/src/lib/views/list/adapters/filter.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/filter.adapter.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {SearchMetaFieldMap} from 'common'; +import {SearchMetaFieldMap} from '../../../common/metadata/list.metadata.model'; import {map} from 'rxjs/operators'; import {ListViewStore} from '../store/list-view/list-view.store'; import {Metadata} from '../../../store/metadata/metadata.store.service'; diff --git a/core/app/core/src/lib/views/list/adapters/line-actions.adapter.ts b/core/app/core/src/lib/views/list/adapters/line-actions.adapter.ts index 36ee08cfe..4781fa270 100644 --- a/core/app/core/src/lib/views/list/adapters/line-actions.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/line-actions.adapter.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, Record, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable, of} from 'rxjs'; import {map, shareReplay} from 'rxjs/operators'; import {AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/views/list/adapters/listview-table-actions.adapter.ts b/core/app/core/src/lib/views/list/adapters/listview-table-actions.adapter.ts index 2661c7a64..147775c34 100644 --- a/core/app/core/src/lib/views/list/adapters/listview-table-actions.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/listview-table-actions.adapter.ts @@ -25,7 +25,9 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, Record, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable, of} from 'rxjs'; import {map, shareReplay} from 'rxjs/operators'; import {AsyncActionInput, AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/views/list/adapters/record-panel-actions.adapter.ts b/core/app/core/src/lib/views/list/adapters/record-panel-actions.adapter.ts index 54f47a4f3..9eeaae8f4 100644 --- a/core/app/core/src/lib/views/list/adapters/record-panel-actions.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/record-panel-actions.adapter.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {Action, ActionContext, ViewMode} from 'common'; +import {Action, ActionContext} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; import {combineLatestWith, Observable} from 'rxjs'; import {map, take} from 'rxjs/operators'; import {AsyncActionService} from '../../../services/process/processes/async-action/async-action'; diff --git a/core/app/core/src/lib/views/list/adapters/record-panel.adapter.ts b/core/app/core/src/lib/views/list/adapters/record-panel.adapter.ts index c4070b9d0..794b55eff 100644 --- a/core/app/core/src/lib/views/list/adapters/record-panel.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/record-panel.adapter.ts @@ -34,7 +34,7 @@ import {RecordPanelStore} from '../../../containers/record-panel/store/record-pa import {BaseRecordActionsAdapter} from '../../../services/actions/base-record-action.adapter'; import {ListViewRecordPanelActionAdapterFactory} from './record-panel-actions.adapter.factory'; import {RecordPanelStoreFactory} from '../../../containers/record-panel/store/record-panel/record-panel.store.factory'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../common/views/view.model'; import {RecordManager} from '../../../services/record/record.manager'; @Injectable() diff --git a/core/app/core/src/lib/views/list/adapters/table.adapter.ts b/core/app/core/src/lib/views/list/adapters/table.adapter.ts index c501864e7..a22076e3c 100644 --- a/core/app/core/src/lib/views/list/adapters/table.adapter.ts +++ b/core/app/core/src/lib/views/list/adapters/table.adapter.ts @@ -26,7 +26,8 @@ import {of} from 'rxjs'; import {Injectable} from '@angular/core'; -import {ActionDataSource, SortDirection} from 'common'; +import {ActionDataSource} from '../../../common/actions/action.model'; +import {SortDirection} from '../../../common/views/list/list-navigation.model'; import {ListViewStore} from '../store/list-view/list-view.store'; import {MetadataStore} from '../../../store/metadata/metadata.store.service'; import {TableConfig} from '../../../components/table/table.model'; diff --git a/core/app/core/src/lib/views/list/components/action-menu/action-menu.component.ts b/core/app/core/src/lib/views/list/components/action-menu/action-menu.component.ts index 960a04463..72cd624e2 100644 --- a/core/app/core/src/lib/views/list/components/action-menu/action-menu.component.ts +++ b/core/app/core/src/lib/views/list/components/action-menu/action-menu.component.ts @@ -25,7 +25,8 @@ */ import {Component, OnInit} from '@angular/core'; -import {ButtonGroupInterface, ButtonInterface} from 'common'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../../../common/components/button/button-group.model'; import {BehaviorSubject} from 'rxjs'; import {map, take} from 'rxjs/operators'; import {ListViewStore} from '../../store/list-view/list-view.store'; diff --git a/core/app/core/src/lib/views/list/components/list-container/list-container.component.spec.ts b/core/app/core/src/lib/views/list/components/list-container/list-container.component.spec.ts index e5e7510cb..a006e2d81 100644 --- a/core/app/core/src/lib/views/list/components/list-container/list-container.component.spec.ts +++ b/core/app/core/src/lib/views/list/components/list-container/list-container.component.spec.ts @@ -29,7 +29,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {ListContainerComponent} from './list-container.component'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -44,6 +44,7 @@ import {metadataStoreMock} from '../../../../store/metadata/metadata.store.spec. import {listviewStoreMock} from '../../store/list-view/list-view.store.spec.mock'; import {ThemeImagesStore} from '../../../../store/theme-images/theme-images.store'; import {TableModule} from '../../../../components/table/table.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('ListcontainerUiComponent', () => { let component: ListContainerComponent; @@ -51,31 +52,30 @@ describe('ListcontainerUiComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - TableModule, - WidgetPanelModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - NoopAnimationsModule, - ApolloTestingModule, - RouterTestingModule - ], - providers: [ - { - provide: ListViewStore, useValue: listviewStoreMock - }, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - { - provide: LanguageStore, useValue: languageStoreMock - }, - {provide: MetadataStore, useValue: metadataStoreMock}, - ], - declarations: [ListContainerComponent] - }) + declarations: [ListContainerComponent], + imports: [TableModule, + WidgetPanelModule, + AngularSvgIconModule.forRoot(), + NoopAnimationsModule, + ApolloTestingModule, + RouterTestingModule], + providers: [ + { + provide: ListViewStore, useValue: listviewStoreMock + }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { + provide: LanguageStore, useValue: languageStoreMock + }, + { provide: MetadataStore, useValue: metadataStoreMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/views/list/components/list-container/list-container.component.ts b/core/app/core/src/lib/views/list/components/list-container/list-container.component.ts index e9069fc3c..0ffca97b6 100644 --- a/core/app/core/src/lib/views/list/components/list-container/list-container.component.ts +++ b/core/app/core/src/lib/views/list/components/list-container/list-container.component.ts @@ -26,8 +26,8 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Observable, Subscription} from 'rxjs'; -import {ViewContext, WidgetMetadata} from 'common'; -import {map} from 'rxjs/operators'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {MaxColumnsCalculator} from '../../../../services/ui/max-columns-calculator/max-columns-calculator.service'; import {LanguageStore} from '../../../../store/language/language.store'; import {ScreenSize} from '../../../../services/ui/screen-size-observer/screen-size-observer.service'; diff --git a/core/app/core/src/lib/views/list/components/list-header/list-header.component.spec.ts b/core/app/core/src/lib/views/list/components/list-header/list-header.component.spec.ts index 919343ce6..f92d107c7 100644 --- a/core/app/core/src/lib/views/list/components/list-header/list-header.component.spec.ts +++ b/core/app/core/src/lib/views/list/components/list-header/list-header.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {Component} from '@angular/core'; import {take} from 'rxjs/operators'; import {of} from 'rxjs'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {ListHeaderComponent} from './list-header.component'; @@ -58,6 +58,7 @@ import {appStateStoreMock} from '../../../../store/app-state/app-state.store.spe import {listviewStoreMock} from '../../store/list-view/list-view.store.spec.mock'; import {ThemeImagesStore} from '../../../../store/theme-images/theme-images.store'; import {SettingsMenuModule} from '../settings-menu/settings-menu.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'list-header-test-host-component', @@ -72,52 +73,51 @@ describe('ListHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ModuleTitleModule, - ActionMenuModule, - ButtonModule, - SettingsMenuModule, - ApolloTestingModule, - HttpClientTestingModule, - ImageModule, - ListFilterModule, - RouterTestingModule, - AngularSvgIconModule.forRoot() - ], - declarations: [ListHeaderComponent, ListHeaderTestHostComponent], - providers: [ - {provide: ListViewStore, useValue: listviewStoreMock}, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - { - provide: ModuleNavigation, useValue: mockModuleNavigation - }, - { - provide: SystemConfigStore, useValue: systemConfigStoreMock - }, - { - provide: UserPreferenceStore, useValue: userPreferenceStoreMock - }, - { - provide: NavigationStore, useValue: navigationMock - }, - { - provide: ModuleNavigation, useValue: mockModuleNavigation - }, - { - provide: LanguageStore, useValue: languageStoreMock - }, - { - provide: MetadataStore, useValue: metadataStoreMock - }, - { - provide: AppStateStore, useValue: appStateStoreMock - }, - ], - }) + declarations: [ListHeaderComponent, ListHeaderTestHostComponent], + imports: [ModuleTitleModule, + ActionMenuModule, + ButtonModule, + SettingsMenuModule, + ApolloTestingModule, + ImageModule, + ListFilterModule, + RouterTestingModule, + AngularSvgIconModule.forRoot()], + providers: [ + { provide: ListViewStore, useValue: listviewStoreMock }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { + provide: ModuleNavigation, useValue: mockModuleNavigation + }, + { + provide: SystemConfigStore, useValue: systemConfigStoreMock + }, + { + provide: UserPreferenceStore, useValue: userPreferenceStoreMock + }, + { + provide: NavigationStore, useValue: navigationMock + }, + { + provide: ModuleNavigation, useValue: mockModuleNavigation + }, + { + provide: LanguageStore, useValue: languageStoreMock + }, + { + provide: MetadataStore, useValue: metadataStoreMock + }, + { + provide: AppStateStore, useValue: appStateStoreMock + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); }); diff --git a/core/app/core/src/lib/views/list/components/list-header/list-header.component.ts b/core/app/core/src/lib/views/list/components/list-header/list-header.component.ts index f99cf65b3..a8074f6fd 100644 --- a/core/app/core/src/lib/views/list/components/list-header/list-header.component.ts +++ b/core/app/core/src/lib/views/list/components/list-header/list-header.component.ts @@ -32,7 +32,7 @@ import {RecordPanelConfig} from '../../../../containers/record-panel/components/ import {Subscription} from 'rxjs'; import {RecordPanelAdapter} from '../../adapters/record-panel.adapter'; import {QuickFiltersService} from "../../services/quick-filters.service"; -import {isTrue} from 'common'; +import {isTrue} from '../../../../common/utils/value-utils'; @Component({ selector: 'scrm-list-header', diff --git a/core/app/core/src/lib/views/list/components/list-view/list.component.spec.ts b/core/app/core/src/lib/views/list/components/list-view/list.component.spec.ts index de4f9a5ed..2567c3d53 100644 --- a/core/app/core/src/lib/views/list/components/list-view/list.component.spec.ts +++ b/core/app/core/src/lib/views/list/components/list-view/list.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {RouterTestingModule} from '@angular/router/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {ApolloTestingModule} from 'apollo-angular/testing'; @@ -61,6 +61,7 @@ import {systemConfigStoreMock} from '../../../../store/system-config/system-conf import {listviewStoreMock} from '../../store/list-view/list-view.store.spec.mock'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {moduleNameMapperMock} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'list-test-host-component', @@ -76,36 +77,35 @@ describe('ListComponent', () => { beforeEach(waitForAsync(() => { /* eslint-disable camelcase, @typescript-eslint/camelcase */ TestBed.configureTestingModule({ - imports: [ - ListHeaderModule, - ListContainerModule, - HttpClientTestingModule, - RouterTestingModule, - NoopAnimationsModule, - ImageModule, - ApolloTestingModule, - DynamicModule, - FieldModule, - DropdownButtonModule, - DropdownButtonModule, - RouterTestingModule, - SortButtonModule - ], - declarations: [ListComponent, ListTestHostComponent], - providers: [ - {provide: RecordListStoreFactory, useValue: listStoreFactoryMock}, - {provide: ListViewStore, useValue: listviewStoreMock}, - {provide: ThemeImagesStore, useValue: themeImagesStoreMock}, - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - {provide: NavigationStore, useValue: navigationMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - {provide: AppStateStore, useValue: appStateStoreMock}, - {provide: ModuleNameMapper, useValue: moduleNameMapperMock}, - ], - }) + declarations: [ListComponent, ListTestHostComponent], + imports: [ListHeaderModule, + ListContainerModule, + RouterTestingModule, + NoopAnimationsModule, + ImageModule, + ApolloTestingModule, + DynamicModule, + FieldModule, + DropdownButtonModule, + DropdownButtonModule, + RouterTestingModule, + SortButtonModule], + providers: [ + { provide: RecordListStoreFactory, useValue: listStoreFactoryMock }, + { provide: ListViewStore, useValue: listviewStoreMock }, + { provide: ThemeImagesStore, useValue: themeImagesStoreMock }, + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + { provide: NavigationStore, useValue: navigationMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + { provide: AppStateStore, useValue: appStateStoreMock }, + { provide: ModuleNameMapper, useValue: moduleNameMapperMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); /* eslint-enable camelcase, @typescript-eslint/camelcase */ diff --git a/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.spec.ts b/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.spec.ts index 0096639c8..dbfe55522 100644 --- a/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.spec.ts +++ b/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.spec.ts @@ -27,7 +27,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {SettingsMenuComponent} from './settings-menu.component'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -38,6 +38,7 @@ import {themeImagesMockData} from '../../../../store/theme-images/theme-images.s import {ImageModule} from '../../../../components/image/image.module'; import {listviewStoreMock} from '../../store/list-view/list-view.store.spec.mock'; import {ThemeImagesStore} from '../../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('SettingsmenuUiComponent', () => { let component: SettingsMenuComponent; @@ -45,23 +46,22 @@ describe('SettingsmenuUiComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - ColumnChooserModule, - HttpClientTestingModule, - ApolloTestingModule, - ImageModule, - ButtonModule, - ], - declarations: [SettingsMenuComponent], - providers: [ - {provide: ListViewStore, useValue: listviewStoreMock}, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - ], - }) + declarations: [SettingsMenuComponent], + imports: [ColumnChooserModule, + ApolloTestingModule, + ImageModule, + ButtonModule], + providers: [ + { provide: ListViewStore, useValue: listviewStoreMock }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.ts b/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.ts index caf95e5f9..053697dc3 100644 --- a/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.ts +++ b/core/app/core/src/lib/views/list/components/settings-menu/settings-menu.component.ts @@ -25,17 +25,16 @@ */ import {Component, OnDestroy, OnInit} from '@angular/core'; +import {isTrue} from '../../../../common/utils/value-utils'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../../../common/components/button/button-group.model'; import { - ButtonGroupInterface, - ButtonInterface, DropdownButtonInterface, DropdownButtonSection, DropdownButtonSectionMap, - GroupedButtonInterface, - isTrue, - SearchCriteria, - SearchCriteriaFilter -} from 'common'; + GroupedButtonInterface +} from '../../../../common/components/button/dropdown-button.model'; +import {SearchCriteria, SearchCriteriaFilter} from '../../../../common/views/list/search-criteria.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {BehaviorSubject, combineLatestWith, Subscription} from 'rxjs'; import {ListViewStore} from '../../store/list-view/list-view.store'; diff --git a/core/app/core/src/lib/views/list/services/list-view-sidebar-widget.service.ts b/core/app/core/src/lib/views/list/services/list-view-sidebar-widget.service.ts index b86fcc556..f7e87d298 100644 --- a/core/app/core/src/lib/views/list/services/list-view-sidebar-widget.service.ts +++ b/core/app/core/src/lib/views/list/services/list-view-sidebar-widget.service.ts @@ -26,7 +26,7 @@ import {Injectable} from "@angular/core"; import {ListViewStore} from "../store/list-view/list-view.store"; -import {isTrue} from 'common'; +import {isTrue} from '../../../common/utils/value-utils'; import {Observable, Subscription} from "rxjs"; import {ScreenSizeObserverService} from "../../../services/ui/screen-size-observer/screen-size-observer.service"; import {SystemConfigStore} from "../../../store/system-config/system-config.store"; diff --git a/core/app/core/src/lib/views/list/services/list-view-url-query.service.ts b/core/app/core/src/lib/views/list/services/list-view-url-query.service.ts index 34f69d69d..a1c09fcb8 100644 --- a/core/app/core/src/lib/views/list/services/list-view-url-query.service.ts +++ b/core/app/core/src/lib/views/list/services/list-view-url-query.service.ts @@ -24,20 +24,17 @@ * the words "Supercharged by SuiteCRM". */ -import { isArray, isEmpty } from 'lodash-es'; -import { DateTime } from 'luxon'; -import { - FieldDefinitionMap, - isEmptyString, - SearchCriteria, - SearchCriteriaFieldFilter -} from 'common'; -import { Injectable } from '@angular/core'; -import { Params } from '@angular/router'; -import { SavedFilter } from '../../../store/saved-filters/saved-filter.model'; -import { MetadataStore } from '../../../store/metadata/metadata.store.service'; -import { SystemConfigStore } from '../../../store/system-config/system-config.store'; -import { DataTypeFormatter } from '../../../services/formatters/data-type.formatter.service'; +import {isArray, isEmpty} from 'lodash-es'; +import {DateTime} from 'luxon'; +import {isEmptyString} from '../../../common/utils/value-utils'; +import {FieldDefinitionMap} from '../../../common/record/field.model'; +import {SearchCriteria, SearchCriteriaFieldFilter} from '../../../common/views/list/search-criteria.model'; +import {Injectable} from '@angular/core'; +import {Params} from '@angular/router'; +import {SavedFilter} from '../../../store/saved-filters/saved-filter.model'; +import {MetadataStore} from '../../../store/metadata/metadata.store.service'; +import {SystemConfigStore} from '../../../store/system-config/system-config.store'; +import {DataTypeFormatter} from '../../../services/formatters/data-type.formatter.service'; type GenericMap = { [key: string]: T }; type NestedGenericMap = GenericMap>; diff --git a/core/app/core/src/lib/views/list/services/quick-filters.service.ts b/core/app/core/src/lib/views/list/services/quick-filters.service.ts index d0eb6b8f7..03247224a 100644 --- a/core/app/core/src/lib/views/list/services/quick-filters.service.ts +++ b/core/app/core/src/lib/views/list/services/quick-filters.service.ts @@ -27,7 +27,9 @@ import {Injectable} from "@angular/core"; import {SavedFilter} from "../../../store/saved-filters/saved-filter.model"; import {ListViewStore} from "../store/list-view/list-view.store"; -import {ButtonGroupInterface, ButtonInterface, isTrue, isVoid} from 'common'; +import {ButtonInterface} from '../../../common/components/button/button.model'; +import {ButtonGroupInterface} from '../../../common/components/button/button-group.model'; +import {isTrue} from '../../../common/utils/value-utils'; import {BehaviorSubject, Observable, Subscription} from "rxjs"; import { ScreenSize, diff --git a/core/app/core/src/lib/views/list/store/list-view/list-view.store.spec.ts b/core/app/core/src/lib/views/list/store/list-view/list-view.store.spec.ts index 5638cdfbe..bdb65f4e0 100644 --- a/core/app/core/src/lib/views/list/store/list-view/list-view.store.spec.ts +++ b/core/app/core/src/lib/views/list/store/list-view/list-view.store.spec.ts @@ -24,7 +24,9 @@ * the words "Supercharged by SuiteCRM". */ -import {PageSelection, SelectionStatus, SearchCriteriaFieldFilter} from 'common'; +import {PageSelection} from '../../../../common/views/list/list-navigation.model'; +import {SelectionStatus} from '../../../../common/views/list/record-selection.model'; +import {SearchCriteriaFieldFilter} from '../../../../common/views/list/search-criteria.model'; import {take} from 'rxjs/operators'; import {ListViewStore} from './list-view.store'; import {listviewMockData, listviewStoreMock} from './list-view.store.spec.mock'; diff --git a/core/app/core/src/lib/views/list/store/list-view/list-view.store.ts b/core/app/core/src/lib/views/list/store/list-view/list-view.store.ts index 9015264b3..f61cc14ab 100644 --- a/core/app/core/src/lib/views/list/store/list-view/list-view.store.ts +++ b/core/app/core/src/lib/views/list/store/list-view/list-view.store.ts @@ -25,22 +25,16 @@ */ import { isArray, isEmpty, union } from 'lodash-es'; -import { - Action, - ColumnDefinition, - deepClone, - emptyObject, - ListViewMeta, - Pagination, - Record, - RecordSelection, - SearchCriteria, - SelectionStatus, - SortDirection, - SortingSelection, - ViewContext, - isTrue -} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {emptyObject} from '../../../../common/utils/object-utils'; +import {isTrue} from '../../../../common/utils/value-utils'; +import {Action} from '../../../../common/actions/action.model'; +import {Record} from '../../../../common/record/record.model'; +import {ViewContext} from '../../../../common/views/view.model'; +import {RecordSelection, SelectionStatus} from '../../../../common/views/list/record-selection.model'; +import {Pagination, SortDirection, SortingSelection} from '../../../../common/views/list/list-navigation.model'; +import {ListViewMeta, ColumnDefinition} from '../../../../common/metadata/list.metadata.model'; +import {SearchCriteria} from '../../../../common/views/list/search-criteria.model'; import {BehaviorSubject, combineLatestWith, Observable, Subscription} from 'rxjs'; import {distinctUntilChanged, map, take, tap} from 'rxjs/operators'; import {Injectable} from '@angular/core'; diff --git a/core/app/core/src/lib/views/list/table-actions/async-process/async-process.table.action.ts b/core/app/core/src/lib/views/list/table-actions/async-process/async-process.table.action.ts index 6cf1a0fa3..d2ca02759 100644 --- a/core/app/core/src/lib/views/list/table-actions/async-process/async-process.table.action.ts +++ b/core/app/core/src/lib/views/list/table-actions/async-process/async-process.table.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../common/views/view.model'; import {TableActionData, TableActionHandler} from "../table.action"; @Injectable({ diff --git a/core/app/core/src/lib/views/list/table-actions/select-columns/select-columns.table.action.ts b/core/app/core/src/lib/views/list/table-actions/select-columns/select-columns.table.action.ts index 7e0918223..3f3fd3333 100644 --- a/core/app/core/src/lib/views/list/table-actions/select-columns/select-columns.table.action.ts +++ b/core/app/core/src/lib/views/list/table-actions/select-columns/select-columns.table.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {TableActionData, TableActionHandler} from "../table.action"; @Injectable({ diff --git a/core/app/core/src/lib/views/list/table-actions/table.action.ts b/core/app/core/src/lib/views/list/table-actions/table.action.ts index d38c5ac03..dbf2a7c7e 100644 --- a/core/app/core/src/lib/views/list/table-actions/table.action.ts +++ b/core/app/core/src/lib/views/list/table-actions/table.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; import {ModuleNavigation} from '../../../services/navigation/module-navigation/module-navigation.service'; import {ListViewStore} from "../store/list-view/list-view.store"; diff --git a/core/app/core/src/lib/views/login/components/login/login.component.spec.ts b/core/app/core/src/lib/views/login/components/login/login.component.spec.ts index ab6e7fa6e..a26c7ba13 100644 --- a/core/app/core/src/lib/views/login/components/login/login.component.spec.ts +++ b/core/app/core/src/lib/views/login/components/login/login.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {LoginUiComponent} from './login.component'; @@ -41,6 +41,7 @@ import {recoverPasswordMock} from '../../../../services/process/processes/recove import {languageStoreMock} from '../../../../store/language/language.store.spec.mock'; import {LanguageStore} from '../../../../store/language/language.store'; import {systemConfigStoreMock} from '../../../../store/system-config/system-config.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('LoginComponent', () => { let component: LoginUiComponent; @@ -49,22 +50,21 @@ describe('LoginComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [ - RouterTestingModule, - HttpClientTestingModule, - FormsModule, - NoopAnimationsModule, - ApolloTestingModule, - ButtonLoadingUiModule - ], - declarations: [LoginUiComponent], - providers: [ - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: RecoverPasswordService, useValue: recoverPasswordMock}, - ], - }) + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [LoginUiComponent], + imports: [RouterTestingModule, + FormsModule, + NoopAnimationsModule, + ApolloTestingModule, + ButtonLoadingUiModule], + providers: [ + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: RecoverPasswordService, useValue: recoverPasswordMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/views/login/components/login/login.component.ts b/core/app/core/src/lib/views/login/components/login/login.component.ts index 85adc2329..02094ca4e 100644 --- a/core/app/core/src/lib/views/login/components/login/login.component.ts +++ b/core/app/core/src/lib/views/login/components/login/login.component.ts @@ -36,7 +36,7 @@ import {AuthService} from '../../../../services/auth/auth.service'; import {LanguageStore, LanguageStringMap} from '../../../../store/language/language.store'; import {MessageService} from '../../../../services/message/message.service'; import {Process} from '../../../../services/process/process.service'; -import {StringMap} from 'common'; +import {StringMap} from '../../../../common/types/string-map'; import {HttpErrorResponse} from '@angular/common/http'; import {AppStateStore} from "../../../../store/app-state/app-state.store"; diff --git a/core/app/core/src/lib/views/record/action-logic/display-type/display-type.logic.ts b/core/app/core/src/lib/views/record/action-logic/display-type/display-type.logic.ts index 417527e50..3f8c08a73 100644 --- a/core/app/core/src/lib/views/record/action-logic/display-type/display-type.logic.ts +++ b/core/app/core/src/lib/views/record/action-logic/display-type/display-type.logic.ts @@ -24,7 +24,15 @@ * the words "Supercharged by SuiteCRM". */ -import { Action, LogicDefinitions, StringArrayMap, StringArrayMatrix, ViewMode } from 'common'; +import {isEmpty} from 'lodash-es'; +import {LogicDefinitions} from '../../../../common/metadata/metadata.model'; +import {Action} from '../../../../common/actions/action.model'; +import {isVoid} from '../../../../common/utils/value-utils'; +import {Field} from '../../../../common/record/field.model'; +import {Record} from '../../../../common/record/record.model'; +import {StringArrayMap} from '../../../../common/types/string-map'; +import {StringArrayMatrix} from '../../../../common/types/string-matrix'; +import {ViewMode} from '../../../../common/views/view.model'; import {Injectable} from '@angular/core'; import {RecordActionData} from '../../actions/record.action'; import {ActionLogicHandler} from '../../../../services/actions/action-logic-handler'; diff --git a/core/app/core/src/lib/views/record/actions/async-process/async-process.service.ts b/core/app/core/src/lib/views/record/actions/async-process/async-process.service.ts index e0259c6a5..8e26c4b17 100644 --- a/core/app/core/src/lib/views/record/actions/async-process/async-process.service.ts +++ b/core/app/core/src/lib/views/record/actions/async-process/async-process.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ALL_VIEW_MODES} from 'common'; +import {ALL_VIEW_MODES} from '../../../../common/views/view.model'; import {RecordActionData, RecordActionHandler} from '../record.action'; @Injectable({ diff --git a/core/app/core/src/lib/views/record/actions/cancel-create/cancel-create.action.ts b/core/app/core/src/lib/views/record/actions/cancel-create/cancel-create.action.ts index a3f37a900..a60d47d7d 100644 --- a/core/app/core/src/lib/views/record/actions/cancel-create/cancel-create.action.ts +++ b/core/app/core/src/lib/views/record/actions/cancel-create/cancel-create.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {ModalButtonInterface, ViewMode} from 'common'; +import {ModalButtonInterface} from '../../../../common/components/modal/modal.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {Router} from '@angular/router'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; diff --git a/core/app/core/src/lib/views/record/actions/cancel/record-cancel.action.ts b/core/app/core/src/lib/views/record/actions/cancel/record-cancel.action.ts index 06f231f3c..d44746c66 100644 --- a/core/app/core/src/lib/views/record/actions/cancel/record-cancel.action.ts +++ b/core/app/core/src/lib/views/record/actions/cancel/record-cancel.action.ts @@ -25,7 +25,8 @@ */ import {Injectable} from '@angular/core'; -import {ModalButtonInterface, ViewMode} from 'common'; +import {ModalButtonInterface} from '../../../../common/components/modal/modal.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {RecordActionData, RecordActionHandler} from '../record.action'; import {MessageModalComponent} from '../../../../components/modal/components/message-modal/message-modal.component'; diff --git a/core/app/core/src/lib/views/record/actions/create/record-create.action.ts b/core/app/core/src/lib/views/record/actions/create/record-create.action.ts index 06d887b69..4809f4b7e 100644 --- a/core/app/core/src/lib/views/record/actions/create/record-create.action.ts +++ b/core/app/core/src/lib/views/record/actions/create/record-create.action.ts @@ -26,7 +26,7 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {ModuleNameMapper} from '../../../../services/navigation/module-name-mapper/module-name-mapper.service'; import {RecordActionData, RecordActionHandler} from '../record.action'; diff --git a/core/app/core/src/lib/views/record/actions/edit/record-edit.action.ts b/core/app/core/src/lib/views/record/actions/edit/record-edit.action.ts index a6c5c077b..9ccb6ed31 100644 --- a/core/app/core/src/lib/views/record/actions/edit/record-edit.action.ts +++ b/core/app/core/src/lib/views/record/actions/edit/record-edit.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordActionData, RecordActionHandler} from '../record.action'; @Injectable({ diff --git a/core/app/core/src/lib/views/record/actions/record.action.ts b/core/app/core/src/lib/views/record/actions/record.action.ts index a528fb40c..6a29cfc3e 100644 --- a/core/app/core/src/lib/views/record/actions/record.action.ts +++ b/core/app/core/src/lib/views/record/actions/record.action.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Action, ActionData, ActionHandler, Record} from 'common'; +import {Action, ActionData, ActionHandler} from '../../../common/actions/action.model'; +import {Record} from '../../../common/record/record.model'; import {RecordViewStore} from '../store/record-view/record-view.store'; import {ModuleNavigation} from '../../../services/navigation/module-navigation/module-navigation.service'; import {Router} from "@angular/router"; diff --git a/core/app/core/src/lib/views/record/actions/save-new/record-save-new.action.ts b/core/app/core/src/lib/views/record/actions/save-new/record-save-new.action.ts index b7ca5e9fa..1dde1e335 100644 --- a/core/app/core/src/lib/views/record/actions/save-new/record-save-new.action.ts +++ b/core/app/core/src/lib/views/record/actions/save-new/record-save-new.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {RecordActionData, RecordActionHandler} from '../record.action'; import {MessageService} from '../../../../services/message/message.service'; diff --git a/core/app/core/src/lib/views/record/actions/save/record-save.action.ts b/core/app/core/src/lib/views/record/actions/save/record-save.action.ts index 7d2af5845..347df2468 100644 --- a/core/app/core/src/lib/views/record/actions/save/record-save.action.ts +++ b/core/app/core/src/lib/views/record/actions/save/record-save.action.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {take} from 'rxjs/operators'; import {RecordActionData, RecordActionHandler} from '../record.action'; import {MessageService} from '../../../../services/message/message.service'; diff --git a/core/app/core/src/lib/views/record/actions/toggle-widgets/record-widget-action.service.ts b/core/app/core/src/lib/views/record/actions/toggle-widgets/record-widget-action.service.ts index 5c0117361..341fcb536 100644 --- a/core/app/core/src/lib/views/record/actions/toggle-widgets/record-widget-action.service.ts +++ b/core/app/core/src/lib/views/record/actions/toggle-widgets/record-widget-action.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from '@angular/core'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordActionData, RecordActionHandler} from '../record.action'; @Injectable({ diff --git a/core/app/core/src/lib/views/record/adapters/actions.adapter.ts b/core/app/core/src/lib/views/record/adapters/actions.adapter.ts index 8c9f54534..9fe5204d0 100644 --- a/core/app/core/src/lib/views/record/adapters/actions.adapter.ts +++ b/core/app/core/src/lib/views/record/adapters/actions.adapter.ts @@ -24,37 +24,29 @@ * the words "Supercharged by SuiteCRM". */ -import { combineLatestWith, Observable } from 'rxjs'; -import { - map, - take, -} from 'rxjs/operators'; -import { Injectable } from '@angular/core'; -import { - Action, - ActionContext, - ActionHandler, - LogicDefinitions, - ModeActions, - Record, - ViewMode, - Panel -} from 'common'; -import { MetadataStore, RecordViewMetadata } from '../../../store/metadata/metadata.store.service'; -import { RecordViewStore } from '../store/record-view/record-view.store'; -import { RecordActionManager } from '../actions/record-action-manager.service'; +import {combineLatestWith, Observable} from 'rxjs'; +import {map, take}from 'rxjs/operators'; +import {Injectable} from '@angular/core'; +import {Action, ActionContext, ActionHandler, ModeActions} from '../../../common/actions/action.model'; +import {LogicDefinitions} from '../../../common/metadata/metadata.model'; +import {Panel} from '../../../common/metadata/metadata.model'; +import {Record} from '../../../common/record/record.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {MetadataStore, RecordViewMetadata} from '../../../store/metadata/metadata.store.service'; +import {RecordViewStore} from '../store/record-view/record-view.store'; +import {RecordActionManager} from '../actions/record-action-manager.service'; import { AsyncActionInput, AsyncActionService, } from '../../../services/process/processes/async-action/async-action'; -import { RecordActionData } from '../actions/record.action'; -import { LanguageStore, LanguageStrings } from '../../../store/language/language.store'; -import { MessageService } from '../../../services/message/message.service'; -import { Process } from '../../../services/process/process.service'; -import { ConfirmationModalService } from '../../../services/modals/confirmation-modal.service'; -import { BaseRecordActionsAdapter } from '../../../services/actions/base-record-action.adapter'; -import { SelectModalService } from '../../../services/modals/select-modal.service'; -import { RecordActionDisplayTypeLogic } from '../action-logic/display-type/display-type.logic'; +import {RecordActionData} from '../actions/record.action'; +import {LanguageStore, LanguageStrings} from '../../../store/language/language.store'; +import {MessageService} from '../../../services/message/message.service'; +import {Process} from '../../../services/process/process.service'; +import {ConfirmationModalService} from '../../../services/modals/confirmation-modal.service'; +import {BaseRecordActionsAdapter} from '../../../services/actions/base-record-action.adapter'; +import {SelectModalService} from '../../../services/modals/select-modal.service'; +import {RecordActionDisplayTypeLogic} from '../action-logic/display-type/display-type.logic'; import {AppMetadataStore} from "../../../store/app-metadata/app-metadata.store.service"; @Injectable() diff --git a/core/app/core/src/lib/views/record/adapters/record-content.adapter.ts b/core/app/core/src/lib/views/record/adapters/record-content.adapter.ts index 06c6f27a2..b182cfb4b 100644 --- a/core/app/core/src/lib/views/record/adapters/record-content.adapter.ts +++ b/core/app/core/src/lib/views/record/adapters/record-content.adapter.ts @@ -27,7 +27,10 @@ import {combineLatestWith, Observable, Subscription} from 'rxjs'; import {inject, Injectable} from '@angular/core'; import {map} from 'rxjs/operators'; -import {Action, Panel, Record, ViewMode} from 'common'; +import {Action} from '../../../common/actions/action.model'; +import {ViewMode} from '../../../common/views/view.model'; +import {Record} from '../../../common/record/record.model'; +import {Panel} from '../../../common/metadata/metadata.model'; import {MetadataStore, RecordViewMetadata} from '../../../store/metadata/metadata.store.service'; import {RecordContentConfig, RecordContentDataSource} from '../../../components/record-content/record-content.model'; import {RecordActionManager} from '../actions/record-action-manager.service'; diff --git a/core/app/core/src/lib/views/record/components/record-container/record-container.component.spec.ts b/core/app/core/src/lib/views/record/components/record-container/record-container.component.spec.ts index b2415a445..bc58bad57 100644 --- a/core/app/core/src/lib/views/record/components/record-container/record-container.component.spec.ts +++ b/core/app/core/src/lib/views/record/components/record-container/record-container.component.spec.ts @@ -28,7 +28,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {AngularSvgIconModule} from 'angular-svg-icon'; import {RecordContainerComponent} from './record-container.component'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {of} from 'rxjs'; import {take} from 'rxjs/operators'; @@ -56,6 +56,7 @@ import {languageStoreMock} from '../../../../store/language/language.store.spec. import {systemConfigStoreMock} from '../../../../store/system-config/system-config.store.spec.mock'; import {appStateStoreMock} from '../../../../store/app-state/app-state.store.spec.mock'; import {ThemeImagesStore} from '../../../../store/theme-images/theme-images.store'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('RecordContainerComponent', () => { let component: RecordContainerComponent; @@ -63,33 +64,32 @@ describe('RecordContainerComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - WidgetPanelModule, - AngularSvgIconModule.forRoot(), - HttpClientTestingModule, - NoopAnimationsModule, - ApolloTestingModule, - SubpanelModule - ], - providers: [ - {provide: RecordViewStore, useValue: recordviewStoreMock}, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - {provide: NavigationStore, useValue: navigationMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - {provide: AppStateStore, useValue: appStateStoreMock}, - {provide: Router, useValue: mockRouter}, - ], - declarations: [RecordContainerComponent] - }) + declarations: [RecordContainerComponent], + imports: [WidgetPanelModule, + AngularSvgIconModule.forRoot(), + NoopAnimationsModule, + ApolloTestingModule, + SubpanelModule], + providers: [ + { provide: RecordViewStore, useValue: recordviewStoreMock }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + { provide: NavigationStore, useValue: navigationMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + { provide: AppStateStore, useValue: appStateStoreMock }, + { provide: Router, useValue: mockRouter }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); })); diff --git a/core/app/core/src/lib/views/record/components/record-container/record-container.component.ts b/core/app/core/src/lib/views/record/components/record-container/record-container.component.ts index 0d5247cd8..1cb4ccf97 100644 --- a/core/app/core/src/lib/views/record/components/record-container/record-container.component.ts +++ b/core/app/core/src/lib/views/record/components/record-container/record-container.component.ts @@ -27,7 +27,8 @@ import {Component, HostListener, OnDestroy, OnInit} from '@angular/core'; import {combineLatestWith, Observable, Subscription} from 'rxjs'; import {map, filter} from 'rxjs/operators'; -import {ViewContext, WidgetMetadata} from 'common'; +import {ViewContext} from '../../../../common/views/view.model'; +import {WidgetMetadata} from '../../../../common/metadata/widget.metadata'; import {MetadataStore} from '../../../../store/metadata/metadata.store.service'; import {LanguageStore, LanguageStrings} from '../../../../store/language/language.store'; import { @@ -40,7 +41,7 @@ import {RecordContentDataSource} from '../../../../components/record-content/rec import {TopWidgetAdapter} from '../../adapters/top-widget.adapter'; import {BottomWidgetAdapter} from '../../adapters/bottom-widget.adapter'; import {RecordActionsAdapter} from '../../adapters/actions.adapter'; -import {Action, ActionContext} from 'common'; +import {Action, ActionContext} from '../../../../common/actions/action.model'; import {RecordViewSidebarWidgetService} from "../../services/record-view-sidebar-widget.service"; import {ActivatedRoute} from "@angular/router"; diff --git a/core/app/core/src/lib/views/record/components/record-header/record-header.component.spec.ts b/core/app/core/src/lib/views/record/components/record-header/record-header.component.spec.ts index d28ed0e3e..f37ea18fb 100644 --- a/core/app/core/src/lib/views/record/components/record-header/record-header.component.spec.ts +++ b/core/app/core/src/lib/views/record/components/record-header/record-header.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {ApolloTestingModule} from 'apollo-angular/testing'; import {RecordHeaderComponent} from './record-header.component'; import {RouterTestingModule} from '@angular/router/testing'; @@ -54,6 +54,7 @@ import {appStateStoreMock} from '../../../../store/app-state/app-state.store.spe import {recordActionsMock} from '../../adapters/actions.adapter.spec.mock'; import {ThemeImagesStore} from '../../../../store/theme-images/theme-images.store'; import {ActionGroupMenuModule} from '../../../../components/action-group-menu/action-group-menu.module'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'record-header-test-host-component', @@ -68,30 +69,29 @@ describe('RecordHeaderComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [ - ModuleTitleModule, - ButtonModule, - ApolloTestingModule, - HttpClientTestingModule, - ImageModule, - RouterTestingModule, - ActionGroupMenuModule - ], - declarations: [RecordHeaderComponent, RecordHeaderTestHostComponent], - providers: [ - {provide: RecordViewStore, useValue: recordviewStoreMock}, - {provide: ThemeImagesStore, useValue: themeImagesStoreMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - {provide: NavigationStore, useValue: navigationMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - {provide: AppStateStore, useValue: appStateStoreMock}, - {provide: RecordActionsAdapter, useValue: recordActionsMock}, - ], - }) + declarations: [RecordHeaderComponent, RecordHeaderTestHostComponent], + imports: [ModuleTitleModule, + ButtonModule, + ApolloTestingModule, + ImageModule, + RouterTestingModule, + ActionGroupMenuModule], + providers: [ + { provide: RecordViewStore, useValue: recordviewStoreMock }, + { provide: ThemeImagesStore, useValue: themeImagesStoreMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + { provide: NavigationStore, useValue: navigationMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + { provide: AppStateStore, useValue: appStateStoreMock }, + { provide: RecordActionsAdapter, useValue: recordActionsMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); testHostFixture = TestBed.createComponent(RecordHeaderTestHostComponent); diff --git a/core/app/core/src/lib/views/record/components/record-header/record-header.component.ts b/core/app/core/src/lib/views/record/components/record-header/record-header.component.ts index 24a171887..29fed15e5 100644 --- a/core/app/core/src/lib/views/record/components/record-header/record-header.component.ts +++ b/core/app/core/src/lib/views/record/components/record-header/record-header.component.ts @@ -30,7 +30,10 @@ import {Subscription} from 'rxjs'; import {RecordViewStore} from '../../store/record-view/record-view.store'; import {ModuleNavigation} from '../../../../services/navigation/module-navigation/module-navigation.service'; import {RecordActionsAdapter} from '../../adapters/actions.adapter'; -import {ActionContext, ButtonInterface, Record, ViewMode} from 'common'; +import {ActionContext} from '../../../../common/actions/action.model'; +import {ButtonInterface} from '../../../../common/components/button/button.model'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {AppStateStore} from "../../../../store/app-state/app-state.store"; import {Router} from "@angular/router"; diff --git a/core/app/core/src/lib/views/record/components/record-view/record.component.spec.ts b/core/app/core/src/lib/views/record/components/record-view/record.component.spec.ts index ead692b1e..f1fd3fe9f 100644 --- a/core/app/core/src/lib/views/record/components/record-view/record.component.spec.ts +++ b/core/app/core/src/lib/views/record/components/record-view/record.component.spec.ts @@ -26,7 +26,7 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {Component} from '@angular/core'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {RouterTestingModule} from '@angular/router/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {ApolloTestingModule} from 'apollo-angular/testing'; @@ -59,6 +59,7 @@ import {MetadataStore} from '../../../../store/metadata/metadata.store.service'; import {mockModuleNavigation} from '../../../../services/navigation/module-navigation/module-navigation.service.spec.mock'; import {languageStoreMock} from '../../../../store/language/language.store.spec.mock'; import {systemConfigStoreMock} from '../../../../store/system-config/system-config.store.spec.mock'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; @Component({ selector: 'record-test-host-component', @@ -74,38 +75,37 @@ describe('RecordComponent', () => { beforeEach(waitForAsync(() => { /* eslint-disable camelcase, @typescript-eslint/camelcase */ TestBed.configureTestingModule({ - imports: [ - HttpClientTestingModule, - RouterTestingModule, - NoopAnimationsModule, - ImageModule, - ApolloTestingModule, - DynamicModule, - FieldModule, - DropdownButtonModule, - RecordContainerModule, - RecordHeaderModule, - StatusBarModule, - AngularSvgIconModule.forRoot() - ], - declarations: [RecordComponent, RecordTestHostComponent], - providers: [ - {provide: RecordViewStore, useValue: recordviewStoreMock}, - { - provide: ThemeImagesStore, useValue: { - images$: of(themeImagesMockData).pipe(take(1)) - } - }, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: SystemConfigStore, useValue: systemConfigStoreMock}, - {provide: UserPreferenceStore, useValue: userPreferenceStoreMock}, - {provide: NavigationStore, useValue: navigationMock}, - {provide: ModuleNavigation, useValue: mockModuleNavigation}, - {provide: LanguageStore, useValue: languageStoreMock}, - {provide: MetadataStore, useValue: metadataStoreMock}, - {provide: AppStateStore, useValue: appStateStoreMock}, - ], - }) + declarations: [RecordComponent, RecordTestHostComponent], + imports: [RouterTestingModule, + NoopAnimationsModule, + ImageModule, + ApolloTestingModule, + DynamicModule, + FieldModule, + DropdownButtonModule, + RecordContainerModule, + RecordHeaderModule, + StatusBarModule, + AngularSvgIconModule.forRoot()], + providers: [ + { provide: RecordViewStore, useValue: recordviewStoreMock }, + { + provide: ThemeImagesStore, useValue: { + images$: of(themeImagesMockData).pipe(take(1)) + } + }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: SystemConfigStore, useValue: systemConfigStoreMock }, + { provide: UserPreferenceStore, useValue: userPreferenceStoreMock }, + { provide: NavigationStore, useValue: navigationMock }, + { provide: ModuleNavigation, useValue: mockModuleNavigation }, + { provide: LanguageStore, useValue: languageStoreMock }, + { provide: MetadataStore, useValue: metadataStoreMock }, + { provide: AppStateStore, useValue: appStateStoreMock }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ] +}) .compileComponents(); /* eslint-enable camelcase, @typescript-eslint/camelcase */ })); diff --git a/core/app/core/src/lib/views/record/components/record-view/record.component.ts b/core/app/core/src/lib/views/record/components/record-view/record.component.ts index 42770c02d..021cbbc6a 100644 --- a/core/app/core/src/lib/views/record/components/record-view/record.component.ts +++ b/core/app/core/src/lib/views/record/components/record-view/record.component.ts @@ -30,7 +30,7 @@ import {Observable, Subscription} from 'rxjs'; import {RecordViewStore} from '../../store/record-view/record-view.store'; import {ActivatedRoute, Params} from '@angular/router'; import {RecordViewModel} from '../../store/record-view/record-view.store.model'; -import {ViewMode} from 'common'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordActionsAdapter} from '../../adapters/actions.adapter'; import {RecordViewSidebarWidgetService} from "../../services/record-view-sidebar-widget.service"; import {RecordPaginationStore} from "../../store/record-pagination/record-pagination.store"; diff --git a/core/app/core/src/lib/views/record/services/record-view-sidebar-widget.service.ts b/core/app/core/src/lib/views/record/services/record-view-sidebar-widget.service.ts index 3ee7205fa..341feeb41 100644 --- a/core/app/core/src/lib/views/record/services/record-view-sidebar-widget.service.ts +++ b/core/app/core/src/lib/views/record/services/record-view-sidebar-widget.service.ts @@ -25,7 +25,7 @@ */ import {Injectable} from "@angular/core"; -import {isTrue} from 'common'; +import {isTrue} from '../../../common/utils/value-utils'; import {Observable, Subscription} from "rxjs"; import {ScreenSizeObserverService} from "../../../services/ui/screen-size-observer/screen-size-observer.service"; import {SystemConfigStore} from "../../../store/system-config/system-config.store"; diff --git a/core/app/core/src/lib/views/record/store/record-view/record-view.store.model.ts b/core/app/core/src/lib/views/record/store/record-view/record-view.store.model.ts index d0fd028cd..c5ef93cc5 100644 --- a/core/app/core/src/lib/views/record/store/record-view/record-view.store.model.ts +++ b/core/app/core/src/lib/views/record/store/record-view/record-view.store.model.ts @@ -24,7 +24,8 @@ * the words "Supercharged by SuiteCRM". */ -import {Record, ViewMode} from 'common'; +import {Record} from '../../../../common/record/record.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {AppData} from '../../../../store/view/view.store'; import {Metadata} from '../../../../store/metadata/metadata.store.service'; diff --git a/core/app/core/src/lib/views/record/store/record-view/record-view.store.spec.mock.ts b/core/app/core/src/lib/views/record/store/record-view/record-view.store.spec.mock.ts index 29b4d2c10..2f6b8366a 100644 --- a/core/app/core/src/lib/views/record/store/record-view/record-view.store.spec.mock.ts +++ b/core/app/core/src/lib/views/record/store/record-view/record-view.store.spec.mock.ts @@ -26,7 +26,10 @@ import {Observable, of} from 'rxjs'; import {shareReplay, take} from 'rxjs/operators'; -import {deepClone, Record, RecordMapperRegistry, StatisticsMap, StatisticsQueryMap} from 'common'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {Record} from '../../../../common/record/record.model'; +import {RecordMapperRegistry} from '../../../../common/record/record-mappers/record-mapper.registry'; +import {StatisticsMap, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; import {navigationMock} from '../../../../store/navigation/navigation.store.spec.mock'; import {RecordViewStore} from './record-view.store'; import {mockModuleNavigation} from '../../../../services/navigation/module-navigation/module-navigation.service.spec.mock'; diff --git a/core/app/core/src/lib/views/record/store/record-view/record-view.store.ts b/core/app/core/src/lib/views/record/store/record-view/record-view.store.ts index 6138b563f..3bf774564 100644 --- a/core/app/core/src/lib/views/record/store/record-view/record-view.store.ts +++ b/core/app/core/src/lib/views/record/store/record-view/record-view.store.ts @@ -24,30 +24,23 @@ * the words "Supercharged by SuiteCRM". */ -import {isEmpty} from 'lodash-es'; -import {BehaviorSubject, combineLatest, combineLatestWith, Observable, of, Subscription} from 'rxjs'; -import {catchError, distinctUntilChanged, finalize, map, take, tap} from 'rxjs/operators'; -import {inject, Injectable} from '@angular/core'; -import {Params} from '@angular/router'; -import { - BooleanMap, - deepClone, - FieldDefinitionMap, - FieldLogicMap, - FieldMetadata, - isVoid, - ObjectMap, - Panel, - PanelRow, - Record, - StatisticsMap, - StatisticsQueryMap, - SubPanelMeta, - ViewContext, - ViewFieldDefinition, - ViewFieldDefinitionMap, - ViewMode, -} from 'common'; +import { isEmpty } from 'lodash-es'; +import { BehaviorSubject, combineLatest, combineLatestWith, Observable, of, Subscription } from 'rxjs'; +import { catchError, distinctUntilChanged, finalize, map, take, tap } from 'rxjs/operators'; +import {Injectable} from '@angular/core'; +import { Params } from '@angular/router'; +import {isVoid} from '../../../../common/utils/value-utils'; +import {deepClone} from '../../../../common/utils/object-utils'; +import {BooleanMap} from '../../../../common/types/boolean-map'; +import {Field, FieldDefinitionMap, FieldMetadata} from '../../../../common/record/field.model'; +import {FieldLogicMap} from '../../../../common/actions/field-logic-action.model'; +import {Record} from '../../../../common/record/record.model'; +import {Panel, PanelRow} from '../../../../common/metadata/metadata.model'; +import {StatisticsMap, StatisticsQueryMap} from '../../../../common/statistics/statistics.model'; +import {SubPanelMeta} from '../../../../common/metadata/subpanel.metadata.model'; +import {ViewContext} from '../../../../common/views/view.model'; +import {ViewFieldDefinition, ViewFieldDefinitionMap} from '../../../../common/metadata/metadata.model'; +import {ViewMode} from '../../../../common/views/view.model'; import {RecordViewData, RecordViewModel, RecordViewState} from './record-view.store.model'; import {NavigationStore} from '../../../../store/navigation/navigation.store'; import {StateStore} from '../../../../store/state'; diff --git a/core/app/shell/src/app/app-initializer.ts b/core/app/shell/src/app/app-initializer.ts index f368c959b..a340e2aef 100644 --- a/core/app/shell/src/app/app-initializer.ts +++ b/core/app/shell/src/app/app-initializer.ts @@ -38,6 +38,7 @@ import { ExtensionLoader, InstallAuthGuard, InstallViewComponent, + isFalse, ListComponent, LoginAuthGuard, LoginUiComponent, @@ -49,7 +50,6 @@ import { AdminPanelComponent } from 'core'; import {take} from 'rxjs/operators'; -import {isFalse} from 'common'; @Injectable() export class AppInit { diff --git a/core/app/shell/src/app/app.component.spec.ts b/core/app/shell/src/app/app.component.spec.ts index c8f0dd2ba..c5d0b6617 100644 --- a/core/app/shell/src/app/app.component.spec.ts +++ b/core/app/shell/src/app/app.component.spec.ts @@ -28,18 +28,20 @@ import { TestBed, waitForAsync } from '@angular/core/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {RouterTestingModule} from '@angular/router/testing'; -import {HttpClientTestingModule} from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import {AppComponent} from './app.component'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; describe('AppComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - imports: [RouterTestingModule, HttpClientTestingModule, FormsModule], - declarations: [ - AppComponent - ], - }).compileComponents(); + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [ + AppComponent + ], + imports: [RouterTestingModule, FormsModule], + providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()] +}).compileComponents(); })); }); diff --git a/core/app/shell/src/app/app.module.ts b/core/app/shell/src/app/app.module.ts index e690bec56..96034e0a4 100644 --- a/core/app/shell/src/app/app.module.ts +++ b/core/app/shell/src/app/app.module.ts @@ -26,7 +26,7 @@ import {APP_INITIALIZER, NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; -import {HTTP_INTERCEPTORS, HttpClientModule, HttpClientXsrfModule} from '@angular/common/http'; +import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, withXsrfConfiguration } from '@angular/common/http'; import {Apollo, ApolloModule} from 'apollo-angular'; import {HttpLink} from 'apollo-angular/http'; @@ -74,14 +74,10 @@ import {AngularSvgIconModule} from 'angular-svg-icon'; export const initializeApp = (appInitService: AppInit) => (): Promise => appInitService.init(); -@NgModule({ - declarations: [ +@NgModule({ declarations: [ AppComponent, ], - imports: [ - BrowserModule, - HttpClientModule, - HttpClientXsrfModule, + bootstrap: [AppComponent], imports: [BrowserModule, AppRoutingModule, FooterUiModule, NavbarUiModule, @@ -104,21 +100,23 @@ export const initializeApp = (appInitService: AppInit) => (): Promise => ap MessageModalModule, RecordListModalModule, ApolloModule, - SidebarComponent - ], - providers: [ - {provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true}, - {provide: RouteReuseStrategy, useClass: AppRouteReuseStrategy}, + SidebarComponent], providers: [ + { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true }, + { provide: RouteReuseStrategy, useClass: AppRouteReuseStrategy }, AppInit, { provide: APP_INITIALIZER, useFactory: initializeApp, multi: true, deps: [AppInit] - } - ], - bootstrap: [AppComponent] -}) + }, + provideHttpClient(withInterceptorsFromDi(), + withXsrfConfiguration({ + cookieName: 'XSRF-TOKEN', + headerName: 'X-XSRF-TOKEN' + }) + ) + ] }) export class AppModule { constructor(apollo: Apollo, httpLink: HttpLink, protected auth: AuthService, protected appStore: AppStateStore, protected baseRoute: BaseRouteService) { diff --git a/core/app/shell/webpack.config.js b/core/app/shell/webpack.config.js index 3459c7880..cb66a45ee 100644 --- a/core/app/shell/webpack.config.js +++ b/core/app/shell/webpack.config.js @@ -19,23 +19,23 @@ module.exports = { shared: { '@angular/core': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@angular/common': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@angular/common/http': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@angular/router': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@angular/animations': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@angular/cdk': { singleton: true, @@ -51,7 +51,7 @@ module.exports = { }, '@angular/forms': { singleton: true, - requiredVersion: '^17.3.11' + requiredVersion: '^18.1.1' }, '@apollo/client': { singleton: true, @@ -106,12 +106,6 @@ module.exports = { requiredVersion: '^7.8.1' }, - common: { - singleton: true, - import: 'dist/common', - requiredVersion: false - }, - core: { singleton: true, import: 'dist/core', diff --git a/extensions/defaultExt/app/src/app/app.module.ts b/extensions/defaultExt/app/src/app/app.module.ts index 3e9e5b437..0fbaa8adc 100644 --- a/extensions/defaultExt/app/src/app/app.module.ts +++ b/extensions/defaultExt/app/src/app/app.module.ts @@ -3,19 +3,12 @@ import {NgModule} from '@angular/core'; import {AppComponent} from './app.component'; import {ExtensionModule} from '../extension.module'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -@NgModule({ - declarations: [ +@NgModule({ declarations: [ AppComponent ], - imports: [ - BrowserModule, - HttpClientModule, - ExtensionModule - ], - providers: [], - bootstrap: [AppComponent] -}) + bootstrap: [AppComponent], imports: [BrowserModule, + ExtensionModule], providers: [provideHttpClient(withInterceptorsFromDi())] }) export class AppModule { } diff --git a/extensions/defaultExt/app/src/extension.module.ts b/extensions/defaultExt/app/src/extension.module.ts index d2a7c20cf..bddff8f2b 100644 --- a/extensions/defaultExt/app/src/extension.module.ts +++ b/extensions/defaultExt/app/src/extension.module.ts @@ -1,14 +1,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {HttpClientModule} from '@angular/common/http'; -@NgModule({ - declarations: [], - imports: [ - CommonModule, - HttpClientModule, - ], - providers: [] -}) +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; +@NgModule({ declarations: [], imports: [CommonModule], providers: [provideHttpClient(withInterceptorsFromDi())] }) export class ExtensionModule { constructor() { } diff --git a/package.json b/package.json index 744f94521..39b1dba4a 100644 --- a/package.json +++ b/package.json @@ -7,21 +7,18 @@ "start:shell": "ng serve shell -o --port 5000", "start:all": "concurrently \"npm run start:shell\"", "serve:dist": "concurrently \"serve dist/shell -l 5000 -s\"", - "build-dev": "npm run build-dev:common && npm run build-dev:core && npm run build-dev:shell ", + "build-dev": "npm run build-dev:core && npm run build-dev:shell ", "build-dev:shell": "ng build shell", - "build-dev:common": "ng build common", "build-dev:core": "ng build core", "build-dev:defaultExt": "ng build defaultExt --configuration dev", "build": "npm run build:shell", "build:shell": "ng build shell --configuration production", - "build:common": "ng build common --configuration production", "build:core": "ng build core --configuration production", "build:defaultExt": "ng build defaultExt --configuration production", "test": "npm run test:shell", "test:core": "ng test core", "gen-index": "barrelsby --delete -e '.*\\.spec.*' -q", "gen-index:core": "barrelsby --delete -e '.*\\.spec.*' -q -d core/app/core/src/lib/ -n core", - "gen-index:common": "barrelsby --delete -e '.*\\.spec.*' -q -d 'core/app/common/src/lib/' -n common", "lint": "ng lint", "e2e": "ng e2e" }, @@ -34,16 +31,16 @@ ], "dependencies": { "@angular-architects/module-federation": "^17.0.8", - "@angular/animations": "17.3.11", + "@angular/animations": "18.1.1", "@angular/cdk": "^17.3.10", - "@angular/common": "17.3.11", - "@angular/compiler": "17.3.11", - "@angular/core": "17.3.11", - "@angular/forms": "17.3.11", - "@angular/localize": "17.3.11", - "@angular/platform-browser": "17.3.11", - "@angular/platform-browser-dynamic": "17.3.11", - "@angular/router": "17.3.11", + "@angular/common": "18.1.1", + "@angular/compiler": "18.1.1", + "@angular/core": "18.1.1", + "@angular/forms": "18.1.1", + "@angular/localize": "18.1.1", + "@angular/platform-browser": "18.1.1", + "@angular/platform-browser-dynamic": "18.1.1", + "@angular/router": "18.1.1", "@apollo/client": "^3.10.8", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@nrwl/workspace": "^18.2.0", @@ -76,11 +73,11 @@ "zone.js": "~0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.8", + "@angular-devkit/build-angular": "18.1.1", "@angular-eslint/builder": "0.0.1-alpha.18", - "@angular/cli": "17.3.8", - "@angular/compiler-cli": "17.3.11", - "@angular/language-service": "17.3.11", + "@angular/cli": "18.1.1", + "@angular/compiler-cli": "18.1.1", + "@angular/language-service": "18.1.1", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "^2.0.6", "@types/lodash-es": "^4.17.4", @@ -106,7 +103,7 @@ "karma-firefox-launcher": "^1.3.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.5.0", - "ng-packagr": "^17.3.0", + "ng-packagr": "^18.1.0", "prettier": "^2.8.8", "ts-node": "^8.10.1", "typescript": "~5.4.0" diff --git a/tsconfig.json b/tsconfig.json index 4530ca477..d80a4ea93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,11 +5,11 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, + "esModuleInterop": true, "module": "esnext", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, - "allowSyntheticDefaultImports": true, "importHelpers": true, "target": "ES2022", "typeRoots": [ diff --git a/yarn.lock b/yarn.lock index 06a270f3f..6381a1272 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,14 +28,6 @@ semver "^7.3.5" word-wrap "^1.2.3" -"@angular-devkit/architect@0.1703.8": - version "0.1703.8" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.8.tgz#2b4f26d9e32ac013931631876b4a7a6926657ad3" - integrity sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g== - dependencies: - "@angular-devkit/core" "17.3.8" - rxjs "7.8.1" - "@angular-devkit/architect@0.1801.1": version "0.1801.1" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1801.1.tgz#bfe469394dffdac8d28e55ff55a98a69336c345f" @@ -44,78 +36,7 @@ "@angular-devkit/core" "18.1.1" rxjs "7.8.1" -"@angular-devkit/build-angular@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.8.tgz#a19f05909551f79b95711235b1141f83f96fd558" - integrity sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg== - dependencies: - "@ampproject/remapping" "2.3.0" - "@angular-devkit/architect" "0.1703.8" - "@angular-devkit/build-webpack" "0.1703.8" - "@angular-devkit/core" "17.3.8" - "@babel/core" "7.24.0" - "@babel/generator" "7.23.6" - "@babel/helper-annotate-as-pure" "7.22.5" - "@babel/helper-split-export-declaration" "7.22.6" - "@babel/plugin-transform-async-generator-functions" "7.23.9" - "@babel/plugin-transform-async-to-generator" "7.23.3" - "@babel/plugin-transform-runtime" "7.24.0" - "@babel/preset-env" "7.24.0" - "@babel/runtime" "7.24.0" - "@discoveryjs/json-ext" "0.5.7" - "@ngtools/webpack" "17.3.8" - "@vitejs/plugin-basic-ssl" "1.1.0" - ansi-colors "4.1.3" - autoprefixer "10.4.18" - babel-loader "9.1.3" - babel-plugin-istanbul "6.1.1" - browserslist "^4.21.5" - copy-webpack-plugin "11.0.0" - critters "0.0.22" - css-loader "6.10.0" - esbuild-wasm "0.20.1" - fast-glob "3.3.2" - http-proxy-middleware "2.0.6" - https-proxy-agent "7.0.4" - inquirer "9.2.15" - jsonc-parser "3.2.1" - karma-source-map-support "1.4.0" - less "4.2.0" - less-loader "11.1.0" - license-webpack-plugin "4.0.2" - loader-utils "3.2.1" - magic-string "0.30.8" - mini-css-extract-plugin "2.8.1" - mrmime "2.0.0" - open "8.4.2" - ora "5.4.1" - parse5-html-rewriting-stream "7.0.0" - picomatch "4.0.1" - piscina "4.4.0" - postcss "8.4.35" - postcss-loader "8.1.1" - resolve-url-loader "5.0.0" - rxjs "7.8.1" - sass "1.71.1" - sass-loader "14.1.1" - semver "7.6.0" - source-map-loader "5.0.0" - source-map-support "0.5.21" - terser "5.29.1" - tree-kill "1.2.2" - tslib "2.6.2" - undici "6.11.1" - vite "5.1.7" - watchpack "2.4.0" - webpack "5.90.3" - webpack-dev-middleware "6.1.2" - webpack-dev-server "4.15.1" - webpack-merge "5.10.0" - webpack-subresource-integrity "5.1.0" - optionalDependencies: - esbuild "0.20.1" - -"@angular-devkit/build-angular@^18.0.0": +"@angular-devkit/build-angular@18.1.1", "@angular-devkit/build-angular@^18.0.0": version "18.1.1" resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-18.1.1.tgz#5d36af07f61bbfa56280928ae0ae27521c6f2cd4" integrity sha512-sd/eOzitC8yN9xl/TbbuDxXL1LRZCX3gwKAddV1fJSrXJHEmDM7PhdQbNEPd2O58evMKSiMZK91WnYN0lhTZtw== @@ -186,14 +107,6 @@ optionalDependencies: esbuild "0.21.5" -"@angular-devkit/build-webpack@0.1703.8": - version "0.1703.8" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.8.tgz#d157a5790d5045dd9c312936c3907bd3a184bbfc" - integrity sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q== - dependencies: - "@angular-devkit/architect" "0.1703.8" - rxjs "7.8.1" - "@angular-devkit/build-webpack@0.1801.1": version "0.1801.1" resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1801.1.tgz#870bc13962e6672260f01217fce935e6193f3c8b" @@ -202,18 +115,6 @@ "@angular-devkit/architect" "0.1801.1" rxjs "7.8.1" -"@angular-devkit/core@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.8.tgz#8679cacf84cf79764f027811020e235ab32016d2" - integrity sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q== - dependencies: - ajv "8.12.0" - ajv-formats "2.1.1" - jsonc-parser "3.2.1" - picomatch "4.0.1" - rxjs "7.8.1" - source-map "0.7.4" - "@angular-devkit/core@18.1.1": version "18.1.1" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-18.1.1.tgz#9fa43c402c3d6b2ea19cd1597b78c362e794c19b" @@ -226,17 +127,6 @@ rxjs "7.8.1" source-map "0.7.4" -"@angular-devkit/schematics@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.8.tgz#f853eb21682aadfb6667e090b5b509fc95ce8442" - integrity sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg== - dependencies: - "@angular-devkit/core" "17.3.8" - jsonc-parser "3.2.1" - magic-string "0.30.8" - ora "5.4.1" - rxjs "7.8.1" - "@angular-devkit/schematics@18.1.1": version "18.1.1" resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-18.1.1.tgz#900247fdf842c3814d67b8638ca1870a695f32b1" @@ -253,10 +143,10 @@ resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-0.0.1-alpha.18.tgz#3a3ac2d93782ce24a99457df93b4755912cca8a9" integrity sha512-xDipFDGxtY0Hjy2ua2BwsuxFKdC9eZBdXr+HXXXvbLCGn9DTHT5RbPinZJ4bMPJz4QE6yIrg6EhoB4CWHLZvhw== -"@angular/animations@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.11.tgz#86e5c6a1fbf9b7e2bf5441e334db5b8b2132be2d" - integrity sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw== +"@angular/animations@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-18.1.1.tgz#684ae50e3a4a713725cae3a249ffed79dac37c0c" + integrity sha512-3BdB6lB7TT1BQFb8C3XyJ5A9YSrOx951NzcXnzFfTNiq1C+VeR455LtdNiDTPa9Vf5Df1cJb6ReJ1z17ztx+6Q== dependencies: tslib "^2.3.0" @@ -302,43 +192,42 @@ optionalDependencies: parse5 "^7.1.2" -"@angular/cli@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.8.tgz#3673fd5dd4fbc96a6ed57c4e871ac5a92d5702c7" - integrity sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ== +"@angular/cli@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-18.1.1.tgz#bfdde66c3951e09decd20147be4fc400735619fa" + integrity sha512-sRmc5meBLRQgFKq6te1UM4JPHWPERrg1pjYStft/qRKkOyvgpNzq3Ol6hN3zNb2ds2bAgjKhEAlOwSOZuw1cqQ== dependencies: - "@angular-devkit/architect" "0.1703.8" - "@angular-devkit/core" "17.3.8" - "@angular-devkit/schematics" "17.3.8" - "@schematics/angular" "17.3.8" + "@angular-devkit/architect" "0.1801.1" + "@angular-devkit/core" "18.1.1" + "@angular-devkit/schematics" "18.1.1" + "@inquirer/prompts" "5.0.7" + "@listr2/prompt-adapter-inquirer" "2.0.13" + "@schematics/angular" "18.1.1" "@yarnpkg/lockfile" "1.1.0" - ansi-colors "4.1.3" - ini "4.1.2" - inquirer "9.2.15" - jsonc-parser "3.2.1" - npm-package-arg "11.0.1" - npm-pick-manifest "9.0.0" - open "8.4.2" - ora "5.4.1" - pacote "17.0.6" + ini "4.1.3" + jsonc-parser "3.3.1" + listr2 "8.2.3" + npm-package-arg "11.0.2" + npm-pick-manifest "9.0.1" + pacote "18.0.6" resolve "1.22.8" - semver "7.6.0" + semver "7.6.2" symbol-observable "4.0.0" yargs "17.7.2" -"@angular/common@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.11.tgz#1698a0a93d3dab6e52da9d6600e8fba3a63a4e68" - integrity sha512-WG+HQjUaQziYLGdbcv2aW+G73uroN5VF9yk4qWYcolW+VB8SV/DOAol8uFVgCF21cIOl5+wfJZvA4r5oG3dYaw== +"@angular/common@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-18.1.1.tgz#4ce2fe05c1136c68c660ad0f3640988c2fe1578b" + integrity sha512-qNfYAapvIi8JyQToSqbg3O5dRXaElv/yNp2evvBGn4UO/liHjdNV/DzgCdyKP7uVbYrR0W3bzj++SxVR3mrATQ== dependencies: tslib "^2.3.0" -"@angular/compiler-cli@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz#b2616d88111254790c12900d2cf424e2ac58f37e" - integrity sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g== +"@angular/compiler-cli@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-18.1.1.tgz#ffeaf9321f5fb9cd48dde90f1ef76fbb14fa9eec" + integrity sha512-TMPrN4HLa5raxW133bY3AxH1Gar36nmy0ikttMeSotLSlC5Y4SCYaiMY7QaPytD1iEGvqAd/rP+YuXzOIuCM/w== dependencies: - "@babel/core" "7.23.9" + "@babel/core" "7.24.7" "@jridgewell/sourcemap-codec" "^1.4.14" chokidar "^3.0.0" convert-source-map "^1.5.1" @@ -347,60 +236,60 @@ tslib "^2.3.0" yargs "^17.2.1" -"@angular/compiler@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.11.tgz#ecf1138bbb69be4cb7a7bf88a71f4ad93128b466" - integrity sha512-ingRoREDPkeZGSa13DlztSjZgGArNcmsAWjj+f+vQgQekTjkfQD/N+Bix/LSt5ZdbSjHMtrkDMyRPwbNyk5Keg== +"@angular/compiler@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-18.1.1.tgz#f4d0ac3323625d2c1539e26aa227ce05af8481fd" + integrity sha512-Nc2GZhXXi3O2otZIWgOJoGZ+88+R6YXGc70dibEpMvmDjKfYpc4pBjuYzaGntdiTYAzVOVTTv09dwTP6YOpPRA== dependencies: tslib "^2.3.0" -"@angular/core@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.11.tgz#8de94fbb986ceec7e96356a60c9edf98131ae97b" - integrity sha512-2wPZwXFei3kVxK2ylIH6CdGebrC4kvooFx7qoX+250OITAEFMODJGdh/e3x0DpFUjlRvQtIFQ+YpQlfC5JnL4g== +"@angular/core@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-18.1.1.tgz#e6d18a8b1e347b77780ce01cdd11138cc25bd11a" + integrity sha512-/JFQ49fVIthZzdggl7FOCYAjaynbkRcCyiri85kAyTIvJ6aMSIiEKwJCw45WI5ICf2HtC9kz6dr0OKhMR6SeiA== dependencies: tslib "^2.3.0" -"@angular/forms@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.11.tgz#5e37ff81964e184fbb98b1f016fe3062dd5d2571" - integrity sha512-719flo/1L64YOAxL3pzszTK+7bczVVOQDXT1khnjb48GVZdBUBwW2D+cFbqSW1VMuWWr2Amwy1lL4YM5S7qPJQ== +"@angular/forms@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-18.1.1.tgz#151a8c6b5081bf06e6fcefecf3dac259eb77be63" + integrity sha512-CceH57IKeH2Zq8QFFkcJMvBbjxVRCtqzAqSETfShWzrt+ITrz4c6EnUMbj30iz+ntn/R+qGAp3n/t0D7HtTS6Q== dependencies: tslib "^2.3.0" -"@angular/language-service@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.3.11.tgz#0e9ee1614b443fd2ff3b4f3e99ed4b7e84cb1422" - integrity sha512-C93TH34vG6Un8G0C75TU0aeTppJWUUbRcnR/3I6/ZmTirjIspXEAcmUr2LssFnULTYqA0npNn8cfDtsoLeoGog== +"@angular/language-service@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-18.1.1.tgz#1c68039d317b342b4244792b7213a8841604e190" + integrity sha512-SK9mKBB+fWXBXgdDLPZQI/peHqeQLheseSUPhZQyARDR6CrUvhB7MSRWERhn8832fZ6BoCE01p1obsYLWeXNbw== -"@angular/localize@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.11.tgz#2eaec8c8126caaa7bad7cc7433ea91882fbe4885" - integrity sha512-uc38JfGpIEb13rDZu7wZfEvLxBpWbhfsOR+yI21M4zIiKYQxI7RGgtH9GbCKZDEZmeTUSz/idA4zwRiiX8wNvQ== +"@angular/localize@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-18.1.1.tgz#2dbc2f999b21c15816d400699aaf4ba76425e8b3" + integrity sha512-KuUXPWq91XrSsYPvi0tVp+dlG2F+doxXN/FOg+RhUh3X4Qdxy93OWPTMmkWxJ6U9rbXFBKqxfd0+Vnt/BypMmg== dependencies: - "@babel/core" "7.23.9" + "@babel/core" "7.24.7" "@types/babel__core" "7.20.5" fast-glob "3.3.2" yargs "^17.2.1" -"@angular/platform-browser-dynamic@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.11.tgz#d578cefbba24800e94756338a7789dbe8014b63b" - integrity sha512-JPA0enJyJQ5H340WQ2wfXbCCHzjBiAljEDMr/Siw/CzSe0XI8aQYDqKMLUMtRyCdYhNCEYjnBWgXBi9Za9blZg== +"@angular/platform-browser-dynamic@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.1.1.tgz#a8d3f31c57227977f1315e1b82b3c1052c27b5a4" + integrity sha512-+nnWGLz7dhkRbel8qGIgfQa5PoE4ZMl0ClDw8HR0R5T3w+v0K6trPSjWIPDHm5ex25RvuLNmoUGu29drlHN3Fw== dependencies: tslib "^2.3.0" -"@angular/platform-browser@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.11.tgz#44c4814b76c3de43496159d76e19913f8d331744" - integrity sha512-sWjMy8qKH6AOt5YV4OMoPhExCbGdRIPjNSwUrxCm8a8Zz5DamoX3Sib9yRk1etjBuRj+oJySSxISJim2OYXJQQ== +"@angular/platform-browser@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-18.1.1.tgz#270aee5a62fca26d0903e52c07915a26a3ba6bf6" + integrity sha512-9FG2+NSWJXo+zu/W7VQE0UpaWejbV62AXW7218FBZXOdkdID5oNxHf0QdJ3hCaIJw1dKZEG49BTq005d9yQbew== dependencies: tslib "^2.3.0" -"@angular/router@17.3.11": - version "17.3.11" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.11.tgz#fd28e6b7f836683c571f2ed50eae6b97e6383038" - integrity sha512-A3aU6uHAeJfsfCw1dgNXHn2Kjw/UieRMnFwENkzz96YFCvFPCEZjy/mODuE3zHludMuqVsJhM/uUxWu8ATRTcA== +"@angular/router@18.1.1": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-18.1.1.tgz#66cbf049a92140878b23233e13c7fe0991a148bf" + integrity sha512-XaPL+jzmanQa3y9JSMpyxcTqHTNLiGLW6yzcZ0hiKDRpCJ044cKLMK5Ruk84LfzvVDS//tGj46OYAwrPGmBFMg== dependencies: tslib "^2.3.0" @@ -424,7 +313,7 @@ tslib "^2.3.0" zen-observable-ts "^1.2.5" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.7": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== @@ -437,54 +326,12 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed" integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw== -"@babel/compat-data@^7.23.5", "@babel/compat-data@^7.24.8": +"@babel/compat-data@^7.24.8": version "7.24.9" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.9.tgz#53eee4e68f1c1d0282aa0eb05ddb02d033fc43a0" integrity sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng== -"@babel/core@7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" - integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.9" - "@babel/parser" "^7.23.9" - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" - convert-source-map "^2.0.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.3" - semver "^6.3.1" - -"@babel/core@7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b" - integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.24.0" - "@babel/parser" "^7.24.0" - "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.0" - "@babel/types" "^7.24.0" - convert-source-map "^2.0.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.3" - semver "^6.3.1" - -"@babel/core@7.24.7", "@babel/core@^7.12.3": +"@babel/core@7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4" integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g== @@ -526,16 +373,6 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== - dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - "@babel/generator@7.24.7", "@babel/generator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d" @@ -546,7 +383,7 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/generator@^7.23.6", "@babel/generator@^7.24.8", "@babel/generator@^7.24.9": +"@babel/generator@^7.24.8", "@babel/generator@^7.24.9": version "7.24.10" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.10.tgz#a4ab681ec2a78bbb9ba22a3941195e28a81d8e76" integrity sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg== @@ -556,13 +393,6 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-annotate-as-pure@7.24.7", "@babel/helper-annotate-as-pure@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" @@ -589,7 +419,7 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-compilation-targets@^7.23.6", "@babel/helper-compilation-targets@^7.24.8": +"@babel/helper-compilation-targets@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz#b607c3161cd9d1744977d4f97139572fe778c271" integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw== @@ -624,17 +454,6 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b" - integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q== - dependencies: - "@babel/helper-compilation-targets" "^7.22.6" - "@babel/helper-plugin-utils" "^7.22.5" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - "@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": version "0.6.2" resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" @@ -646,7 +465,7 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.24.7": +"@babel/helper-environment-visitor@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9" integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ== @@ -676,7 +495,7 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -684,10 +503,10 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.24.9": - version "7.24.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz#e13d26306b89eea569180868e652e7f514de9d29" - integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw== +"@babel/helper-module-transforms@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8" + integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ== dependencies: "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-module-imports" "^7.24.7" @@ -695,10 +514,10 @@ "@babel/helper-split-export-declaration" "^7.24.7" "@babel/helper-validator-identifier" "^7.24.7" -"@babel/helper-module-transforms@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8" - integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ== +"@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.24.9": + version "7.24.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz#e13d26306b89eea569180868e652e7f514de9d29" + integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw== dependencies: "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-module-imports" "^7.24.7" @@ -718,12 +537,12 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0" integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg== -"@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.24.8": +"@babel/helper-plugin-utils@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== -"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.24.7": +"@babel/helper-remap-async-to-generator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7" integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA== @@ -757,13 +576,6 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-split-export-declaration@7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-split-export-declaration@7.24.7", "@babel/helper-split-export-declaration@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856" @@ -786,16 +598,16 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== -"@babel/helper-validator-option@^7.23.5", "@babel/helper-validator-option@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" - integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== - "@babel/helper-validator-option@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6" integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw== +"@babel/helper-validator-option@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" + integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== + "@babel/helper-wrap-function@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f" @@ -806,14 +618,6 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helpers@^7.23.9", "@babel/helpers@^7.24.0", "@babel/helpers@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.8.tgz#2820d64d5d6686cca8789dd15b074cd862795873" - integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ== - dependencies: - "@babel/template" "^7.24.7" - "@babel/types" "^7.24.8" - "@babel/helpers@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416" @@ -822,6 +626,14 @@ "@babel/template" "^7.24.7" "@babel/types" "^7.24.7" +"@babel/helpers@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.8.tgz#2820d64d5d6686cca8789dd15b074cd862795873" + integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ== + dependencies: + "@babel/template" "^7.24.7" + "@babel/types" "^7.24.8" + "@babel/highlight@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" @@ -832,12 +644,12 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.8": +"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.8.tgz#58a4dbbcad7eb1d48930524a3fd93d93e9084c6f" integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w== -"@babel/parser@^7.14.7", "@babel/parser@^7.24.7": +"@babel/parser@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85" integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw== @@ -850,14 +662,14 @@ "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7": +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz#468096ca44bbcbe8fcc570574e12eb1950e18107" integrity sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89" integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ== @@ -866,7 +678,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" "@babel/plugin-transform-optional-chaining" "^7.24.7" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7", "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.7": +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz#71b21bb0286d5810e63a1538aa901c58e87375ec" integrity sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg== @@ -914,14 +726,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.23.3", "@babel/plugin-syntax-import-assertions@^7.24.7": +"@babel/plugin-syntax-import-assertions@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778" integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-import-attributes@7.24.7", "@babel/plugin-syntax-import-attributes@^7.23.3", "@babel/plugin-syntax-import-attributes@^7.24.7": +"@babel/plugin-syntax-import-attributes@7.24.7", "@babel/plugin-syntax-import-attributes@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== @@ -1006,24 +818,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.23.3", "@babel/plugin-transform-arrow-functions@^7.24.7": +"@babel/plugin-transform-arrow-functions@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514" integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-async-generator-functions@7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce" - integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.20" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-transform-async-generator-functions@7.24.7", "@babel/plugin-transform-async-generator-functions@^7.23.9", "@babel/plugin-transform-async-generator-functions@^7.24.7": +"@babel/plugin-transform-async-generator-functions@7.24.7", "@babel/plugin-transform-async-generator-functions@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz#7330a5c50e05181ca52351b8fd01642000c96cfd" integrity sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g== @@ -1033,16 +835,7 @@ "@babel/helper-remap-async-to-generator" "^7.24.7" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa" - integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw== - dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.20" - -"@babel/plugin-transform-async-to-generator@7.24.7", "@babel/plugin-transform-async-to-generator@^7.23.3", "@babel/plugin-transform-async-to-generator@^7.24.7": +"@babel/plugin-transform-async-to-generator@7.24.7", "@babel/plugin-transform-async-to-generator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc" integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA== @@ -1051,21 +844,21 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-remap-async-to-generator" "^7.24.7" -"@babel/plugin-transform-block-scoped-functions@^7.23.3", "@babel/plugin-transform-block-scoped-functions@^7.24.7": +"@babel/plugin-transform-block-scoped-functions@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f" integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-block-scoping@^7.23.4", "@babel/plugin-transform-block-scoping@^7.24.7": +"@babel/plugin-transform-block-scoping@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz#42063e4deb850c7bd7c55e626bf4e7ab48e6ce02" integrity sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-properties@^7.23.3", "@babel/plugin-transform-class-properties@^7.24.7": +"@babel/plugin-transform-class-properties@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834" integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w== @@ -1073,7 +866,7 @@ "@babel/helper-create-class-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-static-block@^7.23.4", "@babel/plugin-transform-class-static-block@^7.24.7": +"@babel/plugin-transform-class-static-block@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d" integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ== @@ -1082,7 +875,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.23.8", "@babel/plugin-transform-classes@^7.24.7": +"@babel/plugin-transform-classes@^7.24.7": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz#ad23301fe5bc153ca4cf7fb572a9bc8b0b711cf7" integrity sha512-VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA== @@ -1096,7 +889,7 @@ "@babel/helper-split-export-declaration" "^7.24.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.23.3", "@babel/plugin-transform-computed-properties@^7.24.7": +"@babel/plugin-transform-computed-properties@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707" integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ== @@ -1104,14 +897,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/template" "^7.24.7" -"@babel/plugin-transform-destructuring@^7.23.3", "@babel/plugin-transform-destructuring@^7.24.7": +"@babel/plugin-transform-destructuring@^7.24.7": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550" integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ== dependencies: "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-dotall-regex@^7.23.3", "@babel/plugin-transform-dotall-regex@^7.24.7": +"@babel/plugin-transform-dotall-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0" integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw== @@ -1119,14 +912,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-duplicate-keys@^7.23.3", "@babel/plugin-transform-duplicate-keys@^7.24.7": +"@babel/plugin-transform-duplicate-keys@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee" integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dynamic-import@^7.23.4", "@babel/plugin-transform-dynamic-import@^7.24.7": +"@babel/plugin-transform-dynamic-import@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4" integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg== @@ -1134,7 +927,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.23.3", "@babel/plugin-transform-exponentiation-operator@^7.24.7": +"@babel/plugin-transform-exponentiation-operator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d" integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ== @@ -1142,7 +935,7 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-export-namespace-from@^7.23.4", "@babel/plugin-transform-export-namespace-from@^7.24.7": +"@babel/plugin-transform-export-namespace-from@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197" integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA== @@ -1150,7 +943,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.23.6", "@babel/plugin-transform-for-of@^7.24.7": +"@babel/plugin-transform-for-of@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70" integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g== @@ -1158,7 +951,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-function-name@^7.23.3", "@babel/plugin-transform-function-name@^7.24.7": +"@babel/plugin-transform-function-name@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz#6d8601fbffe665c894440ab4470bc721dd9131d6" integrity sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w== @@ -1167,7 +960,7 @@ "@babel/helper-function-name" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-json-strings@^7.23.4", "@babel/plugin-transform-json-strings@^7.24.7": +"@babel/plugin-transform-json-strings@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a" integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw== @@ -1175,14 +968,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.23.3", "@babel/plugin-transform-literals@^7.24.7": +"@babel/plugin-transform-literals@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c" integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-logical-assignment-operators@^7.23.4", "@babel/plugin-transform-logical-assignment-operators@^7.24.7": +"@babel/plugin-transform-logical-assignment-operators@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0" integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw== @@ -1190,14 +983,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.23.3", "@babel/plugin-transform-member-expression-literals@^7.24.7": +"@babel/plugin-transform-member-expression-literals@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df" integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-amd@^7.23.3", "@babel/plugin-transform-modules-amd@^7.24.7": +"@babel/plugin-transform-modules-amd@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7" integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg== @@ -1205,7 +998,7 @@ "@babel/helper-module-transforms" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-commonjs@^7.23.3", "@babel/plugin-transform-modules-commonjs@^7.24.7": +"@babel/plugin-transform-modules-commonjs@^7.24.7": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c" integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA== @@ -1214,7 +1007,7 @@ "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-simple-access" "^7.24.7" -"@babel/plugin-transform-modules-systemjs@^7.23.9", "@babel/plugin-transform-modules-systemjs@^7.24.7": +"@babel/plugin-transform-modules-systemjs@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz#f8012316c5098f6e8dee6ecd58e2bc6f003d0ce7" integrity sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw== @@ -1224,7 +1017,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-validator-identifier" "^7.24.7" -"@babel/plugin-transform-modules-umd@^7.23.3", "@babel/plugin-transform-modules-umd@^7.24.7": +"@babel/plugin-transform-modules-umd@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8" integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A== @@ -1232,7 +1025,7 @@ "@babel/helper-module-transforms" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": +"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923" integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g== @@ -1240,14 +1033,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-new-target@^7.23.3", "@babel/plugin-transform-new-target@^7.24.7": +"@babel/plugin-transform-new-target@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00" integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4", "@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": +"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120" integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ== @@ -1255,7 +1048,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.23.4", "@babel/plugin-transform-numeric-separator@^7.24.7": +"@babel/plugin-transform-numeric-separator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63" integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA== @@ -1263,7 +1056,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.24.0", "@babel/plugin-transform-object-rest-spread@^7.24.7": +"@babel/plugin-transform-object-rest-spread@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6" integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q== @@ -1273,7 +1066,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.24.7" -"@babel/plugin-transform-object-super@^7.23.3", "@babel/plugin-transform-object-super@^7.24.7": +"@babel/plugin-transform-object-super@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be" integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg== @@ -1281,7 +1074,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-replace-supers" "^7.24.7" -"@babel/plugin-transform-optional-catch-binding@^7.23.4", "@babel/plugin-transform-optional-catch-binding@^7.24.7": +"@babel/plugin-transform-optional-catch-binding@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4" integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA== @@ -1289,15 +1082,6 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.23.4": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d" - integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-transform-optional-chaining@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454" @@ -1307,14 +1091,14 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.23.3", "@babel/plugin-transform-parameters@^7.24.7": +"@babel/plugin-transform-parameters@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68" integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-methods@^7.23.3", "@babel/plugin-transform-private-methods@^7.24.7": +"@babel/plugin-transform-private-methods@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e" integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ== @@ -1322,7 +1106,7 @@ "@babel/helper-create-class-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-property-in-object@^7.23.4", "@babel/plugin-transform-private-property-in-object@^7.24.7": +"@babel/plugin-transform-private-property-in-object@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061" integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA== @@ -1332,14 +1116,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.23.3", "@babel/plugin-transform-property-literals@^7.24.7": +"@babel/plugin-transform-property-literals@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc" integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-regenerator@^7.23.3", "@babel/plugin-transform-regenerator@^7.24.7": +"@babel/plugin-transform-regenerator@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8" integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA== @@ -1347,25 +1131,13 @@ "@babel/helper-plugin-utils" "^7.24.7" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.23.3", "@babel/plugin-transform-reserved-words@^7.24.7": +"@babel/plugin-transform-reserved-words@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4" integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-runtime@7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz#e308fe27d08b74027d42547081eefaf4f2ffbcc9" - integrity sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA== - dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" - babel-plugin-polyfill-corejs2 "^0.4.8" - babel-plugin-polyfill-corejs3 "^0.9.0" - babel-plugin-polyfill-regenerator "^0.5.5" - semver "^6.3.1" - "@babel/plugin-transform-runtime@7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz#00a5bfaf8c43cf5c8703a8a6e82b59d9c58f38ca" @@ -1378,14 +1150,14 @@ babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.23.3", "@babel/plugin-transform-shorthand-properties@^7.24.7": +"@babel/plugin-transform-shorthand-properties@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73" integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-spread@^7.23.3", "@babel/plugin-transform-spread@^7.24.7": +"@babel/plugin-transform-spread@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3" integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng== @@ -1393,35 +1165,35 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-sticky-regex@^7.23.3", "@babel/plugin-transform-sticky-regex@^7.24.7": +"@babel/plugin-transform-sticky-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb" integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-template-literals@^7.23.3", "@babel/plugin-transform-template-literals@^7.24.7": +"@babel/plugin-transform-template-literals@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8" integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typeof-symbol@^7.23.3", "@babel/plugin-transform-typeof-symbol@^7.24.7": +"@babel/plugin-transform-typeof-symbol@^7.24.7": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c" integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw== dependencies: "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-unicode-escapes@^7.23.3", "@babel/plugin-transform-unicode-escapes@^7.24.7": +"@babel/plugin-transform-unicode-escapes@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e" integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-property-regex@^7.23.3", "@babel/plugin-transform-unicode-property-regex@^7.24.7": +"@babel/plugin-transform-unicode-property-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd" integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w== @@ -1429,7 +1201,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-regex@^7.23.3", "@babel/plugin-transform-unicode-regex@^7.24.7": +"@babel/plugin-transform-unicode-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f" integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg== @@ -1437,7 +1209,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-sets-regex@^7.23.3", "@babel/plugin-transform-unicode-sets-regex@^7.24.7": +"@babel/plugin-transform-unicode-sets-regex@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9" integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg== @@ -1445,92 +1217,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/preset-env@7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.0.tgz#11536a7f4b977294f0bdfad780f01a8ac8e183fc" - integrity sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA== - dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7" - "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.23.3" - "@babel/plugin-syntax-import-attributes" "^7.23.3" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.9" - "@babel/plugin-transform-async-to-generator" "^7.23.3" - "@babel/plugin-transform-block-scoped-functions" "^7.23.3" - "@babel/plugin-transform-block-scoping" "^7.23.4" - "@babel/plugin-transform-class-properties" "^7.23.3" - "@babel/plugin-transform-class-static-block" "^7.23.4" - "@babel/plugin-transform-classes" "^7.23.8" - "@babel/plugin-transform-computed-properties" "^7.23.3" - "@babel/plugin-transform-destructuring" "^7.23.3" - "@babel/plugin-transform-dotall-regex" "^7.23.3" - "@babel/plugin-transform-duplicate-keys" "^7.23.3" - "@babel/plugin-transform-dynamic-import" "^7.23.4" - "@babel/plugin-transform-exponentiation-operator" "^7.23.3" - "@babel/plugin-transform-export-namespace-from" "^7.23.4" - "@babel/plugin-transform-for-of" "^7.23.6" - "@babel/plugin-transform-function-name" "^7.23.3" - "@babel/plugin-transform-json-strings" "^7.23.4" - "@babel/plugin-transform-literals" "^7.23.3" - "@babel/plugin-transform-logical-assignment-operators" "^7.23.4" - "@babel/plugin-transform-member-expression-literals" "^7.23.3" - "@babel/plugin-transform-modules-amd" "^7.23.3" - "@babel/plugin-transform-modules-commonjs" "^7.23.3" - "@babel/plugin-transform-modules-systemjs" "^7.23.9" - "@babel/plugin-transform-modules-umd" "^7.23.3" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.23.3" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4" - "@babel/plugin-transform-numeric-separator" "^7.23.4" - "@babel/plugin-transform-object-rest-spread" "^7.24.0" - "@babel/plugin-transform-object-super" "^7.23.3" - "@babel/plugin-transform-optional-catch-binding" "^7.23.4" - "@babel/plugin-transform-optional-chaining" "^7.23.4" - "@babel/plugin-transform-parameters" "^7.23.3" - "@babel/plugin-transform-private-methods" "^7.23.3" - "@babel/plugin-transform-private-property-in-object" "^7.23.4" - "@babel/plugin-transform-property-literals" "^7.23.3" - "@babel/plugin-transform-regenerator" "^7.23.3" - "@babel/plugin-transform-reserved-words" "^7.23.3" - "@babel/plugin-transform-shorthand-properties" "^7.23.3" - "@babel/plugin-transform-spread" "^7.23.3" - "@babel/plugin-transform-sticky-regex" "^7.23.3" - "@babel/plugin-transform-template-literals" "^7.23.3" - "@babel/plugin-transform-typeof-symbol" "^7.23.3" - "@babel/plugin-transform-unicode-escapes" "^7.23.3" - "@babel/plugin-transform-unicode-property-regex" "^7.23.3" - "@babel/plugin-transform-unicode-regex" "^7.23.3" - "@babel/plugin-transform-unicode-sets-regex" "^7.23.3" - "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.8" - babel-plugin-polyfill-corejs3 "^0.9.0" - babel-plugin-polyfill-regenerator "^0.5.5" - core-js-compat "^3.31.0" - semver "^6.3.1" - "@babel/preset-env@7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37" @@ -1632,13 +1318,6 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@7.24.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" - integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== - dependencies: - regenerator-runtime "^0.14.0" - "@babel/runtime@7.24.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" @@ -1653,7 +1332,7 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.23.9", "@babel/template@^7.24.0", "@babel/template@^7.24.7": +"@babel/template@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315" integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig== @@ -1662,22 +1341,6 @@ "@babel/parser" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/traverse@^7.23.9", "@babel/traverse@^7.24.0", "@babel/traverse@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.8.tgz#6c14ed5232b7549df3371d820fbd9abfcd7dfab7" - integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ== - dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.24.8" - "@babel/helper-environment-visitor" "^7.24.7" - "@babel/helper-function-name" "^7.24.7" - "@babel/helper-hoist-variables" "^7.24.7" - "@babel/helper-split-export-declaration" "^7.24.7" - "@babel/parser" "^7.24.8" - "@babel/types" "^7.24.8" - debug "^4.3.1" - globals "^11.1.0" - "@babel/traverse@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5" @@ -1694,7 +1357,23 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.0", "@babel/types@^7.24.8", "@babel/types@^7.24.9": +"@babel/traverse@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.8.tgz#6c14ed5232b7549df3371d820fbd9abfcd7dfab7" + integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.8" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/parser" "^7.24.8" + "@babel/types" "^7.24.8" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9": version "7.24.9" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.9.tgz#228ce953d7b0d16646e755acf204f4cf3d08cc73" integrity sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ== @@ -1703,7 +1382,7 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" -"@babel/types@^7.22.5", "@babel/types@^7.24.7", "@babel/types@^7.4.4": +"@babel/types@^7.24.7", "@babel/types@^7.4.4": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== @@ -1722,471 +1401,257 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@esbuild/aix-ppc64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f" - integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA== - -"@esbuild/aix-ppc64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5" - integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA== - -"@esbuild/aix-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537" - integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g== - "@esbuild/aix-ppc64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== -"@esbuild/android-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" - integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA== - -"@esbuild/android-arm64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6" - integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A== - -"@esbuild/android-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9" - integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg== +"@esbuild/aix-ppc64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz#145b74d5e4a5223489cabdc238d8dad902df5259" + integrity sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ== "@esbuild/android-arm64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== -"@esbuild/android-arm@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" - integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w== - -"@esbuild/android-arm@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a" - integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw== - -"@esbuild/android-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995" - integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w== +"@esbuild/android-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz#453bbe079fc8d364d4c5545069e8260228559832" + integrity sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ== "@esbuild/android-arm@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== -"@esbuild/android-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" - integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew== - -"@esbuild/android-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22" - integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA== - -"@esbuild/android-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98" - integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg== +"@esbuild/android-arm@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.0.tgz#26c806853aa4a4f7e683e519cd9d68e201ebcf99" + integrity sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g== "@esbuild/android-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== -"@esbuild/darwin-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e" - integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g== - -"@esbuild/darwin-arm64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46" - integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA== - -"@esbuild/darwin-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb" - integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA== +"@esbuild/android-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.0.tgz#1e51af9a6ac1f7143769f7ee58df5b274ed202e6" + integrity sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ== "@esbuild/darwin-arm64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== -"@esbuild/darwin-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" - integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A== - -"@esbuild/darwin-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2" - integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA== - -"@esbuild/darwin-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0" - integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA== +"@esbuild/darwin-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz#d996187a606c9534173ebd78c58098a44dd7ef9e" + integrity sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow== "@esbuild/darwin-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== -"@esbuild/freebsd-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" - integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA== - -"@esbuild/freebsd-arm64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774" - integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw== - -"@esbuild/freebsd-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911" - integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw== +"@esbuild/darwin-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz#30c8f28a7ef4e32fe46501434ebe6b0912e9e86c" + integrity sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ== "@esbuild/freebsd-arm64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== -"@esbuild/freebsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" - integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg== - -"@esbuild/freebsd-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951" - integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg== - -"@esbuild/freebsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c" - integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw== +"@esbuild/freebsd-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz#30f4fcec8167c08a6e8af9fc14b66152232e7fb4" + integrity sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw== "@esbuild/freebsd-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== -"@esbuild/linux-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" - integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA== - -"@esbuild/linux-arm64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156" - integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w== - -"@esbuild/linux-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5" - integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A== +"@esbuild/freebsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz#1003a6668fe1f5d4439e6813e5b09a92981bc79d" + integrity sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ== "@esbuild/linux-arm64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== -"@esbuild/linux-arm@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" - integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w== - -"@esbuild/linux-arm@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21" - integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw== - -"@esbuild/linux-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c" - integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg== +"@esbuild/linux-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz#3b9a56abfb1410bb6c9138790f062587df3e6e3a" + integrity sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw== "@esbuild/linux-arm@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== -"@esbuild/linux-ia32@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" - integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA== - -"@esbuild/linux-ia32@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48" - integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw== - -"@esbuild/linux-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa" - integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig== +"@esbuild/linux-arm@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz#237a8548e3da2c48cd79ae339a588f03d1889aad" + integrity sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw== "@esbuild/linux-ia32@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== -"@esbuild/linux-loong64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" - integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA== - -"@esbuild/linux-loong64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33" - integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA== - -"@esbuild/linux-loong64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5" - integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ== +"@esbuild/linux-ia32@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz#4269cd19cb2de5de03a7ccfc8855dde3d284a238" + integrity sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA== "@esbuild/linux-loong64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== -"@esbuild/linux-mips64el@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" - integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w== - -"@esbuild/linux-mips64el@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea" - integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA== - -"@esbuild/linux-mips64el@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa" - integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA== +"@esbuild/linux-loong64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz#82b568f5658a52580827cc891cb69d2cb4f86280" + integrity sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A== "@esbuild/linux-mips64el@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== -"@esbuild/linux-ppc64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" - integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg== - -"@esbuild/linux-ppc64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d" - integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw== - -"@esbuild/linux-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20" - integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg== +"@esbuild/linux-mips64el@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz#9a57386c926262ae9861c929a6023ed9d43f73e5" + integrity sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w== "@esbuild/linux-ppc64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== -"@esbuild/linux-riscv64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" - integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg== - -"@esbuild/linux-riscv64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e" - integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg== - -"@esbuild/linux-riscv64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300" - integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg== +"@esbuild/linux-ppc64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz#f3a79fd636ba0c82285d227eb20ed8e31b4444f6" + integrity sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw== "@esbuild/linux-riscv64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== -"@esbuild/linux-s390x@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" - integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg== - -"@esbuild/linux-s390x@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7" - integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ== - -"@esbuild/linux-s390x@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685" - integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ== +"@esbuild/linux-riscv64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz#f9d2ef8356ce6ce140f76029680558126b74c780" + integrity sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw== "@esbuild/linux-s390x@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== -"@esbuild/linux-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" - integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg== - -"@esbuild/linux-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f" - integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA== - -"@esbuild/linux-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff" - integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw== +"@esbuild/linux-s390x@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz#45390f12e802201f38a0229e216a6aed4351dfe8" + integrity sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg== "@esbuild/linux-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== -"@esbuild/netbsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" - integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA== - -"@esbuild/netbsd-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407" - integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg== - -"@esbuild/netbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6" - integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ== +"@esbuild/linux-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz#c8409761996e3f6db29abcf9b05bee8d7d80e910" + integrity sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ== "@esbuild/netbsd-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== -"@esbuild/openbsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" - integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw== +"@esbuild/netbsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz#ba70db0114380d5f6cfb9003f1d378ce989cd65c" + integrity sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw== -"@esbuild/openbsd-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76" - integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw== - -"@esbuild/openbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf" - integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ== +"@esbuild/openbsd-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz#72fc55f0b189f7a882e3cf23f332370d69dfd5db" + integrity sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ== "@esbuild/openbsd-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== -"@esbuild/sunos-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" - integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA== - -"@esbuild/sunos-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5" - integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q== - -"@esbuild/sunos-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f" - integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w== +"@esbuild/openbsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz#b6ae7a0911c18fe30da3db1d6d17a497a550e5d8" + integrity sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg== "@esbuild/sunos-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== -"@esbuild/win32-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" - integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A== - -"@esbuild/win32-arm64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b" - integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A== - -"@esbuild/win32-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90" - integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ== +"@esbuild/sunos-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz#58f0d5e55b9b21a086bfafaa29f62a3eb3470ad8" + integrity sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA== "@esbuild/win32-arm64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== -"@esbuild/win32-ia32@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" - integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ== - -"@esbuild/win32-ia32@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe" - integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw== - -"@esbuild/win32-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23" - integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ== +"@esbuild/win32-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz#b858b2432edfad62e945d5c7c9e5ddd0f528ca6d" + integrity sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ== "@esbuild/win32-ia32@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== -"@esbuild/win32-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" - integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA== - -"@esbuild/win32-x64@0.20.1": - version "0.20.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba" - integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA== - -"@esbuild/win32-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc" - integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ== +"@esbuild/win32-ia32@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz#167ef6ca22a476c6c0c014a58b4f43ae4b80dec7" + integrity sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA== "@esbuild/win32-x64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== +"@esbuild/win32-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz#db44a6a08520b5f25bbe409f34a59f2d4bcc7ced" + integrity sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g== + "@graphql-typed-document-node/core@^3.1.1": version "3.2.0" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== +"@inquirer/checkbox@^2.3.7": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-2.4.0.tgz#c57589cd8e041869e2eac32f86788ac8d6e39f49" + integrity sha512-XHOCmntitRBD8SJcrv+6X9YakxO1wfsvezOnU5MBIXeTlSBRCVk9DOIrx6Cgi9BS3qkcy7oQb+fUGEKrP6xecQ== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/figures" "^1.0.4" + "@inquirer/type" "^1.5.0" + ansi-escapes "^4.3.2" + yoctocolors-cjs "^2.1.2" + "@inquirer/confirm@3.1.11": version "3.1.11" resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.11.tgz#7b91d1ec548253780165d6abfce02b0b21cfa5c5" @@ -2195,6 +1660,14 @@ "@inquirer/core" "^8.2.4" "@inquirer/type" "^1.3.3" +"@inquirer/confirm@^3.1.11": + version "3.1.15" + resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.15.tgz#50fad3e9e9af1ddc7b661ac044cc04a689904760" + integrity sha512-CiLGi3JmKGEsia5kYJN62yG/njHydbYIkzSBril7tCaKbsnIqxa2h/QiON9NjfwiKck/2siosz4h7lVhLFocMQ== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + "@inquirer/core@^8.2.4": version "8.2.4" resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-8.2.4.tgz#300de755849d3166d15127e2341cef6aa4bd031d" @@ -2214,12 +1687,100 @@ strip-ansi "^6.0.1" wrap-ansi "^6.2.0" -"@inquirer/figures@^1.0.3": +"@inquirer/core@^9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-9.0.3.tgz#40564a501f77410752b0a5dda652d6340e30dfa1" + integrity sha512-p2BRZv/vMmpwlU4ZR966vKQzGVCi4VhLjVofwnFLziTQia541T7i1Ar8/LPh+LzjkXzocme+g5Io6MRtzlCcNA== + dependencies: + "@inquirer/figures" "^1.0.4" + "@inquirer/type" "^1.5.0" + "@types/mute-stream" "^0.0.4" + "@types/node" "^20.14.11" + "@types/wrap-ansi" "^3.0.0" + ansi-escapes "^4.3.2" + cli-spinners "^2.9.2" + cli-width "^4.1.0" + mute-stream "^1.0.0" + signal-exit "^4.1.0" + strip-ansi "^6.0.1" + wrap-ansi "^6.2.0" + yoctocolors-cjs "^2.1.2" + +"@inquirer/editor@^2.1.11": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-2.1.15.tgz#e1488c157033eae889d68c8fb44548a9a1ceff2c" + integrity sha512-UmtZnY36rGLS/4cCzvdRmk0xxsGgH2AsF0v1SSlBZ3C5JK/Bxm2gNW8fmUVzQ5vm8kpdWASXPapbUx4iV49ScA== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + external-editor "^3.1.0" + +"@inquirer/expand@^2.1.11": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-2.1.15.tgz#d10e38bd08555329284b901e259d2d81d517ff08" + integrity sha512-aBnnrBw9vbFJROUlDCsbq8H/plX6JHfPwLmSphxaVqOR+b1hgLdw+oRhZkpcJhG2AZOlc8IKzGdZhji93gQg4w== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + yoctocolors-cjs "^2.1.2" + +"@inquirer/figures@^1.0.3", "@inquirer/figures@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.4.tgz#a54dab6e205636a881ece0f1017efff6d6174d6e" integrity sha512-R7Gsg6elpuqdn55fBH2y9oYzrU/yKrSmIsDX4ROT51vohrECFzTf2zw9BfUbOW8xjfmM2QbVoVYdTwhrtEKWSQ== -"@inquirer/type@^1.3.3": +"@inquirer/input@^2.1.11": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-2.2.2.tgz#e72413c09126d77146d7d1430a1faeedde7c3126" + integrity sha512-VjkzYSVH0606nLi9HHiSb4QYs2idwRgneiMoFoTAIwQ1Qwx6OIDugOYLtLta3gP8AWZx7qUvgDtj+/SJuiiKuQ== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + +"@inquirer/password@^2.1.11": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-2.1.15.tgz#74bcc5f36629c9d0e6b72a711d5e4f5739b845b3" + integrity sha512-/JmiTtIcSYbZdPucEW5q2rhC71vGKPivm3LFqNDQEI6lJyffq7hlfKKFC+R1Qp19dMqkaG+O5L1XmcHpmlAUUQ== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + ansi-escapes "^4.3.2" + +"@inquirer/prompts@5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-5.0.7.tgz#c2016ad4a02c40f450bf03c39d8269a859bd55e3" + integrity sha512-GFcigCxJTKCH3aECzMIu4FhgLJWnFvMXzpI4CCSoELWFtkOOU2P+goYA61+OKpGrB8fPE7q6n8zAXBSlZRrHjQ== + dependencies: + "@inquirer/checkbox" "^2.3.7" + "@inquirer/confirm" "^3.1.11" + "@inquirer/editor" "^2.1.11" + "@inquirer/expand" "^2.1.11" + "@inquirer/input" "^2.1.11" + "@inquirer/password" "^2.1.11" + "@inquirer/rawlist" "^2.1.11" + "@inquirer/select" "^2.3.7" + +"@inquirer/rawlist@^2.1.11": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-2.1.15.tgz#9ed7ef9e0a4bdf3a4c9ea3f67b22abcec0c9fbd7" + integrity sha512-zwU6aWDMyuQNiY5Z0iYXkxi7pliRFXqUmiS7vG6lAGxqcbOSptYgIxGJnd3AU4Y91N0Tbt57+koJL0S2p6vSkA== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/type" "^1.5.0" + yoctocolors-cjs "^2.1.2" + +"@inquirer/select@^2.3.7": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-2.4.0.tgz#88e6063c55c6c7c487a414564ee6e956c550a8f7" + integrity sha512-iU1eRkHirVNs43zWk6anMIMKc7tCXlJ+I5DcpIV7JzMe+45TuPPOGGCgeGIkZ4xYJ3cXdFoh7GJpm84PNC8veg== + dependencies: + "@inquirer/core" "^9.0.3" + "@inquirer/figures" "^1.0.4" + "@inquirer/type" "^1.5.0" + ansi-escapes "^4.3.2" + yoctocolors-cjs "^2.1.2" + +"@inquirer/type@^1.3.3", "@inquirer/type@^1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.5.0.tgz#0890e6286281b3f118632e6f7c47c0ccb9b29ee3" integrity sha512-L/UdayX9Z1lLN+itoTKqJ/X4DX5DaWu2Sruwt4XgZzMNv32x4qllbzMX4MbJlz0yxAQtU19UvABGOjmdq1u3qA== @@ -2261,7 +1822,7 @@ dependencies: "@sinclair/typebox" "^0.27.8" -"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5": +"@jridgewell/gen-mapping@^0.3.5": version "0.3.5" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== @@ -2293,7 +1854,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -2326,12 +1887,12 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1" integrity sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw== -"@ljharb/through@^2.3.12": - version "2.3.13" - resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.13.tgz#b7e4766e0b65aa82e529be945ab078de79874edc" - integrity sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ== +"@listr2/prompt-adapter-inquirer@2.0.13": + version "2.0.13" + resolved "https://registry.yarnpkg.com/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz#5d8d51f3dd0b32ad9b3802a0adb7d02a71792904" + integrity sha512-nAl6teTt7EWSjttNavAnv3uFR3w3vPP3OTYmHyPNHzKhAj2NoBDHmbS3MGpvvO8KXXPASnHjEGrrKrdKTMKPnQ== dependencies: - call-bind "^1.0.7" + "@inquirer/type" "^1.3.3" "@lmdb/lmdb-darwin-arm64@3.0.12": version "3.0.12" @@ -2405,11 +1966,6 @@ dependencies: tslib "^2.3.0" -"@ngtools/webpack@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.8.tgz#96c0f99055910dd21438d7697d625fdeb7261015" - integrity sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ== - "@ngtools/webpack@18.1.1": version "18.1.1" resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-18.1.1.tgz#b43b9605c7ba449c724db6cd87ac455fe3846f1d" @@ -2482,7 +2038,7 @@ resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a" integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA== -"@npmcli/package-json@^5.0.0": +"@npmcli/package-json@^5.0.0", "@npmcli/package-json@^5.1.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.2.0.tgz#a1429d3111c10044c7efbfb0fce9f2c501f4cfad" integrity sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ== @@ -2502,20 +2058,21 @@ dependencies: which "^4.0.0" -"@npmcli/redact@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@npmcli/redact/-/redact-1.1.0.tgz#78e53a6a34f013543a73827a07ebdc3a6f10454b" - integrity sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ== +"@npmcli/redact@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/redact/-/redact-2.0.1.tgz#95432fd566e63b35c04494621767a4312c316762" + integrity sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw== -"@npmcli/run-script@^7.0.0": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.4.tgz#9f29aaf4bfcf57f7de2a9e28d1ef091d14b2e6eb" - integrity sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg== +"@npmcli/run-script@^8.0.0": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-8.1.0.tgz#a563e5e29b1ca4e648a6b1bbbfe7220b4bfe39fc" + integrity sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg== dependencies: "@npmcli/node-gyp" "^3.0.0" "@npmcli/package-json" "^5.0.0" "@npmcli/promise-spawn" "^7.0.0" node-gyp "^10.0.0" + proc-log "^4.0.0" which "^4.0.0" "@nrwl/devkit@18.3.5": @@ -2627,7 +2184,7 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@rollup/plugin-json@^6.0.1": +"@rollup/plugin-json@^6.1.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.1.0.tgz#fbe784e29682e9bb6dee28ea75a1a83702e7b805" integrity sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA== @@ -2815,7 +2372,7 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.1.tgz#0cb240c147c0dfd0e3eaff4cc060a772d39e155c" integrity sha512-yjk2MAkQmoaPYCSu35RLJ62+dz358nE83VfTePJRp8CG7aMg25mEJYpXFiD+NcevhX8LxD5OP5tktPXnXN7GDw== -"@rollup/wasm-node@^4.5.0": +"@rollup/wasm-node@^4.18.0": version "4.18.1" resolved "https://registry.yarnpkg.com/@rollup/wasm-node/-/wasm-node-4.18.1.tgz#fa74e4eeed4b48661c046a747ac645d18fbadaa4" integrity sha512-/5JNIo7af3BkPdsm0omZTwi/KcEiknR3/bs2HEdmudgey+xDyX0qtcM7Q8MFbpqddzR6+FleUjyGVv1ykL3v1Q== @@ -2824,16 +2381,7 @@ optionalDependencies: fsevents "~2.3.2" -"@schematics/angular@17.3.8": - version "17.3.8" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.8.tgz#0b4adf9d05b22176b99ad8e311a274c102d74822" - integrity sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw== - dependencies: - "@angular-devkit/core" "17.3.8" - "@angular-devkit/schematics" "17.3.8" - jsonc-parser "3.2.1" - -"@schematics/angular@^18.0.0": +"@schematics/angular@18.1.1", "@schematics/angular@^18.0.0": version "18.1.1" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-18.1.1.tgz#8fb9769e57a9a4b78b2eb251a4229eea1c310749" integrity sha512-6nQUSuFSP7un5Bmm6/MpQXq3jnkdEYg2MUPv7JStsqnT1YYzUsDjkUv7Hsci0xQmeUAzVz3ueg4znviJoQxWdg== @@ -2986,14 +2534,14 @@ "@types/connect" "*" "@types/node" "*" -"@types/bonjour@^3.5.13", "@types/bonjour@^3.5.9": +"@types/bonjour@^3.5.13": version "3.5.13" resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== dependencies: "@types/node" "*" -"@types/connect-history-api-fallback@^1.3.5", "@types/connect-history-api-fallback@^1.5.4": +"@types/connect-history-api-fallback@^1.5.4": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== @@ -3056,7 +2604,7 @@ "@types/range-parser" "*" "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.21": +"@types/express@*", "@types/express@^4.17.21": version "4.17.21" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== @@ -3153,7 +2701,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^20.14.9": +"@types/node@^20.14.11", "@types/node@^20.14.9": version "20.14.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b" integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA== @@ -3180,11 +2728,6 @@ resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975" integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q== -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - "@types/retry@0.12.2": version "0.12.2" resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" @@ -3198,14 +2741,14 @@ "@types/mime" "^1" "@types/node" "*" -"@types/serve-index@^1.9.1", "@types/serve-index@^1.9.4": +"@types/serve-index@^1.9.4": version "1.9.4" resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== dependencies: "@types/express" "*" -"@types/serve-static@*", "@types/serve-static@^1.13.10", "@types/serve-static@^1.15.5": +"@types/serve-static@*", "@types/serve-static@^1.15.5": version "1.15.7" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== @@ -3214,7 +2757,7 @@ "@types/node" "*" "@types/send" "*" -"@types/sockjs@^0.3.33", "@types/sockjs@^0.3.36": +"@types/sockjs@^0.3.36": version "0.3.36" resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== @@ -3233,13 +2776,6 @@ dependencies: "@types/node" "*" -"@types/ws@^8.5.5": - version "8.5.10" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" - integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== - dependencies: - "@types/node" "*" - "@types/yargs-parser@*": version "21.0.3" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" @@ -3300,7 +2836,7 @@ resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802" integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A== -"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@^1.12.1": +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": version "1.12.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== @@ -3366,7 +2902,7 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== -"@webassemblyjs/wasm-edit@^1.11.5", "@webassemblyjs/wasm-edit@^1.12.1": +"@webassemblyjs/wasm-edit@^1.12.1": version "1.12.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== @@ -3401,7 +2937,7 @@ "@webassemblyjs/wasm-gen" "1.12.1" "@webassemblyjs/wasm-parser" "1.12.1" -"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@^1.12.1": +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": version "1.12.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== @@ -3499,11 +3035,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== - acorn-import-attributes@^1.9.5: version "1.9.5" resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" @@ -3547,13 +3078,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv-formats@2.1.1, ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - ajv-formats@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578" @@ -3561,6 +3085,13 @@ ajv-formats@3.0.1: dependencies: ajv "^8.0.0" +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -3573,16 +3104,6 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@8.12.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - ajv@8.16.0, ajv@^8.0.0, ajv@^8.9.0: version "8.16.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" @@ -3632,6 +3153,11 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.2: dependencies: type-fest "^0.21.3" +ansi-escapes@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-6.2.1.tgz#76c54ce9b081dad39acec4b5d53377913825fb0f" + integrity sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig== + ansi-html-community@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" @@ -3671,7 +3197,7 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-styles@^6.1.0: +ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -3813,18 +3339,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -autoprefixer@10.4.18: - version "10.4.18" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163" - integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g== - dependencies: - browserslist "^4.23.0" - caniuse-lite "^1.0.30001591" - fraction.js "^4.3.7" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - autoprefixer@10.4.19: version "10.4.19" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f" @@ -3861,18 +3375,7 @@ babel-loader@9.1.3: find-cache-dir "^4.0.0" schema-utils "^4.0.0" -babel-plugin-istanbul@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - -babel-plugin-polyfill-corejs2@^0.4.10, babel-plugin-polyfill-corejs2@^0.4.8: +babel-plugin-polyfill-corejs2@^0.4.10: version "0.4.11" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== @@ -3889,21 +3392,6 @@ babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: "@babel/helper-define-polyfill-provider" "^0.6.1" core-js-compat "^3.36.1" -babel-plugin-polyfill-corejs3@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81" - integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.5.0" - core-js-compat "^3.34.0" - -babel-plugin-polyfill-regenerator@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a" - integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.5.0" - babel-plugin-polyfill-regenerator@^0.6.1: version "0.6.2" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" @@ -3977,7 +3465,7 @@ body-parser@1.20.2, body-parser@^1.19.0: type-is "~1.6.18" unpipe "1.0.0" -bonjour-service@^1.0.11, bonjour-service@^1.2.1: +bonjour-service@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== @@ -4136,7 +3624,7 @@ caniuse-lite@^1.0.30001251, caniuse-lite@^1.0.30001629: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001632.tgz#964207b7cba5851701afb4c8afaf1448db3884b6" integrity sha512-udx3o7yHJfUxMLkGohMlVHCvFvWmirKh9JAH/d7WOLPetlH+LTL5cocMZ0t7oZx/mdlOWXti97xLZWc8uURRHg== -caniuse-lite@^1.0.30001591, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640: +caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640: version "1.0.30001642" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz#6aa6610eb24067c246d30c57f055a9d0a7f8d05f" integrity sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA== @@ -4158,11 +3646,6 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -4205,6 +3688,13 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" @@ -4215,6 +3705,14 @@ cli-spinners@^2.5.0, cli-spinners@^2.9.2: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== +cli-truncate@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a" + integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA== + dependencies: + slice-ansi "^5.0.0" + string-width "^7.0.0" + cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" @@ -4290,7 +3788,7 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^2.0.10: +colorette@^2.0.10, colorette@^2.0.20: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== @@ -4436,18 +3934,6 @@ copy-anything@^2.0.1: dependencies: is-what "^3.14.1" -copy-webpack-plugin@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a" - integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ== - dependencies: - fast-glob "^3.2.11" - glob-parent "^6.0.1" - globby "^13.1.1" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - copy-webpack-plugin@12.0.2: version "12.0.2" resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz#935e57b8e6183c82f95bd937df658a59f6a2da28" @@ -4460,7 +3946,7 @@ copy-webpack-plugin@12.0.2: schema-utils "^4.2.0" serialize-javascript "^6.0.2" -core-js-compat@^3.31.0, core-js-compat@^3.34.0, core-js-compat@^3.36.1: +core-js-compat@^3.31.0, core-js-compat@^3.36.1: version "3.37.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== @@ -4495,19 +3981,6 @@ cosmiconfig@^9.0.0: js-yaml "^4.1.0" parse-json "^5.2.0" -critters@0.0.22: - version "0.0.22" - resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.22.tgz#ce76b1cbc70078c89d23725646357e3850236dae" - integrity sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw== - dependencies: - chalk "^4.1.0" - css-select "^5.1.0" - dom-serializer "^2.0.0" - domhandler "^5.0.2" - htmlparser2 "^8.0.2" - postcss "^8.4.23" - postcss-media-query-parser "^0.2.3" - critters@0.0.24: version "0.0.24" resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.24.tgz#d20b16c28908d2dae4b9cd4851d4d2c93de98a0b" @@ -4541,20 +4014,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -css-loader@6.10.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.10.0.tgz#7c172b270ec7b833951b52c348861206b184a4b7" - integrity sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.33" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.4" - postcss-modules-scope "^3.1.1" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.5.4" - css-loader@7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8" @@ -4944,13 +4403,6 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - dns-packet@^5.2.2: version "5.6.1" resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f" @@ -5054,6 +4506,11 @@ electron-to-chromium@^1.4.820: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.829.tgz#3034a865b5eac9064c9db8b38ba99b60a446bb73" integrity sha512-5qp1N2POAfW0u1qGAxXEtz6P7bO1m6gpZr5hdf5ve6lxpLM7MpiM4jIPz7xcrNlClQMafbyUDDWjlIQZ1Mw0Rw== +emoji-regex@^10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23" + integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -5114,7 +4571,7 @@ engine.io@~6.5.2: engine.io-parser "~5.2.1" ws "~8.11.0" -enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.0: +enhanced-resolve@^5.17.0: version "5.17.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== @@ -5269,50 +4726,11 @@ es6-error@^4.0.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -esbuild-wasm@0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz#fdc14b95e3e16ec8e082dd641edb96140c1723f7" - integrity sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A== - esbuild-wasm@0.21.5: version "0.21.5" resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.21.5.tgz#b0ed81ae7e28d82d3a93c85bb7c6a5b01053bb01" integrity sha512-L/FlOPMMFtw+6qPAbuPvJXdrOYOp9yx/PEwSrIZW0qghY4vgV003evdYDwqQ/9ENMQI0B6RMod9xT4FHtto6OQ== -esbuild-wasm@^0.20.0: - version "0.20.2" - resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.20.2.tgz#bbee2a729776b0b88b765c014f161b627435c5b6" - integrity sha512-7o6nmsEqlcXJXMNqnx5K+M4w4OPx7yTFXQHcJyeP3SkXb8p2T8N9E1ayK4vd/qDBepH6fuPoZwiFvZm8x5qv+w== - -esbuild@0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e" - integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA== - optionalDependencies: - "@esbuild/aix-ppc64" "0.20.1" - "@esbuild/android-arm" "0.20.1" - "@esbuild/android-arm64" "0.20.1" - "@esbuild/android-x64" "0.20.1" - "@esbuild/darwin-arm64" "0.20.1" - "@esbuild/darwin-x64" "0.20.1" - "@esbuild/freebsd-arm64" "0.20.1" - "@esbuild/freebsd-x64" "0.20.1" - "@esbuild/linux-arm" "0.20.1" - "@esbuild/linux-arm64" "0.20.1" - "@esbuild/linux-ia32" "0.20.1" - "@esbuild/linux-loong64" "0.20.1" - "@esbuild/linux-mips64el" "0.20.1" - "@esbuild/linux-ppc64" "0.20.1" - "@esbuild/linux-riscv64" "0.20.1" - "@esbuild/linux-s390x" "0.20.1" - "@esbuild/linux-x64" "0.20.1" - "@esbuild/netbsd-x64" "0.20.1" - "@esbuild/openbsd-x64" "0.20.1" - "@esbuild/sunos-x64" "0.20.1" - "@esbuild/win32-arm64" "0.20.1" - "@esbuild/win32-ia32" "0.20.1" - "@esbuild/win32-x64" "0.20.1" - esbuild@0.21.5, esbuild@^0.21.3: version "0.21.5" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" @@ -5342,63 +4760,35 @@ esbuild@0.21.5, esbuild@^0.21.3: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -esbuild@^0.19.3: - version "0.19.12" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04" - integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg== +esbuild@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.0.tgz#de06002d48424d9fdb7eb52dbe8e95927f852599" + integrity sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA== optionalDependencies: - "@esbuild/aix-ppc64" "0.19.12" - "@esbuild/android-arm" "0.19.12" - "@esbuild/android-arm64" "0.19.12" - "@esbuild/android-x64" "0.19.12" - "@esbuild/darwin-arm64" "0.19.12" - "@esbuild/darwin-x64" "0.19.12" - "@esbuild/freebsd-arm64" "0.19.12" - "@esbuild/freebsd-x64" "0.19.12" - "@esbuild/linux-arm" "0.19.12" - "@esbuild/linux-arm64" "0.19.12" - "@esbuild/linux-ia32" "0.19.12" - "@esbuild/linux-loong64" "0.19.12" - "@esbuild/linux-mips64el" "0.19.12" - "@esbuild/linux-ppc64" "0.19.12" - "@esbuild/linux-riscv64" "0.19.12" - "@esbuild/linux-s390x" "0.19.12" - "@esbuild/linux-x64" "0.19.12" - "@esbuild/netbsd-x64" "0.19.12" - "@esbuild/openbsd-x64" "0.19.12" - "@esbuild/sunos-x64" "0.19.12" - "@esbuild/win32-arm64" "0.19.12" - "@esbuild/win32-ia32" "0.19.12" - "@esbuild/win32-x64" "0.19.12" - -esbuild@^0.20.0: - version "0.20.2" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1" - integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g== - optionalDependencies: - "@esbuild/aix-ppc64" "0.20.2" - "@esbuild/android-arm" "0.20.2" - "@esbuild/android-arm64" "0.20.2" - "@esbuild/android-x64" "0.20.2" - "@esbuild/darwin-arm64" "0.20.2" - "@esbuild/darwin-x64" "0.20.2" - "@esbuild/freebsd-arm64" "0.20.2" - "@esbuild/freebsd-x64" "0.20.2" - "@esbuild/linux-arm" "0.20.2" - "@esbuild/linux-arm64" "0.20.2" - "@esbuild/linux-ia32" "0.20.2" - "@esbuild/linux-loong64" "0.20.2" - "@esbuild/linux-mips64el" "0.20.2" - "@esbuild/linux-ppc64" "0.20.2" - "@esbuild/linux-riscv64" "0.20.2" - "@esbuild/linux-s390x" "0.20.2" - "@esbuild/linux-x64" "0.20.2" - "@esbuild/netbsd-x64" "0.20.2" - "@esbuild/openbsd-x64" "0.20.2" - "@esbuild/sunos-x64" "0.20.2" - "@esbuild/win32-arm64" "0.20.2" - "@esbuild/win32-ia32" "0.20.2" - "@esbuild/win32-x64" "0.20.2" + "@esbuild/aix-ppc64" "0.23.0" + "@esbuild/android-arm" "0.23.0" + "@esbuild/android-arm64" "0.23.0" + "@esbuild/android-x64" "0.23.0" + "@esbuild/darwin-arm64" "0.23.0" + "@esbuild/darwin-x64" "0.23.0" + "@esbuild/freebsd-arm64" "0.23.0" + "@esbuild/freebsd-x64" "0.23.0" + "@esbuild/linux-arm" "0.23.0" + "@esbuild/linux-arm64" "0.23.0" + "@esbuild/linux-ia32" "0.23.0" + "@esbuild/linux-loong64" "0.23.0" + "@esbuild/linux-mips64el" "0.23.0" + "@esbuild/linux-ppc64" "0.23.0" + "@esbuild/linux-riscv64" "0.23.0" + "@esbuild/linux-s390x" "0.23.0" + "@esbuild/linux-x64" "0.23.0" + "@esbuild/netbsd-x64" "0.23.0" + "@esbuild/openbsd-arm64" "0.23.0" + "@esbuild/openbsd-x64" "0.23.0" + "@esbuild/sunos-x64" "0.23.0" + "@esbuild/win32-arm64" "0.23.0" + "@esbuild/win32-ia32" "0.23.0" + "@esbuild/win32-x64" "0.23.0" escalade@^3.1.1, escalade@^3.1.2: version "3.1.2" @@ -5640,6 +5030,11 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + events@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -5721,7 +5116,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@3.3.2, fast-glob@^3.2.11, fast-glob@^3.3.0, fast-glob@^3.3.1, fast-glob@^3.3.2: +fast-glob@3.3.2, fast-glob@^3.3.1, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -5761,7 +5156,7 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" -figures@3.2.0, figures@^3.0.0, figures@^3.2.0: +figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -5988,11 +5383,6 @@ fs-minipass@^3.0.0: dependencies: minipass "^7.0.3" -fs-monkey@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2" - integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -6038,6 +5428,11 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-east-asian-width@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz#5e6ebd9baee6fb8b7b6bd505221065f0cd91f64e" + integrity sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA== + get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" @@ -6142,17 +5537,6 @@ globalthis@^1.0.3: define-properties "^1.2.1" gopd "^1.0.1" -globby@^13.1.1: - version "13.2.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592" - integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w== - dependencies: - dir-glob "^3.0.1" - fast-glob "^3.3.0" - ignore "^5.2.4" - merge2 "^1.4.1" - slash "^4.0.0" - globby@^14.0.0: version "14.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.2.tgz#06554a54ccfe9264e5a9ff8eded46aa1e306482f" @@ -6172,7 +5556,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -6272,7 +5656,7 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-entities@^2.3.2, html-entities@^2.4.0: +html-entities@^2.4.0: version "2.5.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== @@ -6336,17 +5720,6 @@ http-proxy-agent@^7.0.0: agent-base "^7.1.0" debug "^4.3.4" -http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - http-proxy-middleware@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-3.0.0.tgz#550790357d6f92a9b82ab2d63e07343a791cf26b" @@ -6359,6 +5732,17 @@ http-proxy-middleware@3.0.0: is-plain-obj "^3.0.0" micromatch "^4.0.5" +http-proxy-middleware@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + dependencies: + "@types/http-proxy" "^1.17.8" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + http-proxy@^1.18.1: version "1.18.1" resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" @@ -6368,14 +5752,6 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -https-proxy-agent@7.0.4: - version "7.0.4" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" - integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== - dependencies: - agent-base "^7.0.2" - debug "4" - https-proxy-agent@7.0.5, https-proxy-agent@^7.0.1: version "7.0.5" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2" @@ -6481,12 +5857,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== -ini@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.2.tgz#7f646dbd9caea595e61f88ef60bfff8b01f8130a" - integrity sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw== - -ini@^4.1.3: +ini@4.1.3, ini@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.3.tgz#4c359675a6071a46985eb39b14e4a2c0ec98a795" integrity sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg== @@ -6498,27 +5869,6 @@ injection-js@^2.4.0: dependencies: tslib "^2.0.0" -inquirer@9.2.15: - version "9.2.15" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.15.tgz#2135a36190a6e5c92f5d205e0af1fea36b9d3492" - integrity sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg== - dependencies: - "@ljharb/through" "^2.3.12" - ansi-escapes "^4.3.2" - chalk "^5.3.0" - cli-cursor "^3.1.0" - cli-width "^4.1.0" - external-editor "^3.1.0" - figures "^3.2.0" - lodash "^4.17.21" - mute-stream "1.0.0" - ora "^5.4.1" - run-async "^3.0.0" - rxjs "^7.8.1" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wrap-ansi "^6.2.0" - inquirer@^7.0.0: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" @@ -6570,7 +5920,7 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipaddr.js@^2.0.1, ipaddr.js@^2.1.0: +ipaddr.js@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== @@ -6668,6 +6018,18 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + +is-fullwidth-code-point@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704" + integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA== + dependencies: + get-east-asian-width "^1.0.0" + is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -6871,17 +6233,6 @@ istanbul-lib-instrument@6.0.2: istanbul-lib-coverage "^3.2.0" semver "^7.5.4" -istanbul-lib-instrument@^5.0.4: - version "5.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" - integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - istanbul-lib-instrument@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765" @@ -7099,16 +6450,16 @@ jsonc-parser@3.2.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== -jsonc-parser@3.2.1, jsonc-parser@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a" - integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA== - jsonc-parser@3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4" integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ== +jsonc-parser@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a" + integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA== + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -7216,19 +6567,6 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klona@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" - integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== - -launch-editor@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c" - integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw== - dependencies: - picocolors "^1.0.0" - shell-quote "^1.8.1" - launch-editor@^2.6.1: version "2.8.0" resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.8.0.tgz#7255d90bdba414448e2138faa770a74f28451305" @@ -7237,13 +6575,6 @@ launch-editor@^2.6.1: picocolors "^1.0.0" shell-quote "^1.8.1" -less-loader@11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82" - integrity sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug== - dependencies: - klona "^2.0.4" - less-loader@12.2.0: version "12.2.0" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-12.2.0.tgz#e1e94522f6abe9e064ef396c29a3151bc6c1b6cc" @@ -7291,6 +6622,18 @@ lines-and-columns@~2.0.3: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42" integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A== +listr2@8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.3.tgz#c494bb89b34329cf900e4e0ae8aeef9081d7d7a5" + integrity sha512-Lllokma2mtoniUOS94CcOErHWAug5iu7HOmDrvWgpw8jyQH2fomgB+7lZS4HWZxytUuQwkGOwe49FvwVaA85Xw== + dependencies: + cli-truncate "^4.0.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^6.0.0" + rfdc "^1.4.1" + wrap-ansi "^9.0.0" + lmdb@3.0.12: version "3.0.12" resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-3.0.12.tgz#24dd824f9e50b3a7873d1ebe32f70d0e52befab1" @@ -7324,11 +6667,6 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576" - integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw== - loader-utils@3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5" @@ -7405,6 +6743,17 @@ log-symbols@^4.0.0, log-symbols@^4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +log-update@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.0.0.tgz#0ddeb7ac6ad658c944c1de902993fce7c33f5e59" + integrity sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw== + dependencies: + ansi-escapes "^6.2.0" + cli-cursor "^4.0.0" + slice-ansi "^7.0.0" + strip-ansi "^7.1.0" + wrap-ansi "^9.0.0" + log4js@^6.4.1: version "6.9.1" resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6" @@ -7454,13 +6803,6 @@ magic-string@0.30.10: dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -magic-string@0.30.8: - version "0.30.8" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613" - integrity sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ== - dependencies: - "@jridgewell/sourcemap-codec" "^1.4.15" - make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -7526,13 +6868,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -memfs@^3.4.12, memfs@^3.4.3: - version "3.6.0" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" - integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== - dependencies: - fs-monkey "^1.0.4" - memfs@^4.6.0: version "4.9.3" resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.9.3.tgz#41a3218065fe3911d9eba836250c8f4e43f816bc" @@ -7553,7 +6888,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0, merge2@^1.4.1: +merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -7598,14 +6933,6 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz#75245f3f30ce3a56dbdd478084df6fe475f02dc7" - integrity sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA== - dependencies: - schema-utils "^4.0.0" - tapable "^2.2.1" - mini-css-extract-plugin@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz#c73a1327ccf466f69026ac22a8e8fd707b78a235" @@ -7677,14 +7004,6 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-json-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" - integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== - dependencies: - jsonparse "^1.3.1" - minipass "^3.0.0" - minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" @@ -7790,7 +7109,7 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mute-stream@1.0.0, mute-stream@^1.0.0: +mute-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== @@ -7837,14 +7156,14 @@ ng-dynamic-component@^10.7.0: dependencies: tslib "^2.0.0" -ng-packagr@^17.3.0: - version "17.3.0" - resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-17.3.0.tgz#c7036f79aa6b927ee399cd9de62706c44793896c" - integrity sha512-kMSqxeDgv88SWCoapWNRRN1UdBgwu9/Pw/j7u2WFGmzrIWUFivNWBBSSL94kMxr2La+Z9wMwiL8EwKNvmCpg2A== +ng-packagr@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-18.1.0.tgz#e36f5ce95fde9bcdc1b075cb41f010f4df460d88" + integrity sha512-QfqiCIuRX7VhdHqE1goZIuaFh0aMmFTF6r+gP+iq7YyIookXlZWswEZYcnpyRw52Q1RHFdUJRm7foBRFyEXTLA== dependencies: - "@rollup/plugin-json" "^6.0.1" + "@rollup/plugin-json" "^6.1.0" "@rollup/plugin-node-resolve" "^15.2.3" - "@rollup/wasm-node" "^4.5.0" + "@rollup/wasm-node" "^4.18.0" ajv "^8.12.0" ansi-colors "^4.1.3" browserslist "^4.22.1" @@ -7853,7 +7172,7 @@ ng-packagr@^17.3.0: commander "^12.0.0" convert-source-map "^2.0.0" dependency-graph "^1.0.0" - esbuild-wasm "^0.20.0" + esbuild "^0.23.0" fast-glob "^3.3.1" find-cache-dir "^3.3.2" injection-js "^2.4.0" @@ -7865,8 +7184,7 @@ ng-packagr@^17.3.0: rxjs "^7.8.1" sass "^1.69.5" optionalDependencies: - esbuild "^0.20.0" - rollup "^4.5.0" + rollup "^4.18.0" ng2-material-dropdown@>=1.0.0: version "1.0.0" @@ -8017,17 +7335,7 @@ npm-normalize-package-bin@^3.0.0: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832" integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ== -npm-package-arg@11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.1.tgz#f208b0022c29240a1c532a449bdde3f0a4708ebc" - integrity sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ== - dependencies: - hosted-git-info "^7.0.0" - proc-log "^3.0.0" - semver "^7.3.5" - validate-npm-package-name "^5.0.0" - -npm-package-arg@^11.0.0: +npm-package-arg@11.0.2, npm-package-arg@^11.0.0: version "11.0.2" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.2.tgz#1ef8006c4a9e9204ddde403035f7ff7d718251ca" integrity sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw== @@ -8044,10 +7352,10 @@ npm-packlist@^8.0.0: dependencies: ignore-walk "^6.0.4" -npm-pick-manifest@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz#f87a4c134504a2c7931f2bb8733126e3c3bb7e8f" - integrity sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg== +npm-pick-manifest@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.1.tgz#c90658bd726fe5bca9d2869f3e99359b8fcda046" + integrity sha512-Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw== dependencies: npm-install-checks "^6.0.0" npm-normalize-package-bin "^3.0.0" @@ -8064,16 +7372,16 @@ npm-pick-manifest@^9.0.0: npm-package-arg "^11.0.0" semver "^7.3.5" -npm-registry-fetch@^16.0.0: - version "16.2.1" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz#c367df2d770f915da069ff19fd31762f4bca3ef1" - integrity sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA== +npm-registry-fetch@^17.0.0: + version "17.1.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz#fb69e8e762d456f08bda2f5f169f7638fb92beb1" + integrity sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA== dependencies: - "@npmcli/redact" "^1.1.0" + "@npmcli/redact" "^2.0.0" + jsonparse "^1.3.1" make-fetch-happen "^13.0.0" minipass "^7.0.2" minipass-fetch "^3.0.0" - minipass-json-stream "^1.0.1" minizlib "^2.1.2" npm-package-arg "^11.0.0" proc-log "^4.0.0" @@ -8282,7 +7590,7 @@ open@10.1.0, open@^10.0.3: is-inside-container "^1.0.0" is-wsl "^3.1.0" -open@8.4.2, open@^8.0.9, open@^8.4.0: +open@^8.4.0: version "8.4.2" resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== @@ -8327,7 +7635,7 @@ ora@5.3.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@5.4.1, ora@^5.1.0, ora@^5.4.1: +ora@5.4.1, ora@^5.1.0: version "5.4.1" resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== @@ -8422,14 +7730,6 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - p-retry@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd" @@ -8464,26 +7764,25 @@ package-json-from-dist@^1.0.0: resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw== -pacote@17.0.6: - version "17.0.6" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.6.tgz#874bb59cda5d44ab784d0b6530fcb4a7d9b76a60" - integrity sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ== +pacote@18.0.6: + version "18.0.6" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-18.0.6.tgz#ac28495e24f4cf802ef911d792335e378e86fac7" + integrity sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A== dependencies: "@npmcli/git" "^5.0.0" "@npmcli/installed-package-contents" "^2.0.1" + "@npmcli/package-json" "^5.1.0" "@npmcli/promise-spawn" "^7.0.0" - "@npmcli/run-script" "^7.0.0" + "@npmcli/run-script" "^8.0.0" cacache "^18.0.0" fs-minipass "^3.0.0" minipass "^7.0.2" npm-package-arg "^11.0.0" npm-packlist "^8.0.0" npm-pick-manifest "^9.0.0" - npm-registry-fetch "^16.0.0" - proc-log "^3.0.0" + npm-registry-fetch "^17.0.0" + proc-log "^4.0.0" promise-retry "^2.0.1" - read-package-json "^7.0.0" - read-package-json-fast "^3.0.0" sigstore "^2.2.0" ssri "^10.0.0" tar "^6.1.11" @@ -8594,11 +7893,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - path-type@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8" @@ -8609,11 +7903,6 @@ picocolors@^1.0.0, picocolors@^1.0.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== -picomatch@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.1.tgz#68c26c8837399e5819edce48590412ea07f17a07" - integrity sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg== - picomatch@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" @@ -8634,13 +7923,6 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -piscina@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.4.0.tgz#e3af8e5721d8fad08c6ccaf8a64f9f42279efbb5" - integrity sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg== - optionalDependencies: - nice-napi "^1.0.2" - piscina@4.6.1, piscina@^4.4.0: version "4.6.1" resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.6.1.tgz#4de673b0ff84bf641b31b07b3348669383b51c9a" @@ -8689,12 +7971,12 @@ postcss-media-query-parser@^0.2.3: resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig== -postcss-modules-extract-imports@^3.0.0, postcss-modules-extract-imports@^3.1.0: +postcss-modules-extract-imports@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== -postcss-modules-local-by-default@^4.0.4, postcss-modules-local-by-default@^4.0.5: +postcss-modules-local-by-default@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== @@ -8703,7 +7985,7 @@ postcss-modules-local-by-default@^4.0.4, postcss-modules-local-by-default@^4.0.5 postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^3.1.1, postcss-modules-scope@^3.2.0: +postcss-modules-scope@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== @@ -8730,15 +8012,6 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.35: - version "8.4.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" - integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@8.4.38, postcss@^8.2.14, postcss@^8.4.23: version "8.4.38" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" @@ -8748,7 +8021,7 @@ postcss@8.4.38, postcss@^8.2.14, postcss@^8.4.23: picocolors "^1.0.0" source-map-js "^1.2.0" -postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.35, postcss@^8.4.38: +postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.38: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== @@ -8783,11 +8056,6 @@ primeng@^17.18.4: dependencies: tslib "^2.3.0" -proc-log@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8" - integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A== - proc-log@^4.0.0, proc-log@^4.1.0, proc-log@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" @@ -8904,24 +8172,6 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -read-package-json-fast@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049" - integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw== - dependencies: - json-parse-even-better-errors "^3.0.0" - npm-normalize-package-bin "^3.0.0" - -read-package-json@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.1.tgz#8b5f6aab97a796cfb436516ade24c011d10964a9" - integrity sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q== - dependencies: - glob "^10.2.2" - json-parse-even-better-errors "^3.0.0" - normalize-package-data "^6.0.0" - npm-normalize-package-bin "^3.0.0" - readable-stream@^2.0.1: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" @@ -9104,6 +8354,14 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -9124,6 +8382,11 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== +rfdc@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca" + integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA== + rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -9177,7 +8440,7 @@ rollup@4.18.0: "@rollup/rollup-win32-x64-msvc" "4.18.0" fsevents "~2.3.2" -rollup@^4.13.0, rollup@^4.2.0, rollup@^4.5.0: +rollup@^4.13.0, rollup@^4.18.0: version "4.18.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.18.1.tgz#18a606df5e76ca53b8a69f2d8eab256d69dda851" integrity sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A== @@ -9212,11 +8475,6 @@ run-async@^2.4.0: resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== -run-async@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad" - integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -9272,13 +8530,6 @@ safe-regex-test@^1.0.3: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-loader@14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.1.tgz#2c9d2277c5b1c5fe789cd0570c046d8ad23cb7ca" - integrity sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw== - dependencies: - neo-async "^2.6.2" - sass-loader@14.2.1: version "14.2.1" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70" @@ -9286,15 +8537,6 @@ sass-loader@14.2.1: dependencies: neo-async "^2.6.2" -sass@1.71.1: - version "1.71.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54" - integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - sass@1.77.6: version "1.77.6" resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" @@ -9347,7 +8589,7 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== -selfsigned@^2.1.1, selfsigned@^2.4.1: +selfsigned@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== @@ -9362,13 +8604,6 @@ semver@7.3.5: dependencies: lru-cache "^6.0.0" -semver@7.6.0: - version "7.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" - semver@7.6.2, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.5, semver@^7.5.3: version "7.6.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" @@ -9408,7 +8643,7 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@^6.0.0, serialize-javascript@^6.0.1, serialize-javascript@^6.0.2: +serialize-javascript@^6.0.1, serialize-javascript@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -9552,11 +8787,6 @@ sigstore@^2.2.0: "@sigstore/tuf" "^2.3.4" "@sigstore/verify" "^1.2.1" -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - slash@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce" @@ -9571,6 +8801,22 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + +slice-ansi@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9" + integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg== + dependencies: + ansi-styles "^6.2.1" + is-fullwidth-code-point "^5.0.0" + smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -9800,6 +9046,15 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" +string-width@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc" + integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ== + dependencies: + emoji-regex "^10.3.0" + get-east-asian-width "^1.0.0" + strip-ansi "^7.1.0" + string.prototype.trim@^1.2.9: version "1.2.9" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" @@ -9863,7 +9118,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: +strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== @@ -9979,16 +9234,6 @@ terser-webpack-plugin@^5.3.10: serialize-javascript "^6.0.1" terser "^5.26.0" -terser@5.29.1: - version "5.29.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.1.tgz#44e58045b70c09792ba14bfb7b4e14ca8755b9fa" - integrity sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ== - dependencies: - "@jridgewell/source-map" "^0.3.3" - acorn "^8.8.2" - commander "^2.20.0" - source-map-support "~0.5.20" - terser@5.29.2: version "5.29.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.2.tgz#c17d573ce1da1b30f21a877bffd5655dd86fdb35" @@ -10129,11 +9374,6 @@ tsconfig-paths@^4.1.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - tslib@2.6.3, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" @@ -10271,11 +9511,6 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici@6.11.1: - version "6.11.1" - resolved "https://registry.yarnpkg.com/undici/-/undici-6.11.1.tgz#75ab573677885b421ca2e6f5f17ff1185b24c68d" - integrity sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw== - undici@6.19.2: version "6.19.2" resolved "https://registry.yarnpkg.com/undici/-/undici-6.19.2.tgz#231bc5de78d0dafb6260cf454b294576c2f3cd31" @@ -10399,17 +9634,6 @@ vary@^1, vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -vite@5.1.7: - version "5.1.7" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.7.tgz#9f685a2c4c70707fef6d37341b0e809c366da619" - integrity sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA== - dependencies: - esbuild "^0.19.3" - postcss "^8.4.35" - rollup "^4.2.0" - optionalDependencies: - fsevents "~2.3.3" - vite@5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.2.tgz#2f0a8531c71060467ed3e0a205a203f269b6d9c8" @@ -10426,15 +9650,7 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== -watchpack@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -watchpack@2.4.1, watchpack@^2.4.0, watchpack@^2.4.1: +watchpack@2.4.1, watchpack@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff" integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg== @@ -10466,17 +9682,6 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-dev-middleware@6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz#0463232e59b7d7330fa154121528d484d36eb973" - integrity sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ== - dependencies: - colorette "^2.0.10" - memfs "^3.4.12" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - webpack-dev-middleware@7.2.1: version "7.2.1" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz#2af00538b6e4eda05f5afdd5d711dbebc05958f7" @@ -10489,17 +9694,6 @@ webpack-dev-middleware@7.2.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-middleware@^5.3.1: - version "5.3.4" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" - integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - webpack-dev-middleware@^7.1.0: version "7.3.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz#5975ea41271083dc5678886b99d4c058382fb311" @@ -10512,42 +9706,6 @@ webpack-dev-middleware@^7.1.0: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4.15.1: - version "4.15.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" - integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.5" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" - webpack-dev-server@5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz#cb6ea47ff796b9251ec49a94f24a425e12e3c9b8" @@ -10605,36 +9763,6 @@ webpack-subresource-integrity@5.1.0: dependencies: typed-assert "^1.0.8" -webpack@5.90.3: - version "5.90.3" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac" - integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.5" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" - acorn "^8.7.1" - acorn-import-assertions "^1.9.0" - browserslist "^4.21.10" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.15.0" - es-module-lexer "^1.2.1" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.2.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.3.10" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - webpack@5.92.1: version "5.92.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788" @@ -10811,6 +9939,15 @@ wrap-ansi@^8.1.0: string-width "^5.0.1" strip-ansi "^7.0.1" +wrap-ansi@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e" + integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q== + dependencies: + ansi-styles "^6.2.1" + string-width "^7.0.0" + strip-ansi "^7.1.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -10833,11 +9970,6 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@^8.13.0: - version "8.17.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" - integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== - ws@^8.16.0: version "8.18.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" @@ -10944,6 +10076,11 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== +yoctocolors-cjs@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz#f4b905a840a37506813a7acaa28febe97767a242" + integrity sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA== + zen-observable-ts@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"