inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5876] Change from moment to date-fns for lock.service. (#8862)

Browse Source 
* [ACS-5876] Change from moment to date-fns for lock.service.

* [ACS-5876] Unit test update.
This commit is contained in:
Aayush Rohila
2023-08-31 21:21:50 +05:30
committed by GitHub
parent c83d92c539
commit c6fdbd601a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/content-services/src/lib/document-list/services/lock.service.spec.ts
View File

@@ -19,8 +19,8 @@ import { TestBed } from '@angular/core/testing';
import { LockService } from './lock.service'; import { LockService } from './lock.service';
import { CoreTestingModule, AlfrescoApiService } from '@alfresco/adf-core'; import { CoreTestingModule, AlfrescoApiService } from '@alfresco/adf-core';
import { Node } from '@alfresco/js-api'; import { Node } from '@alfresco/js-api';
import moment from 'moment';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { addDays, subDays } from 'date-fns';
describe('PeopleProcessService', () => { describe('PeopleProcessService', () => {
@@ -75,7 +75,7 @@ describe('PeopleProcessService', () => {
'cm:lockType': 'WRITE_LOCK', 'cm:lockType': 'WRITE_LOCK',
'cm:lockLifetime': 'PERSISTENT', 'cm:lockLifetime': 'PERSISTENT',
'cm:lockOwner': { id: 'lock-owner-user' }, 'cm:lockOwner': { id: 'lock-owner-user' },
'cm:expiryDate': moment().subtract(4, 'days') 'cm:expiryDate': subDays(new Date(), 4)
} }
} as Node; } as Node;
@@ -88,7 +88,7 @@ describe('PeopleProcessService', () => {
'cm:lockType': 'WRITE_LOCK', 'cm:lockType': 'WRITE_LOCK',
'cm:lockLifetime': 'PERSISTENT', 'cm:lockLifetime': 'PERSISTENT',
'cm:lockOwner': { id: 'lock-owner-user' }, 'cm:lockOwner': { id: 'lock-owner-user' },
'cm:expiryDate': moment().add(4, 'days') 'cm:expiryDate': addDays(new Date(), 4)
} }
} as Node; } as Node;
@@ -127,7 +127,7 @@ describe('PeopleProcessService', () => {
'cm:lockType': 'WRITE_LOCK', 'cm:lockType': 'WRITE_LOCK',
'cm:lockLifetime': 'PERSISTENT', 'cm:lockLifetime': 'PERSISTENT',
'cm:lockOwner': { id: 'lock-owner-user' }, 'cm:lockOwner': { id: 'lock-owner-user' },
'cm:expiryDate': moment().subtract(4, 'days') 'cm:expiryDate': subDays(new Date(), 4)
} }
} as Node; } as Node;
@@ -140,7 +140,7 @@ describe('PeopleProcessService', () => {
'cm:lockType': 'WRITE_LOCK', 'cm:lockType': 'WRITE_LOCK',
'cm:lockLifetime': 'PERSISTENT', 'cm:lockLifetime': 'PERSISTENT',
'cm:lockOwner': { id: 'lock-owner-user' }, 'cm:lockOwner': { id: 'lock-owner-user' },
'cm:expiryDate': moment().add(4, 'days') 'cm:expiryDate': addDays(new Date(), 4)
} }
} as Node; } as Node;

8
lib/content-services/src/lib/document-list/services/lock.service.ts
View File

@@ -18,7 +18,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Node } from '@alfresco/js-api'; import { Node } from '@alfresco/js-api';
import { AuthenticationService } from '@alfresco/adf-core'; import { AuthenticationService } from '@alfresco/adf-core';
import moment, { Moment } from 'moment'; import { isAfter } from 'date-fns';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -55,9 +55,9 @@ export class LockService {
return node.properties['cm:lockType'] === 'WRITE_LOCK' && node.properties['cm:lockLifetime'] === 'PERSISTENT'; return node.properties['cm:lockType'] === 'WRITE_LOCK' && node.properties['cm:lockLifetime'] === 'PERSISTENT';
} }
private getLockExpiryTime(node: Node): Moment | undefined { private getLockExpiryTime(node: Node): Date | undefined {
if (node.properties['cm:expiryDate']) { if (node.properties['cm:expiryDate']) {
return moment(node.properties['cm:expiryDate'], 'yyyy-MM-ddThh:mm:ssZ'); return new Date(node.properties['cm:expiryDate']);
} }
return undefined; return undefined;
} }
@@ -65,7 +65,7 @@ export class LockService {
private isLockExpired(node: Node): boolean { private isLockExpired(node: Node): boolean {
const expiryLockTime = this.getLockExpiryTime(node); const expiryLockTime = this.getLockExpiryTime(node);
if (expiryLockTime) { if (expiryLockTime) {
return moment().isAfter(expiryLockTime); return isAfter(new Date(), expiryLockTime);
} }
return false; return false;
} }