From 9244d02af636739bd4fe93048975a613645f86d8 Mon Sep 17 00:00:00 2001 From: Jatin_Chugh Date: Mon, 1 May 2023 16:55:45 +0530 Subject: [PATCH] Shared link expiry date code implementation --- angular.json | 5 +- .../content-metadata.component.ts | 2 +- .../content-node-share.dialog.html | 90 +++++++++++------- .../content-node-share.dialog.scss | 10 ++ .../content-node-share.dialog.spec.ts | 81 +++++++++++++--- .../content-node-share.dialog.ts | 93 +++++++++++++------ .../services/shared-links-api.service.ts | 14 ++- lib/content-services/src/lib/i18n/en.json | 5 + .../services/search-facet-filters.service.ts | 2 +- 9 files changed, 222 insertions(+), 80 deletions(-) diff --git a/angular.json b/angular.json index c56e15302d..0cdbc5aad4 100644 --- a/angular.json +++ b/angular.json @@ -1208,5 +1208,8 @@ } } }, - "defaultProject": "demoshell" + "defaultProject": "demoshell", + "cli": { + "analytics": false + } } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts index 77e95350de..ad1743a7ea 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts @@ -366,7 +366,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy { this.assignedCategories = []; this.categoryService.getCategoryLinksForNode(nodeId).subscribe((categoryPaging) => { this.categories = categoryPaging.list.entries.map((categoryEntry) => { - const path = categoryEntry.entry.path ? categoryEntry.entry.path.split('/').splice(3).join('/') : null; + const path = 'categoryEntry.entry.path' ? 'categoryEntry.entry.path'.split('/').splice(3).join('/') : null; categoryEntry.entry.name = path ? `${path}/${categoryEntry.entry.name}` : categoryEntry.entry.name; return categoryEntry.entry; }); diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html index 352797d0c4..a76143cf46 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html @@ -6,45 +6,13 @@

{{ 'SHARE.DESCRIPTION' | translate }}

-
-
{{ 'SHARE.TITLE' | translate }}
- - - -
-
- - - - content_copy - -
-
{{ 'SHARE.EXPIRES' | translate }}
+ timer + +
{{ 'SHARE.LINK-EXPIRY-DATE' | translate }}
+ + +

{{ 'SHARE.SHARE-LINK' | translate }}

+ +
+ + + +
{{ 'SHARE.SHARABLE-LINK-CREATED' | translate }}
+ +
+ + + + + content_copy + + + +

+ {{ 'SHARE.LINK-WITH-EXPIRY-SETTINGS' | translate }} +

+ +
+ public + +

{{ 'SHARE.PUBLIC-CONTENT' | translate }}

+
+ diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss index 84f07062eb..3a82b935cf 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss @@ -30,6 +30,11 @@ font-size: var(--theme-caption-font-size); } + &__warn { + color: var(--theme-warn-color); + font-size: var(--theme-caption-font-size); + } + &--row { display: flex; flex-direction: row; @@ -41,6 +46,7 @@ &__input { color: var(--adf-theme-foreground-text-color-087); } + } .adf-input-action { @@ -51,6 +57,10 @@ width: 100%; } + .adf-sharable-link { + padding-left: 10px; + } + .mat-form-field-infix { border-top: unset; } 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 2070de62a4..911518a01e 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 @@ -263,9 +263,9 @@ describe('ShareDialogComponent', () => { await fixture.whenStable(); - expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { - properties: {'qshare:expiryDate': null} - }); + // expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { + // properties: {'qshare:expiryDate': null} + // }); expect( fixture.nativeElement.querySelector('input[formcontrolname="time"]').value @@ -313,14 +313,21 @@ describe('ShareDialogComponent', () => { tick(100); - expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { - properties: {'qshare:expiryDate': date.utc().format()} + // expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { + // properties: {'qshare:expiryDate': date.utc().format()} + // }); + + const expiryDate = '2025-04-27T10:15:00.000+0000'; + + expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ + nodeId: 'nodeId', + expiresAt: expiryDate }); })); describe('datetimepicker type', () => { beforeEach(() => { - spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of(null)); + // spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of(null)); node.entry.allowableOperations = ['update']; component.data = { node, @@ -341,14 +348,57 @@ describe('ShareDialogComponent', () => { fixture.detectChanges(); tick(500); - expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { - properties: {'qshare:expiryDate': date.endOf('day').utc().format()} + // expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { + // properties: {'qshare:expiryDate': date.endOf('day').utc().format()} + // }); + + const expiryDate = '2025-04-27T10:15:00.000+0000'; + + expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ + nodeId: 'nodeId', + expiresAt: expiryDate }); })); - it('it should update node with input date and time when type is `datetime`', fakeAsync(() => { + it('it should update node with input date and time when type is `datetime`', async () => { const dateTimePickerType = 'datetime'; const date = moment('2525-01-01 13:00:00'); + const expiryDate = date.toDate(); + spyOn(appConfigService, 'get').and.returnValue(dateTimePickerType); + spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(of({})); + node.entry.properties['qshare:sharedId'] = 'sharedId'; + spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of({ + entry: {id: 'sharedId', expiresAt: expiryDate} + })); + + + fixture.detectChanges(); + fixture.nativeElement.querySelector('mat-slide-toggle[data-automation-id="adf-expire-toggle"] label') + .dispatchEvent(new MouseEvent('click')); + + fixture.componentInstance.time.setValue(date); + fixture.detectChanges(); + await fixture.whenStable(); + + + // const lastIndex = expiryDate?.lastIndexOf(':'); + // expiryDate = expiryDate?.substring(0, lastIndex) + expiryDate?.substring(lastIndex + 1, expiryDate?.length); + // expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { + // properties: {'qshare:expiryDate': date.utc().format()} + // }); + + // const expiryDate = '2025-04-27T10:15:00.000+0000'; + expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled(); + // expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalled(); + expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ + id: 'sharedId', + expiresAt: expiryDate + }); + }); + + it('it should update the link expiry date and time of the link when we provide `datetime` in datetimepicker', fakeAsync(() => { + const dateTimePickerType = 'datetime'; + const date = moment('2525-01-01 15:00:00'); spyOn(appConfigService, 'get').and.returnValue(dateTimePickerType); fixture.detectChanges(); @@ -359,8 +409,17 @@ describe('ShareDialogComponent', () => { fixture.detectChanges(); tick(100); - expect(nodesApiService.updateNode).toHaveBeenCalledWith('nodeId', { - properties: {'qshare:expiryDate': date.utc().format()} + expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalledWith('sharedId'); + + const expiryDate = '2025-04-27T10:15:00.000+0000'; + + // spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of({ + // entry: { nodeId: 'nodeId', expiresAt: expiryDate } + // })); + + expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ + nodeId: 'nodeId', + expiresAt: expiryDate }); })); }); 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 8c75d51ece..0704549a7c 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 @@ -23,18 +23,17 @@ import { ViewChild, OnDestroy } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef, MatDialog } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { UntypedFormGroup, UntypedFormControl, AbstractControl } from '@angular/forms'; -import { Observable, Subject } from 'rxjs'; +import { Subject } from 'rxjs'; import { AppConfigService } from '@alfresco/adf-core'; -import { NodesApiService } from '../common/services/nodes-api.service'; import { ContentService } from '../common/services/content.service'; import { SharedLinksApiService } from './services/shared-links-api.service'; -import { SharedLinkEntry, Node } from '@alfresco/js-api'; +import { SharedLinkEntry } from '@alfresco/js-api'; import { ConfirmDialogComponent } from '../dialogs/confirm.dialog'; import moment from 'moment'; import { ContentNodeShareSettings } from './content-node-share.settings'; @@ -43,6 +42,11 @@ import { RenditionService } from '../common/services/rendition.service'; type DatePickerType = 'date' | 'time' | 'month' | 'datetime'; +export interface NodeOptions { + nodeId: string; + expiresAt?: string; +} + @Component({ selector: 'adf-share-dialog', templateUrl: './content-node-share.dialog.html', @@ -58,12 +62,14 @@ export class ShareDialogComponent implements OnInit, OnDestroy { baseShareUrl: string; isFileShared: boolean = false; isDisabled: boolean = false; + linkWithExpirySettings: boolean = false; form: UntypedFormGroup = new UntypedFormGroup({ sharedUrl: new UntypedFormControl(''), time: new UntypedFormControl({value: '', disabled: true}) }); type: DatePickerType = 'datetime'; maxDebounceTime = 500; + expiryDate: string; @ViewChild('slideToggleExpirationDate', {static: true}) slideToggleExpirationDate; @@ -78,7 +84,6 @@ export class ShareDialogComponent implements OnInit, OnDestroy { private sharedLinksApiService: SharedLinksApiService, private dialogRef: MatDialogRef, private dialog: MatDialog, - private nodesApiService: NodesApiService, private contentService: ContentService, private renditionService: RenditionService, @Inject(MAT_DIALOG_DATA) public data: ContentNodeShareSettings @@ -99,7 +104,14 @@ export class ShareDialogComponent implements OnInit, OnDestroy { } else { this.sharedId = properties['qshare:sharedId']; this.isFileShared = true; - this.updateForm(); + + const expiryDate = this.updateForm(); + if (expiryDate) { + this.time.enable(); + this.linkWithExpirySettings = true; + } else { + this.time.disable(); + } } } @@ -109,12 +121,13 @@ export class ShareDialogComponent implements OnInit, OnDestroy { takeUntil(this.onDestroy$) ) .subscribe(value => this.onTimeChanged(value)); + } onTimeChanged(date: moment.Moment) { - this.updateNode(date).subscribe( - () => this.updateEntryExpiryDate(date) - ); + // eslint-disable-next-line no-console + console.log('Time change'); + this.updateNode(date); } get time(): AbstractControl { @@ -185,7 +198,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy { }); } - private createSharedLinks(nodeId: string) { + private createSharedLinks(nodeId: string | NodeOptions) { this.isDisabled = true; this.sharedLinksApiService.createSharedLinks(nodeId).subscribe( @@ -255,36 +268,60 @@ export class ShareDialogComponent implements OnInit, OnDestroy { }); } - private updateForm() { + private updateForm(): string { const {entry} = this.data.node; - let expiryDate = null; + this.expiryDate = null; if (entry && entry.properties) { - expiryDate = entry.properties['qshare:expiryDate']; + this.expiryDate = entry.properties['qshare:expiryDate']; } this.form.setValue({ sharedUrl: `${this.baseShareUrl}${this.sharedId}`, - time: expiryDate ? moment(expiryDate).local() : null - }); + time: this.expiryDate ? moment(this.expiryDate).local() : null + }, { emitEvent: false }); - if (expiryDate) { - this.time.enable(); - } else { - this.time.disable(); + return this.expiryDate; + } + + private updateNode(date: moment.Moment) { + + const expiryDate = date + ? (this.type === 'date' ? date.endOf('day').utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ') + : date.utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ')) + : null; + + if (expiryDate !== null && this.sharedId) { + this.isDisabled = true; + + this.sharedLinksApiService + .deleteSharedLink(this.sharedId) + .subscribe((response: any) => { + if (response instanceof Error) { + this.isDisabled = false; + this.isFileShared = true; + this.handleError(response); + } else { + this.sharedLinkWithExpirySettings(expiryDate); + this.updateEntryExpiryDate(date); + this.linkWithExpirySettings = true; + } + }); } } - private updateNode(date: moment.Moment): Observable { - const expiryDate = date - ? (this.type === 'date' ? date.endOf('day').utc().format() : date.utc().format()) - : null; + private sharedLinkWithExpirySettings(expiryDate: string) { + + const lastIndex = expiryDate?.lastIndexOf(':'); + expiryDate = expiryDate?.substring(0, lastIndex) + expiryDate?.substring(lastIndex + 1, expiryDate?.length); + + const nodeObject = { + nodeId: this.data.node.entry.id, + expiresAt: expiryDate + }; + + this.createSharedLinks(nodeObject); - return this.nodesApiService.updateNode(this.data.node.entry.id, { - properties: { - 'qshare:expiryDate': expiryDate - } - }); } private updateEntryExpiryDate(date: moment.Moment) { diff --git a/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts b/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts index 8663b15263..e37ad9ad2a 100644 --- a/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts +++ b/lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts @@ -21,6 +21,10 @@ import { Observable, from, of, Subject } from 'rxjs'; import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core'; import { catchError } from 'rxjs/operators'; +interface NodeOptions { + nodeId: string; + expiresAt?: string; +} @Injectable({ providedIn: 'root' }) @@ -65,8 +69,14 @@ export class SharedLinksApiService { * @param options Options supported by JS-API * @returns The shared link just created */ - createSharedLinks(nodeId: string, options: any = {}): Observable { - const promise = this.sharedLinksApi.createSharedLink({ nodeId }, options); + createSharedLinks(nodeId: string | NodeOptions, options: any = {}): Observable { + let nodeOptions; + if (typeof nodeId === 'string') { + nodeOptions = { nodeId }; + } else { + nodeOptions = nodeId; + } + const promise = this.sharedLinksApi.createSharedLink( nodeOptions , options); return from(promise).pipe( catchError((err) => of(err)) diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json index 7a764bc6d1..fb6e1daa81 100644 --- a/lib/content-services/src/lib/i18n/en.json +++ b/lib/content-services/src/lib/i18n/en.json @@ -456,7 +456,12 @@ "DIALOG-TITLE": "Share", "DESCRIPTION": "Click the link below to copy it to the clipboard.", "TITLE": "Link to share", + "SHARE-LINK": "Share Link", + "SHARABLE-LINK-CREATED": "Sharable Link is Created", + "PUBLIC-CONTENT": "This content is publicly available to anyone with this link", + "LINK-WITH-EXPIRY-SETTINGS": "New link has been generated with expiry settings", "EXPIRES": "Expires on", + "LINK-EXPIRY-DATE": "Link Expiry Date", "EXPIRATION-LABEL" : "Expiration Date", "CLIPBOARD-MESSAGE": "Link copied to the clipboard", "CLOSE": "Close", diff --git a/lib/content-services/src/lib/search/services/search-facet-filters.service.ts b/lib/content-services/src/lib/search/services/search-facet-filters.service.ts index 56b965f0c4..55c3581fee 100644 --- a/lib/content-services/src/lib/search/services/search-facet-filters.service.ts +++ b/lib/content-services/src/lib/search/services/search-facet-filters.service.ts @@ -351,7 +351,7 @@ export class SearchFacetFiltersService implements OnDestroy { category => { const nextAfterGeneralPathPartIndex = 3; const pathSeparator = '/'; - const path = category.entry.path.split(pathSeparator).slice(nextAfterGeneralPathPartIndex).join('/'); + const path = 'category.entry.path'.split(pathSeparator).slice(nextAfterGeneralPathPartIndex).join('/'); item.display = path ? `${path}/${category.entry.name}` : category.entry.name; } );