Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dotCMS/core#26332 Move DotCopyButtonComponent to UI lib #26336

Merged
merged 3 commits into from Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -11,12 +11,11 @@ import { RouterTestingModule } from '@angular/router/testing';

import { ButtonModule } from 'primeng/button';

import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotAppsService } from '@dotcms/app/api/services/dot-apps/dot-apps.service';
import { DotRouterService } from '@dotcms/app/api/services/dot-router/dot-router.service';
import { DotMessageService } from '@dotcms/data-access';
import { DotAppsSaveData, DotAppsSecrets } from '@dotcms/dotcms-models';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import { MockDotMessageService, MockDotRouterService } from '@dotcms/utils-testing';
import { DotPipesModule } from '@pipes/dot-pipes.module';
import { DotKeyValue } from '@shared/models/dot-key-value-ng/dot-key-value-ng.model';
Expand Down Expand Up @@ -150,7 +149,7 @@ describe('DotAppsConfigurationDetailComponent', () => {
]),
ButtonModule,
CommonModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotAppsConfigurationHeaderModule,
DotPipesModule,
DotMessagePipe,
Expand Down
Expand Up @@ -3,10 +3,9 @@ import { NgModule } from '@angular/core';

import { ButtonModule } from 'primeng/button';

import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotKeyValueModule } from '@components/dot-key-value-ng/dot-key-value-ng.module';
import { DotAppsService } from '@dotcms/app/api/services/dot-apps/dot-apps.service';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

import { DotAppsConfigurationDetailFormModule } from './dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.module';
Expand All @@ -20,7 +19,7 @@ import { DotAppsConfigurationHeaderModule } from '../dot-apps-configuration-head
ButtonModule,
CommonModule,
DotKeyValueModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotAppsConfigurationHeaderModule,
DotAppsConfigurationDetailFormModule,
DotPipesModule,
Expand Down
Expand Up @@ -7,10 +7,9 @@ import { ButtonModule } from 'primeng/button';
import { InputTextModule } from 'primeng/inputtext';

import { DotActionButtonModule } from '@components/_common/dot-action-button/dot-action-button.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotDialogModule } from '@components/dot-dialog/dot-dialog.module';
import { DotAppsService } from '@dotcms/app/api/services/dot-apps/dot-apps.service';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

import { DotAppsConfigurationListModule } from './dot-apps-configuration-list/dot-apps-configuration-list.module';
Expand All @@ -26,7 +25,7 @@ import { DotAppsImportExportDialogModule } from '../dot-apps-import-export-dialo
ButtonModule,
CommonModule,
DotActionButtonModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotAppsConfigurationHeaderModule,
DotAppsConfigurationListModule,
DotAppsImportExportDialogModule,
Expand Down
Expand Up @@ -3,18 +3,16 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotMessageService } from '@dotcms/data-access';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';

import { DotEditPageInfoComponent } from './dot-edit-page-info.component';

@Component({
template: `<dot-edit-page-info
[title]="title"
[url]="url"
[apiLink]="apiLink"
></dot-edit-page-info>`
[apiLink]="apiLink"></dot-edit-page-info>`
})
class TestHostComponent {
title = 'A title';
Expand All @@ -31,7 +29,7 @@ describe('DotEditPageInfoComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [TestHostComponent, DotEditPageInfoComponent],
imports: [DotApiLinkModule, DotCopyButtonModule, DotMessagePipe],
imports: [DotApiLinkModule, DotCopyButtonComponent, DotMessagePipe],
providers: [
{
provide: DotMessageService,
Expand Down
Expand Up @@ -4,10 +4,9 @@ import { NgModule } from '@angular/core';
import { ButtonModule } from 'primeng/button';

import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotLinkComponent } from '@components/dot-link/dot-link.component';
import { LOCATION_TOKEN } from '@dotcms/app/providers';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

import { DotEditPageInfoComponent } from './dot-edit-page-info.component';
Expand All @@ -16,7 +15,7 @@ import { DotEditPageInfoComponent } from './dot-edit-page-info.component';
imports: [
CommonModule,
ButtonModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotApiLinkModule,
DotPipesModule,
DotLinkComponent,
Expand Down
Expand Up @@ -3,18 +3,16 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotMessageService } from '@dotcms/data-access';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';

import { DotEditPageInfoSeoComponent } from './dot-edit-page-info-seo.component';

@Component({
template: `<dot-edit-page-info-seo
[title]="title"
[url]="url"
[apiLink]="apiLink"
></dot-edit-page-info-seo>`
[apiLink]="apiLink"></dot-edit-page-info-seo>`
})
class TestHostComponent {
title = 'A title';
Expand All @@ -33,7 +31,7 @@ describe('DotEditPageInfoSeoComponent', () => {
declarations: [TestHostComponent],
imports: [
DotApiLinkModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotMessagePipe,
DotEditPageInfoSeoComponent
],
Expand Down
Expand Up @@ -4,10 +4,9 @@ import { Component, Inject, Input } from '@angular/core';
import { ButtonModule } from 'primeng/button';

import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotLinkComponent } from '@components/dot-link/dot-link.component';
import { LOCATION_TOKEN } from '@dotcms/app/providers';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

/**
Expand All @@ -24,7 +23,7 @@ import { DotPipesModule } from '@pipes/dot-pipes.module';
imports: [
CommonModule,
ButtonModule,
DotCopyButtonModule,
DotCopyButtonComponent,
DotApiLinkModule,
DotPipesModule,
DotMessagePipe,
Expand Down
Expand Up @@ -15,15 +15,14 @@ import { TabViewModule } from 'primeng/tabview';

import { DotInlineEditModule } from '@components/_common/dot-inline-edit/dot-inline-edit.module';
import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotCopyLinkModule } from '@components/dot-copy-link/dot-copy-link.module';
import { DotPortletBoxModule } from '@components/dot-portlet-base/components/dot-portlet-box/dot-portlet-box.module';
import { DotSecondaryToolbarModule } from '@components/dot-secondary-toolbar';
import { DotMenuService } from '@dotcms/app/api/services/dot-menu.service';
import { DotCurrentUserService, DotEventsService, DotMessageService } from '@dotcms/data-access';
import { CoreWebService } from '@dotcms/dotcms-js';
import { DotCMSContentType } from '@dotcms/dotcms-models';
import { DotIconModule, DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotIconModule, DotMessagePipe } from '@dotcms/ui';
import {
CoreWebServiceMock,
dotcmsContentTypeBasicMock,
Expand Down Expand Up @@ -144,7 +143,7 @@ describe('ContentTypesLayoutComponent', () => {
DotInlineEditModule,
HttpClientTestingModule,
DotPortletBoxModule,
DotCopyButtonModule
DotCopyButtonComponent
],
providers: [
{ provide: DotMessageService, useValue: messageServiceMock },
Expand Down
Expand Up @@ -29,7 +29,6 @@ import { IFrameModule } from '@components/_common/iframe';
import { SearchableDropDownModule } from '@components/_common/searchable-dropdown';
import { DotApiLinkModule } from '@components/dot-api-link/dot-api-link.module';
import { DotBaseTypeSelectorModule } from '@components/dot-base-type-selector';
import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotCopyLinkModule } from '@components/dot-copy-link/dot-copy-link.module';
import { DotDialogModule } from '@components/dot-dialog/dot-dialog.module';
import { DotFieldHelperModule } from '@components/dot-field-helper/dot-field-helper.module';
Expand All @@ -41,6 +40,7 @@ import { DotMdIconSelectorModule } from '@dotcms/app/view/components/_common/dot
import { DotContentTypesInfoService, DotWorkflowService } from '@dotcms/data-access';
import {
DotAutofocusDirective,
DotCopyButtonComponent,
DotFieldRequiredDirective,
DotFieldValidationMessageComponent,
DotIconModule,
Expand Down Expand Up @@ -159,7 +159,7 @@ import { DotAddToMenuModule } from '../dot-content-types-listing/components/dot-
DotMdIconSelectorModule,
DotAddToMenuModule,
DotFieldRequiredDirective,
DotCopyButtonModule,
DotCopyButtonComponent,

OverlayPanelModule,
DotMessagePipe
Expand Down
Expand Up @@ -9,9 +9,8 @@ import { ButtonModule } from 'primeng/button';

import { DotDialogComponent } from '@components/dot-dialog/dot-dialog.component';
import { DotDialogModule } from '@components/dot-dialog/dot-dialog.module';
import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotGenerateSecurePasswordService, DotMessageService } from '@dotcms/data-access';
import { DotMessagePipe } from '@dotcms/ui';
import { DotClipboardUtil, DotMessagePipe } from '@dotcms/ui';
import { MockDotMessageService } from '@dotcms/utils-testing';
import { DotPipesModule } from '@pipes/dot-pipes.module';

Expand Down
Expand Up @@ -4,8 +4,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core';

import { takeUntil } from 'rxjs/operators';

import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotGenerateSecurePasswordService, DotMessageService } from '@dotcms/data-access';
import { DotClipboardUtil } from '@dotcms/ui';

import { DotDialogActions } from '../../dot-dialog/dot-dialog.component';

Expand Down
Expand Up @@ -4,9 +4,8 @@ import { NgModule } from '@angular/core';
import { ButtonModule } from 'primeng/button';

import { DotDialogModule } from '@components/dot-dialog/dot-dialog.module';
import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotGenerateSecurePasswordService } from '@dotcms/data-access';
import { DotMessagePipe } from '@dotcms/ui';
import { DotClipboardUtil, DotMessagePipe } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

import { DotGenerateSecurePasswordComponent } from './dot-generate-secure-password.component';
Expand Down

This file was deleted.

Expand Up @@ -5,9 +5,8 @@ import { By } from '@angular/platform-browser';
import { ButtonModule } from 'primeng/button';
import { TooltipModule } from 'primeng/tooltip';

import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotMessageService } from '@dotcms/data-access';
import { DotIconModule } from '@dotcms/ui';
import { DotClipboardUtil, DotIconModule } from '@dotcms/ui';
import { MockDotMessageService } from '@dotcms/utils-testing';

import { DotCopyLinkComponent } from './dot-copy-link.component';
Expand Down
@@ -1,7 +1,7 @@
import { Component, Input, OnInit } from '@angular/core';

import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotMessageService } from '@dotcms/data-access';
import { DotClipboardUtil } from '@dotcms/ui';

/**
* Icon button to copy to clipboard the string you pass to it,
Expand Down
Expand Up @@ -4,8 +4,7 @@ import { NgModule } from '@angular/core';
import { ButtonModule } from 'primeng/button';
import { TooltipModule } from 'primeng/tooltip';

import { DotClipboardUtil } from '@dotcms/app/api/util/clipboard/ClipboardUtil';
import { DotIconModule } from '@dotcms/ui';
import { DotClipboardUtil, DotIconModule } from '@dotcms/ui';

import { DotCopyLinkComponent } from './dot-copy-link.component';

Expand Down
Expand Up @@ -2,10 +2,9 @@ import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotMessageService } from '@dotcms/data-access';
import { DotCMSContentType } from '@dotcms/dotcms-models';
import { DotIconModule, DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotIconModule, DotMessagePipe } from '@dotcms/ui';
import { dotcmsContentTypeBasicMock, MockDotMessageService } from '@dotcms/utils-testing';
import { DotPipesModule } from '@pipes/dot-pipes.module';

Expand All @@ -28,8 +27,7 @@ const fakeContentType: DotCMSContentType = {
template: ` <dot-relationship-tree
[velocityVar]="velocityVar"
[contentType]="contentType"
[isParentField]="isParentField"
></dot-relationship-tree>`
[isParentField]="isParentField"></dot-relationship-tree>`
})
class TestHostComponent {
velocityVar = 'Parent.Children';
Expand All @@ -46,7 +44,7 @@ describe('DotRelationshipTreeComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [TestHostComponent, DotRelationshipTreeComponent],
imports: [DotIconModule, DotPipesModule, DotMessagePipe, DotCopyButtonModule],
imports: [DotIconModule, DotPipesModule, DotMessagePipe, DotCopyButtonComponent],
providers: [
{
provide: DotMessageService,
Expand Down Expand Up @@ -91,7 +89,7 @@ describe('DotRelationshipTreeComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [TestHostComponent, DotRelationshipTreeComponent],
imports: [DotIconModule, DotPipesModule, DotMessagePipe, DotCopyButtonModule],
imports: [DotIconModule, DotPipesModule, DotMessagePipe, DotCopyButtonComponent],
providers: [
{
provide: DotMessageService,
Expand Down
@@ -1,15 +1,14 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';

import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotIconModule } from '@dotcms/ui';
import { DotCopyButtonComponent, DotIconModule } from '@dotcms/ui';
import { DotPipesModule } from '@pipes/dot-pipes.module';

import { DotRelationshipTreeComponent } from './dot-relationship-tree.component';

@NgModule({
declarations: [DotRelationshipTreeComponent],
exports: [DotRelationshipTreeComponent],
imports: [CommonModule, DotCopyButtonModule, DotPipesModule, DotIconModule]
imports: [CommonModule, DotCopyButtonComponent, DotPipesModule, DotIconModule]
})
export class DotRelationshipTreeModule {}
Expand Up @@ -15,7 +15,6 @@ import { ConfirmPopup } from 'primeng/confirmpopup';
import { Inplace } from 'primeng/inplace';
import { Tooltip } from 'primeng/tooltip';

import { DotCopyButtonComponent } from '@components/dot-copy-button/dot-copy-button.component';
import { DotMessageService, DotSessionStorageService } from '@dotcms/data-access';
import {
DEFAULT_VARIANT_ID,
Expand All @@ -25,7 +24,7 @@ import {
ExperimentSteps
} from '@dotcms/dotcms-models';
import { DotExperimentsService } from '@dotcms/portlets/dot-experiments/data-access';
import { DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotMessagePipe } from '@dotcms/ui';
import {
ACTIVE_ROUTE_MOCK_CONFIG,
getExperimentMock,
Expand Down
Expand Up @@ -15,7 +15,6 @@ import { TooltipModule } from 'primeng/tooltip';

import { tap } from 'rxjs/operators';

import { DotCopyButtonModule } from '@components/dot-copy-button/dot-copy-button.module';
import { DotMessageService, DotSessionStorageService } from '@dotcms/data-access';
import {
ComponentStatus,
Expand All @@ -28,7 +27,7 @@ import {
StepStatus,
Variant
} from '@dotcms/dotcms-models';
import { DotIconModule, DotMessagePipe } from '@dotcms/ui';
import { DotCopyButtonComponent, DotIconModule, DotMessagePipe } from '@dotcms/ui';
import { DotDynamicDirective } from '@portlets/shared/directives/dot-dynamic.directive';

import { DotExperimentsInlineEditTextComponent } from '../../../shared/ui/dot-experiments-inline-edit-text/dot-experiments-inline-edit-text.component';
Expand All @@ -47,7 +46,7 @@ import { DotExperimentsConfigurationVariantsAddComponent } from '../dot-experime
DotMessagePipe,
DotIconModule,
DotExperimentsConfigurationVariantsAddComponent,
DotCopyButtonModule,
DotCopyButtonComponent,
DotExperimentsConfigurationItemsCountComponent,
DotDynamicDirective,

Expand Down