inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-3670] Inconsistent empty role value between library views (#1528)

Browse Source 
* [ACA-3613] Inconsistent role value between library views

* * upgrade alpha

* fix ut
This commit is contained in:
dhrn
2020-07-15 14:21:09 +05:30
committed by GitHub
parent ddc6f36ab4
commit f35095a75b
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/suites/actions/library-actions.test.ts
View File

@@ -129,7 +129,7 @@ describe('Library actions', () => {
await dataTable.selectItem(sitePublic1Admin); await dataTable.selectItem(sitePublic1Admin);
await toolbar.joinButton.click(); await toolbar.joinButton.click();
expect(await dataTable.getLibraryRole(sitePublic1Admin)).toEqual('Consumer'); expect(await dataTable.getLibraryRole(sitePublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL);
}); });
it('[C306959] from Search Results', async () => { it('[C306959] from Search Results', async () => {
@@ -141,7 +141,7 @@ describe('Library actions', () => {
await dataTable.selectItem(siteSearchPublic1Admin); await dataTable.selectItem(siteSearchPublic1Admin);
await toolbar.joinButton.click(); await toolbar.joinButton.click();
expect(await dataTable.getLibraryRole(siteSearchPublic1Admin)).toEqual('Consumer'); expect(await dataTable.getLibraryRole(siteSearchPublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL);
}); });
}); });
@@ -158,7 +158,7 @@ describe('Library actions', () => {
await dataTable.selectItem(siteModerated1Admin); await dataTable.selectItem(siteModerated1Admin);
await toolbar.joinButton.click(); await toolbar.joinButton.click();
expect(await dataTable.getLibraryRole(siteModerated1Admin)).toEqual(''); expect(await dataTable.getLibraryRole(siteModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL);
const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteModerated1Admin); const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteModerated1Admin);
expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteModerated1Admin}`); expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteModerated1Admin}`);
}); });
@@ -172,7 +172,7 @@ describe('Library actions', () => {
await dataTable.selectItem(siteSearchModerated1Admin); await dataTable.selectItem(siteSearchModerated1Admin);
await toolbar.joinButton.click(); await toolbar.joinButton.click();
expect(await dataTable.getLibraryRole(siteSearchModerated1Admin)).toEqual(''); expect(await dataTable.getLibraryRole(siteSearchModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL);
const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteSearchModerated1Admin); const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteSearchModerated1Admin);
expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteSearchModerated1Admin}`); expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteSearchModerated1Admin}`);
}); });

18
package-lock.json generated
View File

@@ -29,25 +29,25 @@
} }
}, },
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz",
"integrity": "sha512-cdITEG6B7FdLftGTQD61zst968usJzRQSq6+6ReKrskqB350brO5IwPYk/f41spiHDl52BzJa/jBKDqvZZkiuw==", "integrity": "sha512-SgsO0c8Dyv5q2EnEaT0lP7C1om8fNrzfyuYzXs0RhqHwfhJTVSXqnHDCJZFMa2IuStmi+aAwMLy3/m9IdepFbg==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz",
"integrity": "sha512-Ds1SVSo5ZE6AF7Q4Y40k+NSOdQdp5JHV7e4IB0lYl2NQuSSLK+DYhmg9hsxRPiDo4+ro93IHtCSKY4Ys14uv4A==", "integrity": "sha512-JxcwtzIoDgyPanUZLVfK3AYVyf+axOl7467ExfGLCHUGIwGmOFmxvdl3ktjULosLZx7u1O2X2cKucvyZtyGopw==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz",
"integrity": "sha512-7gJWTGCUAlXW2z4QYyRcXL0dEpZzqrHTT4a7JF1MxYVRyOmIpX+cqq9Q13hVFLQ2c5yLhH5Zt9X2m4stSiaudA==", "integrity": "sha512-MELz6zyCH74q9TUlmA+jjwGjLT71dS8wqkL6bhojUpISPU1BsZ9oyQeM+HWaDgVwS9iXzJ7+cHOMrtgD8g3j7A==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }

6
package.json
View File

@@ -32,9 +32,9 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "@alfresco/adf-content-services": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"@alfresco/adf-core": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "@alfresco/adf-core": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"@alfresco/adf-extensions": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", "@alfresco/adf-extensions": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
"@alfresco/js-api": "3.10.0-1deb4e85760f96f550a7d6d894e4002ecd4a4c18", "@alfresco/js-api": "3.10.0-1deb4e85760f96f550a7d6d894e4002ecd4a4c18",
"@angular-custom-builders/lite-serve": "0.2.0", "@angular-custom-builders/lite-serve": "0.2.0",
"@angular/animations": "10.0.3", "@angular/animations": "10.0.3",

3
projects/aca-testing-shared/src/configs.ts
View File

@@ -93,6 +93,9 @@ export const SITE_ROLES = {
SITE_MANAGER: { SITE_MANAGER: {
ROLE: 'SiteManager', ROLE: 'SiteManager',
LABEL: 'Manager' LABEL: 'Manager'
},
NONE: {
LABEL: 'Not a member'
} }
}; };

5
src/app/services/node-actions.service.spec.ts
View File

@@ -1015,7 +1015,7 @@ describe('NodeActionsService', () => {
}); });
})); }));
it('should take no extra delete action, if its children were partially moved', async(() => { it('should take no extra delete action, if its children were partially moved', (done) => {
const movedChildrenNodes = [fileToMove, folderToMove]; const movedChildrenNodes = [fileToMove, folderToMove];
spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes)); spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes));
spyOn(service, 'processResponse').and.returnValue({ spyOn(service, 'processResponse').and.returnValue({
@@ -1040,8 +1040,9 @@ describe('NodeActionsService', () => {
expect(spyOnSuccess).toHaveBeenCalled(); expect(spyOnSuccess).toHaveBeenCalled();
expect(spyOnError).not.toHaveBeenCalled(); expect(spyOnError).not.toHaveBeenCalled();
done();
});
}); });
}));
it('should take extra delete action, if children successfully moved and folder is still on location', async(() => { it('should take extra delete action, if children successfully moved and folder is still on location', async(() => {
const movedChildrenNodes = [fileToMove, folderToMove]; const movedChildrenNodes = [fileToMove, folderToMove];