inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

review comments for date-fns addressed

Browse Source
This commit is contained in:
Jatin_Chugh
2023-06-07 10:45:59 +05:30
parent 2b32ba08b3
commit 642af1f488
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
+10 -11
View File
@@ -38,9 +38,7 @@ import { ConfirmDialogComponent } from '../dialogs/confirm.dialog';
import { ContentNodeShareSettings } from './content-node-share.settings'; import { ContentNodeShareSettings } from './content-node-share.settings';
import { takeUntil, debounceTime } from 'rxjs/operators'; import { takeUntil, debounceTime } from 'rxjs/operators';
import { RenditionService } from '../common/services/rendition.service'; import { RenditionService } from '../common/services/rendition.service';
import { format } from 'date-fns'; import { format, add, endOfDay } from 'date-fns';
import add from 'date-fns/add';
import endOfDay from 'date-fns/endOfDay';
type DatePickerType = 'date' | 'time' | 'month' | 'datetime'; type DatePickerType = 'date' | 'time' | 'month' | 'datetime';
@@ -117,7 +115,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
.subscribe(value => this.onTimeChanged(value)); .subscribe(value => this.onTimeChanged(value));
} }
onTimeChanged(date: Date | string) { onTimeChanged(date: Date) {
this.updateNode(date); this.updateNode(date);
} }
@@ -160,6 +158,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
} }
onDatetimepickerClosed() { onDatetimepickerClosed() {
this.dateTimePickerInput.nativeElement.blur();
if (!this.time.value) { if (!this.time.value) {
this.slideToggleExpirationDate.checked = false; this.slideToggleExpirationDate.checked = false;
} }
@@ -189,10 +188,10 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
}); });
} }
private createSharedLinks(sharedLinkParams: string | SharedLinkBodyCreate) { private createSharedLinks(nodeId: string, sharedLinkWithExpirySettings?: SharedLinkBodyCreate) {
this.isDisabled = true; this.isDisabled = true;
this.sharedLinksApiService.createSharedLinks(sharedLinkParams).subscribe( this.sharedLinksApiService.createSharedLinks(nodeId, sharedLinkWithExpirySettings).subscribe(
(sharedLink: SharedLinkEntry) => { (sharedLink: SharedLinkEntry) => {
if (sharedLink.entry) { if (sharedLink.entry) {
this.sharedId = sharedLink.entry.id; this.sharedId = sharedLink.entry.id;
@@ -281,7 +280,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
return expiryDate; return expiryDate;
} }
private updateNode(date: Date | string) { private updateNode(date: Date) {
let expiryDate: Date | string; let expiryDate: Date | string;
if (date) { if (date) {
if (this.type === 'date') { if (this.type === 'date') {
@@ -302,7 +301,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
this.isFileShared = true; this.isFileShared = true;
this.handleError(response); this.handleError(response);
} else { } else {
this.sharedLinkWithExpirySettings(expiryDate); this.sharedLinkWithExpirySettings(expiryDate as Date);
this.isLinkWithExpiryDate = true; this.isLinkWithExpiryDate = true;
this.updateEntryExpiryDate(date); this.updateEntryExpiryDate(date);
} }
@@ -310,15 +309,15 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
} }
} }
private sharedLinkWithExpirySettings(expiryDate: Date | string) { private sharedLinkWithExpirySettings(expiryDate: Date) {
const nodeObject: SharedLinkBodyCreate = { const nodeObject: SharedLinkBodyCreate = {
nodeId: this.data.node.entry.id, nodeId: this.data.node.entry.id,
expiresAt: expiryDate as Date expiresAt: expiryDate as Date
}; };
this.createSharedLinks(nodeObject); this.createSharedLinks(this.data.node.entry.id, nodeObject);
} }
private updateEntryExpiryDate(date: Date | string) { private updateEntryExpiryDate(date: Date) {
const {properties} = this.data.node.entry; const {properties} = this.data.node.entry;
if (properties) { if (properties) {
lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts
+3 -2
View File
@@ -62,11 +62,12 @@ export class SharedLinksApiService {
* Creates a shared link available to the current user. * Creates a shared link available to the current user.
* *
* @param nodeId ID of the node to link to * @param nodeId ID of the node to link to
* @param sharedLinkWithExpirySettings shared link with nodeId and expiryDate
* @param options Options supported by JS-API * @param options Options supported by JS-API
* @returns The shared link just created * @returns The shared link just created
*/ */
createSharedLinks(nodeId: string | SharedLinkBodyCreate, options: any = {}): Observable<SharedLinkEntry> { createSharedLinks(nodeId: string, sharedLinkWithExpirySettings?: SharedLinkBodyCreate, options: any = {}): Observable<SharedLinkEntry> {
const promise = this.sharedLinksApi.createSharedLink(typeof nodeId === 'string' ? { nodeId } : nodeId, options); const promise = this.sharedLinksApi.createSharedLink(sharedLinkWithExpirySettings? sharedLinkWithExpirySettings : { nodeId }, options);
return from(promise).pipe( return from(promise).pipe(
catchError((err) => of(err)) catchError((err) => of(err))