diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index 766a726659..145262e991 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -57,7 +57,6 @@ import { DisplayMode, ShowHeaderMode, InfinitePaginationComponent, - SharedLinksApiService, FormRenderingService, FileUploadEvent, NodesApiService @@ -71,7 +70,8 @@ import { LibraryDialogComponent, ContentMetadataService, FilterSearch, - DialogAspectListService + DialogAspectListService, + SharedLinksApiService } from '@alfresco/adf-content-services'; import { SelectAppsDialogComponent, ProcessFormRenderingService } from '@alfresco/adf-process-services'; diff --git a/docs/README.md b/docs/README.md index 9d0a95c6a9..3d0b751cdf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -229,8 +229,8 @@ for more information about installing and using the source code. | [Renditions service](core/services/renditions.service.md) | Manages prearranged conversions of content to different formats. | [Source](../lib/core/src/lib/services/renditions.service.ts) | | [Search Configuration service](core/services/search-configuration.service.md) | Provides fine control of parameters to a search. | [Source](../lib/core/src/lib/services/search-configuration.service.ts) | | [Search service](core/services/search.service.md) | Accesses the Content Services Search API. | [Source](../lib/core/src/lib/services/search.service.ts) | -| [Shared Links Api service](core/services/shared-links-api.service.md) | Finds shared links to Content Services items. | [Source](../lib/core/src/lib/services/shared-links-api.service.ts) | -| [Storage service](core/services/storage.service.md) | Stores items in the form of key-value pairs. | [Source](../lib/core/src/lib/common/services/storage.service.ts) | +| [Shared Links Api service](core/services/shared-links-api.service.md) | Finds shared links to Content Services items. | [Source](lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts) | +| [Storage service](core/services/storage.service.md) | Stores items in the form of key-value pairs. | [Source](../lib/core/src/lib/services/storage.service.ts) | | [Thumbnail service](core/services/thumbnail.service.md) | Retrieves an SVG thumbnail image to represent a document type. | [Source](../lib/core/src/lib/services/thumbnail.service.ts) | | [Translation service](core/services/translation.service.md) | Supports localisation. | [Source](../lib/core/src/lib/services/translation.service.ts) | | [Upload Service](core/services/upload.service.md) | Provides access to various APIs related to file upload features. | [Source](../lib/core/src/lib/services/upload.service.ts) | diff --git a/docs/core/services/shared-links-api.service.md b/docs/core/services/shared-links-api.service.md index f7a41b79b4..381e4726e6 100644 --- a/docs/core/services/shared-links-api.service.md +++ b/docs/core/services/shared-links-api.service.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-06-08 --- -# [Shared Links Api service](../../../lib/core/src/lib/services/shared-links-api.service.ts "Defined in shared-links-api.service.ts") +# [Shared Links Api service](lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts "Defined in shared-links-api.service.ts") Finds shared links to Content Services items. diff --git a/docs/upgrade-guide/upgrade50-60.md b/docs/upgrade-guide/upgrade50-60.md index 4643b44b66..b5c4ca3ca0 100644 --- a/docs/upgrade-guide/upgrade50-60.md +++ b/docs/upgrade-guide/upgrade50-60.md @@ -83,6 +83,10 @@ How to fix it: ## Deprecated items +| Class | Before | After | +| --- | -- | --- | +| `LoginDialogService` | `@alfresco/adf-core`| + ### DataColumnModule [`DataColumnModule`](../../lib/core/src/lib/datatable/data-column/data-column.module.ts) has been deprecated and moved in [`DataTableModule`](../../lib/core/src/lib/datatable/datatable.module.ts) @@ -126,6 +130,7 @@ v6.0.0 and after: | [`NodeFavoriteDirective`](../content-services/directives/node-favorite.directive.md)| `@alfresco/adf-core` | `@alfresco/adf-content-services` | | [`NodeRestoreDirective`](../content-services/directives/node-restore.directive.md)| `@alfresco/adf-core` | `@alfresco/adf-content-services` | | [`AppsProcessService`] | `@alfresco/adf-core` | `@alfresco/adf-process-services` | +| `SharedLinksApiService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | | `LockService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | | `FavoritesApiService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts index 1e0b87f2e7..4dfd088992 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts @@ -20,12 +20,12 @@ import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dial import { of, empty } from 'rxjs'; import { setupTestBed, - SharedLinksApiService, NodesApiService, NotificationService, RenditionsService, AppConfigService } from '@alfresco/adf-core'; +import { SharedLinksApiService } from './services/shared-links-api.service'; import { ShareDialogComponent } from './content-node-share.dialog'; import moment from 'moment'; import { ContentTestingModule } from '../testing/content.testing.module'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts index e0b34772fd..2f82793bf5 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts @@ -28,12 +28,12 @@ import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { UntypedFormGroup, UntypedFormControl, AbstractControl } from '@angular/forms'; import { Observable, Subject } from 'rxjs'; import { - SharedLinksApiService, NodesApiService, ContentService, RenditionsService, AppConfigService } from '@alfresco/adf-core'; +import { SharedLinksApiService } from './services/shared-links-api.service'; import { SharedLinkEntry, Node } from '@alfresco/js-api'; import { ConfirmDialogComponent } from '../dialogs/confirm.dialog'; import moment from 'moment'; diff --git a/lib/content-services/src/lib/content-node-share/public-api.ts b/lib/content-services/src/lib/content-node-share/public-api.ts index d5e0110dec..dd03018adc 100644 --- a/lib/content-services/src/lib/content-node-share/public-api.ts +++ b/lib/content-services/src/lib/content-node-share/public-api.ts @@ -19,4 +19,6 @@ export * from './content-node-share.settings'; export * from './content-node-share.dialog'; export * from './content-node-share.directive'; +export * from './services/shared-links-api.service'; + export * from './content-node-share.module'; diff --git a/lib/core/src/lib/services/shared-links-api.service.ts b/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts similarity index 95% rename from lib/core/src/lib/services/shared-links-api.service.ts rename to lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts index 9eeeeb6067..aa09114572 100644 --- a/lib/core/src/lib/services/shared-links-api.service.ts +++ b/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts @@ -18,8 +18,7 @@ import { Injectable } from '@angular/core'; import { NodePaging, SharedLinkEntry, SharedlinksApi } from '@alfresco/js-api'; import { Observable, from, of, Subject } from 'rxjs'; -import { AlfrescoApiService } from './alfresco-api.service'; -import { UserPreferencesService } from '../common/services/user-preferences.service'; +import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core'; import { catchError } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/login-dialog.service.spec.ts b/lib/core/src/lib/services/login-dialog.service.spec.ts deleted file mode 100644 index 0e460eb4fd..0000000000 --- a/lib/core/src/lib/services/login-dialog.service.spec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/*! - * @license - * Copyright 2019 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { MatDialog } from '@angular/material/dialog'; -import { LoginDialogService } from './login-dialog.service'; -import { Subject, of } from 'rxjs'; -import { CoreTestingModule } from '../testing/core.testing.module'; -import { TranslateModule } from '@ngx-translate/core'; - -describe('LoginDialogService', () => { - - let service: LoginDialogService; - let materialDialog: MatDialog; - let spyOnDialogOpen: jasmine.Spy; - - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - - beforeEach(() => { - service = TestBed.inject(LoginDialogService); - materialDialog = TestBed.inject(MatDialog); - spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({ - afterOpen: () => of({}), - afterClosed: () => of({}), - componentInstance: { - error: new Subject() - } - } as any); - }); - - it('should be able to open the dialog when node has permission', () => { - service.openLogin('fake-title', 'fake-action'); - expect(spyOnDialogOpen).toHaveBeenCalled(); - }); - - it('should be able to close the material dialog', () => { - spyOn(materialDialog, 'closeAll'); - service.close(); - expect(materialDialog.closeAll).toHaveBeenCalled(); - }); -}); diff --git a/lib/core/src/lib/services/login-dialog.service.ts b/lib/core/src/lib/services/login-dialog.service.ts deleted file mode 100644 index fae8818e02..0000000000 --- a/lib/core/src/lib/services/login-dialog.service.ts +++ /dev/null @@ -1,64 +0,0 @@ -/*! - * @license - * Copyright 2019 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { MatDialog } from '@angular/material/dialog'; -import { Injectable } from '@angular/core'; -import { Subject, Observable } from 'rxjs'; -import { LoginDialogComponent } from '../login/components/login-dialog.component'; -import { LoginDialogComponentData } from '../login/components/login-dialog-component-data.interface'; - -@Injectable({ - providedIn: 'root' -}) -export class LoginDialogService { - - constructor(private dialog: MatDialog) { - } - - /** - * Opens a dialog to choose a file to upload. - * - * @param actionName Name of the action to show in the title - * @param title Title for the dialog - * @returns Information about the chosen file(s) - */ - openLogin(actionName: string, title: string): Observable { - const logged = new Subject(); - logged.subscribe({ - complete: this.close.bind(this) - }); - - const data: LoginDialogComponentData = { - title, - actionName, - logged - }; - - this.openLoginDialog(data, 'adf-login-dialog', '630px'); - return logged; - } - - private openLoginDialog(data: LoginDialogComponentData, currentPanelClass: string, chosenWidth: string) { - this.dialog.open(LoginDialogComponent, { data, panelClass: currentPanelClass, width: chosenWidth }); - } - - /** Closes the currently open dialog. */ - close() { - this.dialog.closeAll(); - } - -} diff --git a/lib/core/src/lib/services/public-api.ts b/lib/core/src/lib/services/public-api.ts index 33cbd575a1..c9b9f10ee7 100644 --- a/lib/core/src/lib/services/public-api.ts +++ b/lib/core/src/lib/services/public-api.ts @@ -29,9 +29,7 @@ export * from './deleted-nodes-api.service'; export * from './nodes-api.service'; export * from './people-content.service'; export * from './people-process.service'; -export * from './shared-links-api.service'; export * from './discovery-api.service'; -export * from './login-dialog.service'; export * from './external-alfresco-api.service'; export * from './download-zip.service'; export * from './automation.service';