Skip to content

Commit

Permalink
[ACS-5281] Changed editable state of metadata content based on change…
Browse files Browse the repository at this point in the history
… o… (#3400)

* ACS-5281 Changed editable state of metadata content based on change of file lock state

* ACS-5281 Updated versions

* ACS-5281 Reverted change

* ACS-5281 Upgrade version

* ACS-5281 Small correction

* ACS-5281 Fixed e2e
  • Loading branch information
AleksanderSklorz authored Aug 27, 2023
1 parent bc9c581 commit aec6852
Show file tree
Hide file tree
Showing 45 changed files with 452 additions and 361 deletions.
3 changes: 1 addition & 2 deletions e2e/protractor/suites/info-drawer/comments.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/

import { AdminActions, UserActions, LoginPage, BrowsingPage, RepoClient, InfoDrawer, Utils } from '@alfresco/aca-testing-shared';
const moment = require('moment');
import { BrowserActions } from '@alfresco/adf-testing';

describe('Comments', () => {
Expand Down Expand Up @@ -215,7 +214,7 @@ describe('Comments', () => {
expect(await commentsTab.isCommentDisplayed()).toBe(true, `Comment is not displayed`);
expect(await commentsTab.getCommentText()).toBe(commentFile1Entry.content, 'Incorrect comment text');
expect(await commentsTab.getCommentUserName()).toBe(`${username} ${username}`, 'Incorrect comment user');
expect(await commentsTab.getCommentTime()).toBe(moment(commentFile1Entry.createdAt).fromNow(), 'Incorrect comment created time');
expect(await commentsTab.getCommentTime()).toBe('less than a minute ago', 'Incorrect comment created time');
expect(await commentsTab.isCommentUserAvatarDisplayed()).toBe(true, 'User avatar not displayed');
});
});
Expand Down
197 changes: 68 additions & 129 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "6.3.0-5833590093",
"@alfresco/adf-core": "6.3.0-5833590093",
"@alfresco/adf-extensions": "6.3.0-5833590093",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-5833590093",
"@alfresco/js-api": "6.3.0-1104",
"@alfresco/adf-content-services": "6.3.0-5977252204",
"@alfresco/adf-core": "6.3.0-5977252204",
"@alfresco/adf-extensions": "6.3.0-5977252204",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-5977252204",
"@alfresco/js-api": "6.3.0-1172",
"@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3",
"@angular/common": "14.1.3",
Expand Down Expand Up @@ -69,8 +69,8 @@
"zone.js": "0.11.8"
},
"devDependencies": {
"@alfresco/adf-cli": "6.3.0-5833590093",
"@alfresco/adf-testing": "6.3.0-5833590093",
"@alfresco/adf-cli": "6.3.0-5977252204",
"@alfresco/adf-testing": "6.3.0-5977252204",
"@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2",
Expand Down
4 changes: 2 additions & 2 deletions projects/aca-content/ms-office/src/actions/aos.actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
*/

import { Action } from '@ngrx/store';
import { MinimalNodeEntryEntity } from '@alfresco/js-api';
import { Node } from '@alfresco/js-api';

export const AOS_ACTION = 'AOS_ACTION';

export class AosAction implements Action {
readonly type = AOS_ACTION;
constructor(public payload: MinimalNodeEntryEntity) {}
constructor(public payload: Node) {}
}
Loading

0 comments on commit aec6852

Please sign in to comment.