inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Angular 6 (#556)

Browse Source 
* upgrade to angular 6 (with rxjs-compat)

* fix tests

* fix test scripts

* upgrade rxjs to 6.0

* remove rxjs-compat layer

* update unit tests

* restore tests

* context-menu transparent backdrop

* upgrade libs

* changed snackbar locator

* locator as class

* remove locator element reference

* snackbar locators

* wait for snackbar before executing the action button

* expect cdk-overlay before mat-menu-panel condition

* update libs
This commit is contained in:
Denys Vuika 2018-08-09 11:11:06 +01:00 committed by GitHub
parent 4668112871
commit f91608fe78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 3512 additions and 1976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
.angular-cli.json
View File

@ -1,97 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "alfresco-content-app"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon-96x96.png",
"app.config.json",
"versions.json",
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "./assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-core/bundles/assets",
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "./assets/"
},
{ "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "aca",
"styles": [
"./assets/fonts/material-icons/material-icons.css",
"./assets/fonts/muli/muli.css",
"styles.scss"
],
"scripts": [
"../node_modules/pdfjs-dist/build/pdf.js",
"../node_modules/pdfjs-dist/lib/shared/compatibility.js",
"../node_modules/pdfjs-dist/web/pdf_viewer.js",
"../node_modules/moment/min/moment.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
},
"stylePreprocessorOptions": {
"includePaths": [
"app/ui"
]
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "scss",
"component": {},
"serve": {
"proxyConfig": "proxy.conf.js",
"port": 4200,
"host": "0.0.0.0"
}
}
}

2
.circleci/config.yml
View File

@ -14,7 +14,7 @@ jobs:
key: alfresco-content-app-{{ .Branch }}-{{ checksum "package.json" }} key: alfresco-content-app-{{ .Branch }}-{{ checksum "package.json" }}
paths: paths:
- "node_modules" - "node_modules"
- run: xvfb-run -a npm run test:pr - run: xvfb-run -a npm run test:ci
lint: lint:
working_directory: ~/alfresco-content-app working_directory: ~/alfresco-content-app
docker: docker:

203
angular.json Normal file
View File

@ -0,0 +1,203 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"alfresco-content-app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"stylePreprocessorOptions": {
"includePaths": [
"src/app/ui"
]
},
"assets": [
"src/assets",
"src/favicon-96x96.png",
"src/app.config.json",
"src/versions.json",
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "/assets"
},
{
"glob": "pdf.worker.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
}
],
"styles": [
"src/assets/fonts/material-icons/material-icons.css",
"src/assets/fonts/muli/muli.css",
"src/styles.scss"
],
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/lib/shared/compatibility.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/moment/min/moment.min.js"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "alfresco-content-app:build",
"port": 4200,
"host": "0.0.0.0",
"proxyConfig": "proxy.conf.js"
},
"configurations": {
"production": {
"browserTarget": "alfresco-content-app:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "alfresco-content-app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"stylePreprocessorOptions": {
"includePaths": [
"src/app/ui"
]
},
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/lib/shared/compatibility.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/moment/min/moment.min.js"
],
"styles": [
"src/assets/fonts/material-icons/material-icons.css",
"src/assets/fonts/muli/muli.css",
"src/styles.scss"
],
"assets": [
"src/assets",
"src/favicon-96x96.png",
"src/app.config.json",
"src/versions.json",
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "/assets"
},
{
"glob": "pdf.worker.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"alfresco-content-app-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "alfresco-content-app:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "alfresco-content-app",
"schematics": {
"@schematics/angular:component": {
"prefix": "aca",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "aca"
}
}
}

4
e2e/components/menu/menu.ts
View File

@ -44,8 +44,8 @@ export class Menu extends Component {
} }
waitForMenuToOpen() { waitForMenuToOpen() {
return browser.wait(EC.presenceOf(browser.element(by.css('.mat-menu-panel'))), BROWSER_WAIT_TIMEOUT) return browser.wait(EC.presenceOf(browser.element(by.css('.cdk-overlay-backdrop'))), BROWSER_WAIT_TIMEOUT)
.then(() => browser.wait(EC.presenceOf(browser.element(by.css('.cdk-overlay-backdrop'))), BROWSER_WAIT_TIMEOUT)) .then(() => browser.wait(EC.presenceOf(browser.element(by.css('.mat-menu-panel'))), BROWSER_WAIT_TIMEOUT))
.then(() => browser.wait(EC.visibilityOf(this.items.get(0)), BROWSER_WAIT_TIMEOUT)); .then(() => browser.wait(EC.visibilityOf(this.items.get(0)), BROWSER_WAIT_TIMEOUT));
} }

15
e2e/pages/page.ts
View File

@ -34,9 +34,9 @@ export abstract class Page {
layout: by.css('app-layout'), layout: by.css('app-layout'),
overlay: by.css('.cdk-overlay-container'), overlay: by.css('.cdk-overlay-container'),
dialogContainer: by.css('.mat-dialog-container'), dialogContainer: by.css('.mat-dialog-container'),
snackBarContainer: '.cdk-overlay-pane snack-bar-container.mat-snack-bar-container', snackBarContainer: '.cdk-overlay-pane .mat-snack-bar-container',
snackBar: 'simple-snack-bar', snackBar: '.mat-simple-snackbar',
snackBarAction: 'button.mat-simple-snackbar-action' snackBarAction: '.mat-simple-snackbar-action button'
}; };
public app: ElementFinder = element(this.locators.app); public app: ElementFinder = element(this.locators.app);
@ -103,8 +103,11 @@ export abstract class Page {
} }
clickSnackBarAction() { clickSnackBarAction() {
return browser.executeScript(function (elem) { return this.waitForSnackBarToAppear()
elem.click(); .then(() => {
}, this.snackBarAction); return browser.executeScript(function (elem) {
elem.click();
}, this.snackBarAction);
});
} }
} }

10
karma.conf.js
View File

@ -4,13 +4,13 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular/cli'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
files: [ files: [
{ pattern: './node_modules/hammerjs/hammer.js', watched: false }, { pattern: './node_modules/hammerjs/hammer.js', watched: false },
@ -27,12 +27,10 @@ module.exports = function (config) {
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ], dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,

4029
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

73
package.json
View File

@ -12,8 +12,7 @@
"build:tomcat": "npm run server-versions && ng build --base-href ./", "build:tomcat": "npm run server-versions && ng build --base-href ./",
"build:electron": "npm run server-versions && ng build --output-path www --base-href ./", "build:electron": "npm run server-versions && ng build --output-path www --base-href ./",
"test": "ng test --code-coverage", "test": "ng test --code-coverage",
"test:pr": "ng test --single-run --no-progress", "test:ci": "ng test --code-coverage --watch=false && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage",
"test:ci": "ng test --code-coverage --single-run --no-progress && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage",
"lint": "ng lint", "lint": "ng lint",
"server-versions": "rimraf ./src/versions.json && npm list --depth=0 --json=true --prod=true > ./src/versions.json || exit 0", "server-versions": "rimraf ./src/versions.json && npm list --depth=0 --json=true --prod=true > ./src/versions.json || exit 0",
"_e2e": "ng e2e", "_e2e": "ng e2e",
@ -26,55 +25,57 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "2.5.0-8fc31b3394dff374bc3ee083b3a578b4fb208552", "@alfresco/adf-content-services": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
"@alfresco/adf-core": "2.5.0-8fc31b3394dff374bc3ee083b3a578b4fb208552", "@alfresco/adf-core": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
"@angular/animations": "5.1.1", "@angular/animations": "6.1.1",
"@angular/cdk": "5.0.1", "@angular/cdk": "^6.4.2",
"@angular/common": "5.1.1", "@angular/common": "6.1.1",
"@angular/compiler": "5.1.1", "@angular/compiler": "6.1.1",
"@angular/core": "5.1.1", "@angular/core": "6.1.1",
"@angular/flex-layout": "2.0.0-beta.12", "@angular/flex-layout": "^6.0.0-beta.17",
"@angular/forms": "5.1.1", "@angular/forms": "6.1.1",
"@angular/http": "5.1.1", "@angular/http": "6.1.1",
"@angular/material": "5.0.1", "@angular/material": "^6.4.2",
"@angular/material-moment-adapter": "5.0.1", "@angular/material-moment-adapter": "^6.4.2",
"@angular/platform-browser": "5.1.1", "@angular/platform-browser": "6.1.1",
"@angular/platform-browser-dynamic": "5.1.1", "@angular/platform-browser-dynamic": "6.1.1",
"@angular/router": "5.1.1", "@angular/router": "6.1.1",
"@mat-datetimepicker/core": "1.0.1", "@mat-datetimepicker/core": "^2.0.1",
"@mat-datetimepicker/moment": "1.0.1", "@mat-datetimepicker/moment": "^2.0.1",
"@ngrx/effects": "^5.2.0", "@ngrx/effects": "^6.1.0",
"@ngrx/router-store": "^5.2.0", "@ngrx/router-store": "^6.1.0",
"@ngrx/store": "^5.2.0", "@ngrx/store": "^6.1.0",
"@ngrx/store-devtools": "^5.2.0", "@ngrx/store-devtools": "^6.1.0",
"@ngx-translate/core": "9.1.1", "@ngx-translate/core": "^10.0.2",
"alfresco-js-api": "2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2", "alfresco-js-api": "2.5.0-b048ff2aad00611aac1c02af531549b60acc0e66",
"alfresco-js-api-node": "2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2", "core-js": "^2.5.7",
"core-js": "2.5.3",
"cspell": "^2.1.12",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"minimatch-browser": "^1.0.0",
"moment-es6": "1.0.0", "moment-es6": "1.0.0",
"pdfjs-dist": "2.0.303", "pdfjs-dist": "2.0.303",
"rxjs": "5.5.2", "rxjs": "^6.2.2",
"web-animations-js": "2.3.1", "web-animations-js": "2.3.1",
"zone.js": "0.8.20" "zone.js": "0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.7.3", "@angular-devkit/build-angular": "~0.7.0",
"@angular/compiler-cli": "5.1.1", "@angular/cli": "^6.1.2",
"@angular/language-service": "5.1.1", "@angular/compiler-cli": "6.1.1",
"@angular/language-service": "6.1.1",
"@types/jasmine": "^2.5.53", "@types/jasmine": "^2.5.53",
"@types/jasminewd2": "^2.0.2", "@types/jasminewd2": "^2.0.2",
"@types/node": "9.3.0", "@types/node": "9.3.0",
"@types/selenium-webdriver": "^3.0.8", "@types/selenium-webdriver": "^3.0.8",
"alfresco-js-api-node": "2.5.0-b048ff2aad00611aac1c02af531549b60acc0e66",
"codacy-coverage": "^2.0.3", "codacy-coverage": "^2.0.3",
"codelyzer": "^4.0.1", "codelyzer": "^4.4.3",
"cspell": "^3.1.3",
"jasmine-core": "~2.8.0", "jasmine-core": "~2.8.0",
"jasmine-reporters": "^2.2.1", "jasmine-reporters": "^2.2.1",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"jasmine2-protractor-utils": "^1.3.0", "jasmine2-protractor-utils": "^1.3.0",
"jasminewd2": "^2.2.0", "jasminewd2": "^2.2.0",
"karma": "2.0.2", "karma": "2.0.5",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-cli": "~1.0.1", "karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.2.1", "karma-coverage-istanbul-reporter": "^1.2.1",
@ -85,7 +86,7 @@
"rimraf": "2.6.2", "rimraf": "2.6.2",
"selenium-webdriver": "4.0.0-alpha.1", "selenium-webdriver": "4.0.0-alpha.1",
"ts-node": "~4.1.0", "ts-node": "~4.1.0",
"tslint": "~5.9.1", "tslint": "~5.11.0",
"typescript": "^2.9.2", "typescript": "^2.9.2",
"wait-on": "2.1.0" "wait-on": "2.1.0"
} }

3
src/app/app.component.ts
View File

@ -42,6 +42,7 @@ import {
SetInitialStateAction SetInitialStateAction
} from './store/actions'; } from './store/actions';
import { AppStore, AppState, INITIAL_APP_STATE } from './store/states/app.state'; import { AppStore, AppState, INITIAL_APP_STATE } from './store/states/app.state';
import { filter } from 'rxjs/operators';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -76,7 +77,7 @@ export class AppComponent implements OnInit {
const { router, pageTitle, route } = this; const { router, pageTitle, route } = this;
router.events router.events
.filter(event => event instanceof NavigationEnd) .pipe(filter(event => event instanceof NavigationEnd))
.subscribe(() => { .subscribe(() => {
let currentRoute = route.root; let currentRoute = route.root;

3
src/app/components/about/about.component.ts
View File

@ -28,6 +28,7 @@ import { HttpClient } from '@angular/common/http';
import { ObjectDataTableAdapter } from '@alfresco/adf-core'; import { ObjectDataTableAdapter } from '@alfresco/adf-core';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
import { RepositoryInfo } from 'alfresco-js-api'; import { RepositoryInfo } from 'alfresco-js-api';
import { map } from 'rxjs/operators';
@Component({ @Component({
selector: 'app-about', selector: 'app-about',
@ -49,7 +50,7 @@ export class AboutComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.contentApi.getRepositoryInformation() this.contentApi.getRepositoryInformation()
.map(node => node.entry.repository) .pipe(map(node => node.entry.repository))
.subscribe(repository => { .subscribe(repository => {
this.repository = repository; this.repository = repository;

2
src/app/components/context-menu/context-menu.component.ts
View File

@ -35,7 +35,7 @@ import { ExtensionService } from '../../extensions/extension.service';
import { AppStore, SelectionState } from '../../store/states'; import { AppStore, SelectionState } from '../../store/states';
import { appSelection } from '../../store/selectors/app.selectors'; import { appSelection } from '../../store/selectors/app.selectors';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Subject } from 'rxjs/Rx'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { ContextMenuOverlayRef } from './context-menu-overlay'; import { ContextMenuOverlayRef } from './context-menu-overlay';

1
src/app/components/context-menu/context-menu.directive.ts
View File

@ -60,6 +60,7 @@ export class ContextActionsDirective {
this.overlayRef = this.contextMenuService.open({ this.overlayRef = this.contextMenuService.open({
source: event, source: event,
hasBackdrop: true, hasBackdrop: true,
backdropClass: 'cdk-overlay-transparent-backdrop',
panelClass: 'cdk-overlay-pane', panelClass: 'cdk-overlay-pane',
}); });
} }

2
src/app/components/current-user/current-user.component.ts
View File

@ -25,7 +25,7 @@
import { Component, ViewEncapsulation } from '@angular/core'; import { Component, ViewEncapsulation } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs';
import { selectUser, appLanguagePicker } from '../../store/selectors/app.selectors'; import { selectUser, appLanguagePicker } from '../../store/selectors/app.selectors';
import { AppStore, ProfileState } from '../../store/states'; import { AppStore, ProfileState } from '../../store/states';

10
src/app/components/favorites/favorites.component.spec.ts
View File

@ -23,7 +23,6 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { Observable } from 'rxjs/Rx';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { TestBed, ComponentFixture } from '@angular/core/testing'; import { TestBed, ComponentFixture } from '@angular/core/testing';
@ -34,7 +33,7 @@ import {
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services'; import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service'; import { ContentManagementService } from '../../services/content-management.service';
import { of } from 'rxjs';
import { FavoritesComponent } from './favorites.component'; import { FavoritesComponent } from './favorites.component';
import { AppTestingModule } from '../../testing/app-testing.module'; import { AppTestingModule } from '../../testing/app-testing.module';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
@ -50,11 +49,6 @@ describe('FavoritesComponent', () => {
let page; let page;
let node; let node;
beforeAll(() => {
// testing only functional-wise not time-wise
Observable.prototype.debounceTime = function () { return this; };
});
beforeEach(() => { beforeEach(() => {
page = { page = {
list: { list: {
@ -138,7 +132,7 @@ describe('FavoritesComponent', () => {
describe('Node navigation', () => { describe('Node navigation', () => {
beforeEach(() => { beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node})); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node}));
spyOn(router, 'navigate'); spyOn(router, 'navigate');
fixture.detectChanges(); fixture.detectChanges();
}); });

3
src/app/components/favorites/favorites.component.ts
View File

@ -38,6 +38,7 @@ import { AppStore } from '../../store/states/app.state';
import { PageComponent } from '../page.component'; import { PageComponent } from '../page.component';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
import { ExtensionService } from '../../extensions/extension.service'; import { ExtensionService } from '../../extensions/extension.service';
import { map } from 'rxjs/operators';
@Component({ @Component({
templateUrl: './favorites.component.html' templateUrl: './favorites.component.html'
@ -90,7 +91,7 @@ export class FavoritesComponent extends PageComponent implements OnInit {
if (isFolder) { if (isFolder) {
this.contentApi this.contentApi
.getNode(id) .getNode(id)
.map(node => node.entry) .pipe(map(node => node.entry))
.subscribe(({ path }: MinimalNodeEntryEntity) => { .subscribe(({ path }: MinimalNodeEntryEntity) => {
const routeUrl = isSitePath(path) const routeUrl = isSitePath(path)
? '/libraries' ? '/libraries'

53
src/app/components/files/files.component.spec.ts
View File

@ -23,7 +23,6 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { Observable } from 'rxjs/Rx';
import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
@ -40,6 +39,7 @@ import { FilesComponent } from './files.component';
import { AppTestingModule } from '../../testing/app-testing.module'; import { AppTestingModule } from '../../testing/app-testing.module';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
import { ExperimentalDirective } from '../../directives/experimental.directive'; import { ExperimentalDirective } from '../../directives/experimental.directive';
import { of, throwError } from 'rxjs';
describe('FilesComponent', () => { describe('FilesComponent', () => {
let node; let node;
@ -51,11 +51,6 @@ describe('FilesComponent', () => {
let nodeActionsService: NodeActionsService; let nodeActionsService: NodeActionsService;
let contentApi: ContentApiService; let contentApi: ContentApiService;
beforeAll(() => {
// testing only functional-wise not time-wise
Observable.prototype.debounceTime = function () { return this; };
});
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ AppTestingModule ], imports: [ AppTestingModule ],
@ -73,7 +68,7 @@ describe('FilesComponent', () => {
providers: [ providers: [
{ provide: ActivatedRoute, useValue: { { provide: ActivatedRoute, useValue: {
snapshot: { data: { preferencePrefix: 'prefix' } }, snapshot: { data: { preferencePrefix: 'prefix' } },
params: Observable.of({ folderId: 'someId' }) params: of({ folderId: 'someId' })
} } } }
], ],
schemas: [ NO_ERRORS_SCHEMA ] schemas: [ NO_ERRORS_SCHEMA ]
@ -96,7 +91,7 @@ describe('FilesComponent', () => {
describe('Current page is valid', () => { describe('Current page is valid', () => {
it('should be a valid current page', fakeAsync(() => { it('should be a valid current page', fakeAsync(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.throw(null)); spyOn(contentApi, 'getNode').and.returnValue(throwError(null));
component.ngOnInit(); component.ngOnInit();
fixture.detectChanges(); fixture.detectChanges();
@ -106,7 +101,7 @@ describe('FilesComponent', () => {
})); }));
it('should set current page as invalid path', fakeAsync(() => { it('should set current page as invalid path', fakeAsync(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
component.ngOnInit(); component.ngOnInit();
tick(); tick();
@ -118,7 +113,7 @@ describe('FilesComponent', () => {
describe('OnInit', () => { describe('OnInit', () => {
it('should set current node', () => { it('should set current node', () => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
fixture.detectChanges(); fixture.detectChanges();
expect(component.node).toBe(node); expect(component.node).toBe(node);
}); });
@ -126,7 +121,7 @@ describe('FilesComponent', () => {
it('if should navigate to parent if node is not a folder', () => { it('if should navigate to parent if node is not a folder', () => {
node.isFolder = false; node.isFolder = false;
node.parentId = 'parent-id'; node.parentId = 'parent-id';
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(router, 'navigate'); spyOn(router, 'navigate');
fixture.detectChanges(); fixture.detectChanges();
@ -137,7 +132,7 @@ describe('FilesComponent', () => {
describe('refresh on events', () => { describe('refresh on events', () => {
beforeEach(() => { beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(component.documentList, 'reload'); spyOn(component.documentList, 'reload');
fixture.detectChanges(); fixture.detectChanges();
@ -199,47 +194,55 @@ describe('FilesComponent', () => {
expect(component.documentList.reload).toHaveBeenCalled(); expect(component.documentList.reload).toHaveBeenCalled();
}); });
it('should call refresh on fileUploadComplete event if parent node match', () => { it('should call refresh on fileUploadComplete event if parent node match', fakeAsync(() => {
const file = { file: { options: { parentId: 'parentId' } } }; const file = { file: { options: { parentId: 'parentId' } } };
component.node = { id: 'parentId' }; component.node = { id: 'parentId' };
uploadService.fileUploadComplete.next(<any>file); uploadService.fileUploadComplete.next(<any>file);
expect(component.documentList.reload).toHaveBeenCalled(); tick(500);
});
it('should not call refresh on fileUploadComplete event if parent mismatch', () => { expect(component.documentList.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadComplete event if parent mismatch', fakeAsync(() => {
const file = { file: { options: { parentId: 'otherId' } } }; const file = { file: { options: { parentId: 'otherId' } } };
component.node = { id: 'parentId' }; component.node = { id: 'parentId' };
uploadService.fileUploadComplete.next(<any>file); uploadService.fileUploadComplete.next(<any>file);
expect(component.documentList.reload).not.toHaveBeenCalled(); tick(500);
});
it('should call refresh on fileUploadDeleted event if parent node match', () => { expect(component.documentList.reload).not.toHaveBeenCalled();
}));
it('should call refresh on fileUploadDeleted event if parent node match', fakeAsync(() => {
const file = { file: { options: { parentId: 'parentId' } } }; const file = { file: { options: { parentId: 'parentId' } } };
component.node = { id: 'parentId' }; component.node = { id: 'parentId' };
uploadService.fileUploadDeleted.next(<any>file); uploadService.fileUploadDeleted.next(<any>file);
expect(component.documentList.reload).toHaveBeenCalled(); tick(500);
});
it('should not call refresh on fileUploadDeleted event if parent mismatch', () => { expect(component.documentList.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadDeleted event if parent mismatch', fakeAsync(() => {
const file: any = { file: { options: { parentId: 'otherId' } } }; const file: any = { file: { options: { parentId: 'otherId' } } };
component.node = { id: 'parentId' }; component.node = { id: 'parentId' };
uploadService.fileUploadDeleted.next(file); uploadService.fileUploadDeleted.next(file);
tick(500);
expect(component.documentList.reload).not.toHaveBeenCalled(); expect(component.documentList.reload).not.toHaveBeenCalled();
}); }));
}); });
describe('onBreadcrumbNavigate()', () => { describe('onBreadcrumbNavigate()', () => {
beforeEach(() => { beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
fixture.detectChanges(); fixture.detectChanges();
}); });
@ -255,7 +258,7 @@ describe('FilesComponent', () => {
describe('Node navigation', () => { describe('Node navigation', () => {
beforeEach(() => { beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: node })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(router, 'navigate'); spyOn(router, 'navigate');
fixture.detectChanges(); fixture.detectChanges();

5
src/app/components/files/files.component.ts
View File

@ -36,6 +36,7 @@ import { ContentApiService } from '../../services/content-api.service';
import { ExtensionService } from '../../extensions/extension.service'; import { ExtensionService } from '../../extensions/extension.service';
import { SetCurrentFolderAction } from '../../store/actions'; import { SetCurrentFolderAction } from '../../store/actions';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { debounceTime } from 'rxjs/operators';
@Component({ @Component({
templateUrl: './files.component.html' templateUrl: './files.component.html'
@ -96,8 +97,8 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
content.nodesDeleted.subscribe(() => this.documentList.reload()), content.nodesDeleted.subscribe(() => this.documentList.reload()),
content.nodesMoved.subscribe(() => this.documentList.reload()), content.nodesMoved.subscribe(() => this.documentList.reload()),
content.nodesRestored.subscribe(() => this.documentList.reload()), content.nodesRestored.subscribe(() => this.documentList.reload()),
uploadService.fileUploadComplete.debounceTime(300).subscribe(file => this.onFileUploadedEvent(file)), uploadService.fileUploadComplete.pipe(debounceTime(300)).subscribe(file => this.onFileUploadedEvent(file)),
uploadService.fileUploadDeleted.debounceTime(300).subscribe((file) => this.onFileUploadedEvent(file)), uploadService.fileUploadDeleted.pipe(debounceTime(300)).subscribe((file) => this.onFileUploadedEvent(file)),
this.breakpointObserver this.breakpointObserver
.observe([ .observe([

2
src/app/components/layout/layout.component.ts
View File

@ -30,7 +30,7 @@ import {
ViewChild, ViewChild,
ViewEncapsulation ViewEncapsulation
} from '@angular/core'; } from '@angular/core';
import { Observable, Subject } from 'rxjs/Rx'; import { Observable, Subject } from 'rxjs';
import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { NodePermissionService } from '../../services/node-permission.service'; import { NodePermissionService } from '../../services/node-permission.service';
import { SidenavViewsManagerDirective } from './sidenav-views-manager.directive'; import { SidenavViewsManagerDirective } from './sidenav-views-manager.directive';

53
src/app/components/layout/sidenav-views-manager.directive.ts
View File

@ -1,13 +1,17 @@
import { Directive, ContentChild } from '@angular/core'; import { Directive, ContentChild } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router'; import { Router, NavigationEnd } from '@angular/router';
import { UserPreferencesService, AppConfigService, SidenavLayoutComponent } from '@alfresco/adf-core'; import {
UserPreferencesService,
AppConfigService,
SidenavLayoutComponent
} from '@alfresco/adf-core';
import { filter } from 'rxjs/operators';
@Directive({ @Directive({
selector: '[acaSidenavManager]', selector: '[acaSidenavManager]',
exportAs: 'acaSidenavManager' exportAs: 'acaSidenavManager'
}) })
export class SidenavViewsManagerDirective { export class SidenavViewsManagerDirective {
@ContentChild(SidenavLayoutComponent) sidenavLayout: SidenavLayoutComponent; @ContentChild(SidenavLayoutComponent) sidenavLayout: SidenavLayoutComponent;
minimizeSidenav = false; minimizeSidenav = false;
@ -23,19 +27,22 @@ export class SidenavViewsManagerDirective {
private appConfigService: AppConfigService private appConfigService: AppConfigService
) { ) {
this.router.events this.router.events
.filter(event => event instanceof NavigationEnd) .pipe(filter(event => event instanceof NavigationEnd))
.subscribe( (event: any ) => { .subscribe((event: any) => {
this.minimizeSidenav = this.minimizeConditions.some(el => event.urlAfterRedirects.includes(el)); this.minimizeSidenav = this.minimizeConditions.some(el =>
this.hideSidenav = this.hideConditions.some(el => event.urlAfterRedirects.includes(el)); event.urlAfterRedirects.includes(el)
);
this.hideSidenav = this.hideConditions.some(el =>
event.urlAfterRedirects.includes(el)
);
if (this._run) { if (this._run) {
this.manageSidenavState(); this.manageSidenavState();
} }
}); });
} }
run (shouldRun) { run(shouldRun) {
this._run = shouldRun; this._run = shouldRun;
} }
@ -54,17 +61,31 @@ export class SidenavViewsManagerDirective {
} }
setState(state) { setState(state) {
if (!this.minimizeSidenav && this.appConfigService.get('sideNav.preserveState')) { if (
!this.minimizeSidenav &&
this.appConfigService.get('sideNav.preserveState')
) {
this.userPreferenceService.set('expandedSidenav', state); this.userPreferenceService.set('expandedSidenav', state);
} }
} }
get sidenavState(): boolean { get sidenavState(): boolean {
const expand = this.appConfigService.get<boolean>('sideNav.expandedSidenav', true); const expand = this.appConfigService.get<boolean>(
const preserveState = this.appConfigService.get<boolean>('sideNav.preserveState', true); 'sideNav.expandedSidenav',
true
);
const preserveState = this.appConfigService.get<boolean>(
'sideNav.preserveState',
true
);
if (preserveState) { if (preserveState) {
return (this.userPreferenceService.get('expandedSidenav', expand.toString()) === 'true'); return (
this.userPreferenceService.get(
'expandedSidenav',
expand.toString()
) === 'true'
);
} }
return expand; return expand;

4
src/app/components/libraries/libraries.component.spec.ts
View File

@ -24,7 +24,7 @@
*/ */
import { TestBed, ComponentFixture } from '@angular/core/testing'; import { TestBed, ComponentFixture } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx'; import { of } from 'rxjs';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { import {
@ -155,7 +155,7 @@ describe('LibrariesComponent', () => {
it('navigates to node id', () => { it('navigates to node id', () => {
const document = { id: 'documentId' }; const document = { id: 'documentId' };
spyOn(contentApi, 'getNode').and.returnValue(Observable.of({ entry: document })); spyOn(contentApi, 'getNode').and.returnValue(of({ entry: document }));
component.navigate(node.id); component.navigate(node.id);

3
src/app/components/libraries/libraries.component.ts
View File

@ -35,6 +35,7 @@ import { SiteEntry } from 'alfresco-js-api';
import { ContentManagementService } from '../../services/content-management.service'; import { ContentManagementService } from '../../services/content-management.service';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
import { ExtensionService } from '../../extensions/extension.service'; import { ExtensionService } from '../../extensions/extension.service';
import { map } from 'rxjs/operators';
@Component({ @Component({
templateUrl: './libraries.component.html' templateUrl: './libraries.component.html'
@ -106,7 +107,7 @@ export class LibrariesComponent extends PageComponent implements OnInit {
if (libraryId) { if (libraryId) {
this.contentApi this.contentApi
.getNode(libraryId, { relativePath: '/documentLibrary' }) .getNode(libraryId, { relativePath: '/documentLibrary' })
.map(node => node.entry) .pipe(map(node => node.entry))
.subscribe(documentLibrary => { .subscribe(documentLibrary => {
this.router.navigate([ './', documentLibrary.id ], { relativeTo: this.route }); this.router.navigate([ './', documentLibrary.id ], { relativeTo: this.route });
}); });

8
src/app/components/location-link/location-link.component.ts
View File

@ -25,7 +25,7 @@
import { Component, Input, ChangeDetectionStrategy, OnInit, ViewEncapsulation, HostListener } from '@angular/core'; import { Component, Input, ChangeDetectionStrategy, OnInit, ViewEncapsulation, HostListener } from '@angular/core';
import { PathInfo, MinimalNodeEntity } from 'alfresco-js-api'; import { PathInfo, MinimalNodeEntity } from 'alfresco-js-api';
import { Observable, BehaviorSubject } from 'rxjs/Rx'; import { Observable, BehaviorSubject, of } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../store/states/app.state'; import { AppStore } from '../../store/states/app.state';
@ -96,12 +96,12 @@ export class LocationLinkComponent implements OnInit {
// for admin users // for admin users
if (elements.length === 1 && elements[0] === 'Company Home') { if (elements.length === 1 && elements[0] === 'Company Home') {
return Observable.of('Personal Files'); return of('Personal Files');
} }
// for non-admin users // for non-admin users
if (elements.length === 3 && elements[0] === 'Company Home' && elements[1] === 'User Homes') { if (elements.length === 3 && elements[0] === 'Company Home' && elements[1] === 'User Homes') {
return Observable.of('Personal Files'); return of('Personal Files');
} }
const result = elements[elements.length - 1]; const result = elements[elements.length - 1];
@ -123,7 +123,7 @@ export class LocationLinkComponent implements OnInit {
}); });
} }
return Observable.of(result); return of(result);
} }
// todo: review once 5.2.3 is out // todo: review once 5.2.3 is out

3
src/app/components/page.component.ts
View File

@ -28,12 +28,11 @@ import { OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { Subject, Subscription } from 'rxjs/Rx'; import { Subject, Subscription , Observable } from 'rxjs';
import { SetSelectedNodesAction, ViewFileAction } from '../store/actions'; import { SetSelectedNodesAction, ViewFileAction } from '../store/actions';
import { appSelection, sharedUrl, currentFolder, infoDrawerOpened, documentDisplayMode } from '../store/selectors/app.selectors'; import { appSelection, sharedUrl, currentFolder, infoDrawerOpened, documentDisplayMode } from '../store/selectors/app.selectors';
import { AppStore } from '../store/states/app.state'; import { AppStore } from '../store/states/app.state';
import { SelectionState } from '../store/states/selection.state'; import { SelectionState } from '../store/states/selection.state';
import { Observable } from 'rxjs/Rx';
import { ExtensionService } from '../extensions/extension.service'; import { ExtensionService } from '../extensions/extension.service';
import { ContentManagementService } from '../services/content-management.service'; import { ContentManagementService } from '../services/content-management.service';
import { ContentActionRef } from '../extensions/action.extensions'; import { ContentActionRef } from '../extensions/action.extensions';

45
src/app/components/preview/preview.component.spec.ts
View File

@ -28,7 +28,7 @@ import { Router, ActivatedRoute } from '@angular/router';
import { TestBed, ComponentFixture } from '@angular/core/testing'; import { TestBed, ComponentFixture } from '@angular/core/testing';
import { UserPreferencesService, AppConfigPipe, NodeFavoriteDirective } from '@alfresco/adf-core'; import { UserPreferencesService, AppConfigPipe, NodeFavoriteDirective } from '@alfresco/adf-core';
import { PreviewComponent } from './preview.component'; import { PreviewComponent } from './preview.component';
import { Observable } from 'rxjs/Rx'; import { of, throwError } from 'rxjs';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { ExperimentalDirective } from '../../directives/experimental.directive'; import { ExperimentalDirective } from '../../directives/experimental.directive';
import { NodeEffects } from '../../store/effects/node.effects'; import { NodeEffects } from '../../store/effects/node.effects';
@ -281,7 +281,7 @@ describe('PreviewComponent', () => {
}); });
it('should display document upon init', () => { it('should display document upon init', () => {
route.params = Observable.of({ route.params = of({
folderId: 'folder1', folderId: 'folder1',
nodeId: 'node1' nodeId: 'node1'
}); });
@ -341,7 +341,7 @@ describe('PreviewComponent', () => {
it('should not display node when id is missing', async () => { it('should not display node when id is missing', async () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.of(null) of(null)
); );
await component.displayNode(null); await component.displayNode(null);
@ -353,7 +353,7 @@ describe('PreviewComponent', () => {
it('should navigate to original location if node not found', async () => { it('should navigate to original location if node not found', async () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.of(null) of(null)
); );
component.previewLocation = 'personal-files'; component.previewLocation = 'personal-files';
@ -366,7 +366,7 @@ describe('PreviewComponent', () => {
it('should navigate to original location if node is not a File', async () => { it('should navigate to original location if node is not a File', async () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.of({ of({
isFile: false isFile: false
}) })
); );
@ -381,7 +381,7 @@ describe('PreviewComponent', () => {
it('should navigate to original location in case of Alfresco API errors', async () => { it('should navigate to original location in case of Alfresco API errors', async () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.throw('error') throwError('error')
); );
component.previewLocation = 'personal-files'; component.previewLocation = 'personal-files';
@ -391,10 +391,11 @@ describe('PreviewComponent', () => {
expect(router.navigate).toHaveBeenCalledWith(['personal-files', 'folder1']); expect(router.navigate).toHaveBeenCalledWith(['personal-files', 'folder1']);
}); });
it('should navigate to original location in case of internal errors', async () => { // todo: Fix after Angular6 migration
xit('should navigate to original location in case of internal errors', async () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.of({ of({
isFile: true isFile: true
}) })
); );
@ -413,7 +414,7 @@ describe('PreviewComponent', () => {
spyOn(router, 'navigate').and.stub(); spyOn(router, 'navigate').and.stub();
spyOn(component, 'getNearestNodes').and.returnValue({ left: 'node1', right: 'node3' }); spyOn(component, 'getNearestNodes').and.returnValue({ left: 'node1', right: 'node3' });
spyOn(contentApi, 'getNodeInfo').and.returnValue( spyOn(contentApi, 'getNodeInfo').and.returnValue(
Observable.of({ of({
id: 'node2', id: 'node2',
parentId: 'parent1', parentId: 'parent1',
isFile: true isFile: true
@ -433,7 +434,7 @@ describe('PreviewComponent', () => {
preferences.set('personal-files.sorting.direction', 'desc'); preferences.set('personal-files.sorting.direction', 'desc');
spyOn(contentApi, 'getNodeChildren').and.returnValue( spyOn(contentApi, 'getNodeChildren').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node1', name: 'node 1' } }, { entry: { id: 'node1', name: 'node 1' } },
@ -452,7 +453,7 @@ describe('PreviewComponent', () => {
preferences.set('personal-files.sorting.direction', 'desc'); preferences.set('personal-files.sorting.direction', 'desc');
spyOn(contentApi, 'getNodeChildren').and.returnValue( spyOn(contentApi, 'getNodeChildren').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node1', name: 'node 1' } }, { entry: { id: 'node1', name: 'node 1' } },
@ -475,7 +476,7 @@ describe('PreviewComponent', () => {
spyOn(preferences, 'get').and.returnValue(null); spyOn(preferences, 'get').and.returnValue(null);
spyOn(contentApi, 'getNodeChildren').and.returnValue( spyOn(contentApi, 'getNodeChildren').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node1', name: 'node 1', modifiedAt: 1 } }, { entry: { id: 'node1', name: 'node 1', modifiedAt: 1 } },
@ -494,7 +495,7 @@ describe('PreviewComponent', () => {
preferences.set('personal-files.sorting.direction', 'desc'); preferences.set('personal-files.sorting.direction', 'desc');
spyOn(contentApi, 'getNodeChildren').and.returnValue( spyOn(contentApi, 'getNodeChildren').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node1', name: 'node 1' } }, { entry: { id: 'node1', name: 'node 1' } },
@ -517,7 +518,7 @@ describe('PreviewComponent', () => {
spyOn(preferences, 'get').and.returnValue(null); spyOn(preferences, 'get').and.returnValue(null);
spyOn(contentApi, 'getNodeChildren').and.returnValue( spyOn(contentApi, 'getNodeChildren').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node1', name: 'node 1', modifiedAt: new Date(1) } }, { entry: { id: 'node1', name: 'node 1', modifiedAt: new Date(1) } },
@ -536,7 +537,7 @@ describe('PreviewComponent', () => {
preferences.set('favorites.sorting.direction', 'desc'); preferences.set('favorites.sorting.direction', 'desc');
spyOn(contentApi, 'getFavorites').and.returnValue( spyOn(contentApi, 'getFavorites').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { target: { file: { id: 'file3', name: 'file 3' } } } }, { entry: { target: { file: { id: 'file3', name: 'file 3' } } } },
@ -555,7 +556,7 @@ describe('PreviewComponent', () => {
spyOn(preferences, 'get').and.returnValue(null); spyOn(preferences, 'get').and.returnValue(null);
spyOn(contentApi, 'getFavorites').and.returnValue( spyOn(contentApi, 'getFavorites').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { target: { file: { id: 'file3', modifiedAt: new Date(3) } } } }, { entry: { target: { file: { id: 'file3', modifiedAt: new Date(3) } } } },
@ -575,7 +576,7 @@ describe('PreviewComponent', () => {
preferences.set('shared.sorting.direction', 'asc'); preferences.set('shared.sorting.direction', 'asc');
spyOn(contentApi, 'findSharedLinks').and.returnValue( spyOn(contentApi, 'findSharedLinks').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { nodeId: 'node2', name: 'node 2', modifiedAt: new Date(2) } }, { entry: { nodeId: 'node2', name: 'node 2', modifiedAt: new Date(2) } },
@ -593,7 +594,7 @@ describe('PreviewComponent', () => {
spyOn(preferences, 'get').and.returnValue(null); spyOn(preferences, 'get').and.returnValue(null);
spyOn(contentApi, 'findSharedLinks').and.returnValue( spyOn(contentApi, 'findSharedLinks').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { nodeId: 'node2', name: 'node 2', modifiedAt: new Date(2) } }, { entry: { nodeId: 'node2', name: 'node 2', modifiedAt: new Date(2) } },
@ -612,13 +613,13 @@ describe('PreviewComponent', () => {
preferences.set('recent-files.sorting.direction', 'asc'); preferences.set('recent-files.sorting.direction', 'asc');
spyOn(contentApi, 'getPerson').and.returnValue( spyOn(contentApi, 'getPerson').and.returnValue(
Observable.of({ of({
entry: { id: 'user' } entry: { id: 'user' }
}) })
); );
spyOn(contentApi, 'search').and.returnValue( spyOn(contentApi, 'search').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node2', name: 'node 2', modifiedAt: new Date(2) } }, { entry: { id: 'node2', name: 'node 2', modifiedAt: new Date(2) } },
@ -636,13 +637,13 @@ describe('PreviewComponent', () => {
spyOn(preferences, 'get').and.returnValue(null); spyOn(preferences, 'get').and.returnValue(null);
spyOn(contentApi, 'getPerson').and.returnValue( spyOn(contentApi, 'getPerson').and.returnValue(
Observable.of({ of({
entry: { id: 'user' } entry: { id: 'user' }
}) })
); );
spyOn(contentApi, 'search').and.returnValue( spyOn(contentApi, 'search').and.returnValue(
Observable.of({ of({
list: { list: {
entries: [ entries: [
{ entry: { id: 'node2', name: 'node 2', modifiedAt: new Date(2) } }, { entry: { id: 'node2', name: 'node 2', modifiedAt: new Date(2) } },

16
src/app/components/search/search-input-control/search-input-control.component.ts
View File

@ -28,10 +28,9 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, import { Component, EventEmitter, Input, OnDestroy, OnInit, Output,
QueryList, ViewEncapsulation, ViewChild, ViewChildren, ElementRef, TemplateRef, ContentChild } from '@angular/core'; QueryList, ViewEncapsulation, ViewChild, ViewChildren, ElementRef, TemplateRef, ContentChild } from '@angular/core';
import { MinimalNodeEntity, QueryBody } from 'alfresco-js-api'; import { MinimalNodeEntity, QueryBody } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs';
import { Subject } from 'rxjs/Subject';
import { MatListItem } from '@angular/material'; import { MatListItem } from '@angular/material';
import { debounceTime } from 'rxjs/operators'; import { debounceTime, filter } from 'rxjs/operators';
import { EmptySearchResultComponent, SearchComponent } from '@alfresco/adf-content-services'; import { EmptySearchResultComponent, SearchComponent } from '@alfresco/adf-content-services';
@Component({ @Component({
@ -249,11 +248,12 @@ export class SearchInputControlComponent implements OnInit, OnDestroy {
} }
private setupFocusEventHandlers() { private setupFocusEventHandlers() {
const focusEvents: Observable<FocusEvent> = this.focusSubject.asObservable() this.focusSubject.pipe(
.debounceTime(50); debounceTime(50),
focusEvents.filter(($event: any) => { filter(($event: any) => {
return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout'); return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
}).subscribe(() => { })
).subscribe(() => {
this.toggleSearchBar(); this.toggleSearchBar();
}); });
} }

13
src/app/components/search/search-input/search-input.component.ts
View File

@ -33,6 +33,7 @@ import { SearchInputControlComponent } from '../search-input-control/search-inpu
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../../store/states/app.state'; import { AppStore } from '../../../store/states/app.state';
import { SearchByTermAction, NavigateToFolder, ViewFileAction } from '../../../store/actions'; import { SearchByTermAction, NavigateToFolder, ViewFileAction } from '../../../store/actions';
import { filter } from 'rxjs/operators';
@Component({ @Component({
selector: 'aca-search-input', selector: 'aca-search-input',
@ -55,11 +56,13 @@ export class SearchInputComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.showInputValue(); this.showInputValue();
this.router.events.filter(e => e instanceof RouterEvent).subscribe(event => { this.router.events
if (event instanceof NavigationEnd) { .pipe(filter(e => e instanceof RouterEvent))
this.showInputValue(); .subscribe(event => {
} if (event instanceof NavigationEnd) {
}); this.showInputValue();
}
});
} }
showInputValue() { showInputValue() {

2
src/app/components/settings/settings.component.ts
View File

@ -26,7 +26,7 @@
import { Component, ViewEncapsulation, OnInit } from '@angular/core'; import { Component, ViewEncapsulation, OnInit } from '@angular/core';
import { AppConfigService, StorageService, SettingsService } from '@alfresco/adf-core'; import { AppConfigService, StorageService, SettingsService } from '@alfresco/adf-core';
import { Validators, FormGroup, FormBuilder } from '@angular/forms'; import { Validators, FormGroup, FormBuilder } from '@angular/forms';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore, ProfileState } from '../../store/states'; import { AppStore, ProfileState } from '../../store/states';
import { appLanguagePicker, selectHeaderColor, selectAppName, selectUser } from '../../store/selectors/app.selectors'; import { appLanguagePicker, selectHeaderColor, selectAppName, selectUser } from '../../store/selectors/app.selectors';

2
src/app/components/sidenav/sidenav.component.ts
View File

@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { Subject } from 'rxjs/Rx'; import { Subject } from 'rxjs';
import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { Component, Input, OnInit, OnDestroy } from '@angular/core';
import { ExtensionService } from '../../extensions/extension.service'; import { ExtensionService } from '../../extensions/extension.service';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

2
src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
View File

@ -24,7 +24,7 @@
*/ */
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../../store/states'; import { AppStore } from '../../../store/states';
import { documentDisplayMode } from '../../../store/selectors/app.selectors'; import { documentDisplayMode } from '../../../store/selectors/app.selectors';

2
src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
View File

@ -27,7 +27,7 @@ import { Component } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore, SelectionState } from '../../../store/states'; import { AppStore, SelectionState } from '../../../store/states';
import { appSelection } from '../../../store/selectors/app.selectors'; import { appSelection } from '../../../store/selectors/app.selectors';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
@Component({ @Component({
selector: 'app-toggle-favorite', selector: 'app-toggle-favorite',

2
src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
View File

@ -24,7 +24,7 @@
*/ */
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../../store/states'; import { AppStore } from '../../../store/states';
import { infoDrawerOpened } from '../../../store/selectors/app.selectors'; import { infoDrawerOpened } from '../../../store/selectors/app.selectors';

2
src/app/components/trashcan/trashcan.component.ts
View File

@ -32,7 +32,7 @@ import { selectUser } from '../../store/selectors/app.selectors';
import { AppStore } from '../../store/states/app.state'; import { AppStore } from '../../store/states/app.state';
import { ProfileState } from '../../store/states/profile.state'; import { ProfileState } from '../../store/states/profile.state';
import { ExtensionService } from '../../extensions/extension.service'; import { ExtensionService } from '../../extensions/extension.service';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
@Component({ @Component({
templateUrl: './trashcan.component.html' templateUrl: './trashcan.component.html'

12
src/app/dialogs/library/library.dialog.html
View File

@ -4,7 +4,7 @@
<mat-dialog-content> <mat-dialog-content>
<form novalidate [formGroup]="form" (submit)="submit()"> <form novalidate [formGroup]="form" (submit)="submit()">
<mat-input-container> <mat-form-field>
<input <input
placeholder="{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}" placeholder="{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}"
required required
@ -15,9 +15,9 @@
<mat-error *ngIf="form.controls['title'].hasError('maxlength')"> <mat-error *ngIf="form.controls['title'].hasError('maxlength')">
{{ 'LIBRARY.ERRORS.DESCRIPTION_TOO_LONG' | translate }} {{ 'LIBRARY.ERRORS.DESCRIPTION_TOO_LONG' | translate }}
</mat-error> </mat-error>
</mat-input-container> </mat-form-field>
<mat-input-container> <mat-form-field>
<input <input
required required
placeholder="{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}" placeholder="{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}"
@ -32,9 +32,9 @@
<mat-error *ngIf="form.controls['id'].hasError('maxlength')"> <mat-error *ngIf="form.controls['id'].hasError('maxlength')">
{{ 'LIBRARY.ERRORS.ID_TOO_LONG' | translate }} {{ 'LIBRARY.ERRORS.ID_TOO_LONG' | translate }}
</mat-error> </mat-error>
</mat-input-container> </mat-form-field>
<mat-input-container> <mat-form-field>
<textarea <textarea
matInput matInput
placeholder="{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}" placeholder="{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}"
@ -44,7 +44,7 @@
<mat-error *ngIf="form.controls['description'].hasError('maxlength')"> <mat-error *ngIf="form.controls['description'].hasError('maxlength')">
{{ 'LIBRARY.ERRORS.DESCRIPTION_TOO_LONG' | translate }} {{ 'LIBRARY.ERRORS.DESCRIPTION_TOO_LONG' | translate }}
</mat-error> </mat-error>
</mat-input-container> </mat-form-field>
<mat-radio-group <mat-radio-group
[ngModelOptions]="{ standalone: true }" [ngModelOptions]="{ standalone: true }"

2
src/app/dialogs/library/library.dialog.scss
View File

@ -9,7 +9,7 @@
margin: 10px 0; margin: 10px 0;
} }
.mat-input-container { .mat-form-field {
width: 100%; width: 100%;
} }

5
src/app/dialogs/library/library.dialog.ts
View File

@ -15,13 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
import { Component, OnInit, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, Output, EventEmitter } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { MatDialogRef } from '@angular/material'; import { MatDialogRef } from '@angular/material';
import { SiteBody, SiteEntry } from 'alfresco-js-api'; import { SiteBody, SiteEntry } from 'alfresco-js-api';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
import { SiteIdValidator, forbidSpecialCharacters } from './form.validators'; import { SiteIdValidator, forbidSpecialCharacters } from './form.validators';
import { debounceTime } from 'rxjs/operators';
@Component({ @Component({
@ -67,7 +68,7 @@ export class LibraryDialogComponent implements OnInit {
this.visibilityOption = this.visibilityOptions[0].value; this.visibilityOption = this.visibilityOptions[0].value;
this.form.controls['title'].valueChanges this.form.controls['title'].valueChanges
.debounceTime(300) .pipe(debounceTime(300))
.subscribe((titleValue: string) => { .subscribe((titleValue: string) => {
if (!titleValue.trim().length) { if (!titleValue.trim().length) {
return; return;

2
src/app/directives/document-list.directive.ts
View File

@ -27,7 +27,7 @@ import { Directive, OnDestroy, OnInit, HostListener } from '@angular/core';
import { DocumentListComponent } from '@alfresco/adf-content-services'; import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { UserPreferencesService } from '@alfresco/adf-core'; import { UserPreferencesService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Rx'; import { Subscription } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../store/states/app.state'; import { AppStore } from '../store/states/app.state';
import { SetSelectedNodesAction } from '../store/actions'; import { SetSelectedNodesAction } from '../store/actions';

2
src/app/directives/pagination.directive.ts
View File

@ -30,7 +30,7 @@ import {
PaginationModel, PaginationModel,
AppConfigService AppConfigService
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Rx'; import { Subscription } from 'rxjs';
@Directive({ @Directive({
selector: '[acaPagination]' selector: '[acaPagination]'

3
src/app/extensions/components/toolbar/toolbar-button.component.ts
View File

@ -29,6 +29,7 @@ import { ExtensionService } from '../../extension.service';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../../../store/states'; import { AppStore } from '../../../store/states';
import { appSelection } from '../../../store/selectors/app.selectors'; import { appSelection } from '../../../store/selectors/app.selectors';
import { take } from 'rxjs/operators';
export enum ToolbarButtonType { export enum ToolbarButtonType {
ICON_BUTTON = 'icon-button', ICON_BUTTON = 'icon-button',
@ -80,7 +81,7 @@ export class ToolbarButtonComponent {
runAction() { runAction() {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
this.extensions.runActionById(this.actionRef.actions.click, { this.extensions.runActionById(this.actionRef.actions.click, {
selection selection

95
src/app/services/content-api.service.ts
View File

@ -25,7 +25,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core'; import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable'; import { Observable, from } from 'rxjs';
import { import {
MinimalNodeEntity, MinimalNodeEntity,
NodePaging, NodePaging,
@ -60,9 +60,7 @@ export class ContentApiService {
nodeId: string, nodeId: string,
options: { permanent?: boolean } = {} options: { permanent?: boolean } = {}
): Observable<void> { ): Observable<void> {
return Observable.fromPromise( return from(this.api.nodesApi.deleteNode(nodeId, options));
this.api.nodesApi.deleteNode(nodeId, options)
);
} }
/** /**
@ -82,9 +80,7 @@ export class ContentApiService {
}; };
const queryOptions = Object.assign(defaults, options); const queryOptions = Object.assign(defaults, options);
return Observable.fromPromise( return from(this.api.nodesApi.getNode(nodeId, queryOptions));
this.api.nodesApi.getNode(nodeId, queryOptions)
);
} }
getNodeInfo(nodeId: string, options: any = {}): Observable<Node> { getNodeInfo(nodeId: string, options: any = {}): Observable<Node> {
@ -93,9 +89,7 @@ export class ContentApiService {
}; };
const queryOptions = Object.assign(defaults, options); const queryOptions = Object.assign(defaults, options);
return Observable.fromPromise( return from(this.api.nodesApi.getNodeInfo(nodeId, queryOptions));
this.api.nodesApi.getNodeInfo(nodeId, queryOptions)
);
} }
/** /**
@ -118,15 +112,11 @@ export class ContentApiService {
}; };
const queryOptions = Object.assign(defaults, options); const queryOptions = Object.assign(defaults, options);
return Observable.fromPromise( return from(this.api.nodesApi.getNodeChildren(nodeId, queryOptions));
this.api.nodesApi.getNodeChildren(nodeId, queryOptions)
);
} }
deleteSharedLink(linkId: string): Observable<any> { deleteSharedLink(linkId: string): Observable<any> {
return Observable.fromPromise( return from(this.api.sharedLinksApi.deleteSharedLink(linkId));
this.api.sharedLinksApi.deleteSharedLink(linkId)
);
} }
getDeletedNodes(options: any = {}): Observable<DeletedNodesPaging> { getDeletedNodes(options: any = {}): Observable<DeletedNodesPaging> {
@ -135,19 +125,15 @@ export class ContentApiService {
}; };
const queryOptions = Object.assign(defaults, options); const queryOptions = Object.assign(defaults, options);
return Observable.fromPromise( return from(this.api.nodesApi.getDeletedNodes(queryOptions));
this.api.nodesApi.getDeletedNodes(queryOptions)
);
} }
restoreNode(nodeId: string): Observable<MinimalNodeEntity> { restoreNode(nodeId: string): Observable<MinimalNodeEntity> {
return Observable.fromPromise(this.api.nodesApi.restoreNode(nodeId)); return from(this.api.nodesApi.restoreNode(nodeId));
} }
purgeDeletedNode(nodeId: string): Observable<any> { purgeDeletedNode(nodeId: string): Observable<any> {
return Observable.fromPromise( return from(this.api.nodesApi.purgeDeletedNode(nodeId));
this.api.nodesApi.purgeDeletedNode(nodeId)
);
} }
/** /**
@ -159,9 +145,7 @@ export class ContentApiService {
personId: string, personId: string,
options?: { fields?: Array<string> } options?: { fields?: Array<string> }
): Observable<PersonEntry> { ): Observable<PersonEntry> {
return Observable.fromPromise( return from(this.api.peopleApi.getPerson(personId, options));
this.api.peopleApi.getPerson(personId, options)
);
} }
/** /**
@ -177,7 +161,7 @@ export class ContentApiService {
name?: string, name?: string,
opts?: { include?: Array<string>; fields?: Array<string> } opts?: { include?: Array<string>; fields?: Array<string> }
): Observable<NodeEntry> { ): Observable<NodeEntry> {
return Observable.fromPromise( return from(
this.api.nodesApi.copyNode(nodeId, { targetParentId, name }, opts) this.api.nodesApi.copyNode(nodeId, { targetParentId, name }, opts)
); );
} }
@ -187,7 +171,7 @@ export class ContentApiService {
* @returns ProductVersionModel containing product details * @returns ProductVersionModel containing product details
*/ */
getRepositoryInformation(): Observable<DiscoveryEntry> { getRepositoryInformation(): Observable<DiscoveryEntry> {
return Observable.fromPromise( return from(
this.api this.api
.getInstance() .getInstance()
.discovery.discoveryApi.getRepositoryInformation() .discovery.discoveryApi.getRepositoryInformation()
@ -203,45 +187,44 @@ export class ContentApiService {
fields?: Array<string>; fields?: Array<string>;
} }
): Observable<FavoritePaging> { ): Observable<FavoritePaging> {
return Observable.fromPromise( return from(this.api.favoritesApi.getFavorites(personId, opts));
this.api.favoritesApi.getFavorites(personId, opts)
);
} }
findSharedLinks(opts?: any): Observable<SharedLinkPaging> { findSharedLinks(opts?: any): Observable<SharedLinkPaging> {
return Observable.fromPromise( return from(this.api.sharedLinksApi.findSharedLinks(opts));
this.api.sharedLinksApi.findSharedLinks(opts)
);
} }
search(request: SearchRequest): Observable<ResultSetPaging> { search(request: SearchRequest): Observable<ResultSetPaging> {
return Observable.fromPromise( return from(this.api.searchApi.search(request));
this.api.searchApi.search(request)
);
} }
getContentUrl(nodeId: string, attachment?: boolean): string { getContentUrl(nodeId: string, attachment?: boolean): string {
return this.api.contentApi.getContentUrl(nodeId, attachment); return this.api.contentApi.getContentUrl(nodeId, attachment);
} }
deleteSite(siteId?: string, opts?: { permanent?: boolean }): Observable<any> { deleteSite(
return Observable.fromPromise( siteId?: string,
this.api.sitesApi.deleteSite(siteId, opts) opts?: { permanent?: boolean }
); ): Observable<any> {
return from(this.api.sitesApi.deleteSite(siteId, opts));
} }
createSite( createSite(
siteBody: SiteBody, siteBody: SiteBody,
opts?: {fields?: Array<string>, skipConfiguration?: boolean, skipAddToFavorites?: boolean}): Observable<SiteEntry> { opts?: {
return Observable.fromPromise( fields?: Array<string>;
this.api.sitesApi.createSite(siteBody, opts) skipConfiguration?: boolean;
); skipAddToFavorites?: boolean;
}
): Observable<SiteEntry> {
return from(this.api.sitesApi.createSite(siteBody, opts));
} }
getSite(siteId?: string, opts?: { relations?: Array<string>, fields?: Array<string> }): Observable<SiteEntry> { getSite(
return Observable.fromPromise( siteId?: string,
this.api.sitesApi.getSite(siteId, opts) opts?: { relations?: Array<string>; fields?: Array<string> }
); ): Observable<SiteEntry> {
return from(this.api.sitesApi.getSite(siteId, opts));
} }
addFavorite(nodes: Array<MinimalNodeEntity>): Observable<any> { addFavorite(nodes: Array<MinimalNodeEntity>): Observable<any> {
@ -260,13 +243,17 @@ export class ContentApiService {
}; };
}); });
return Observable.from(this.api.favoritesApi.addFavorite('-me-', <any>payload)); return from(this.api.favoritesApi.addFavorite('-me-', <any>payload));
} }
removeFavorite(nodes: Array<MinimalNodeEntity>): Observable<any> { removeFavorite(nodes: Array<MinimalNodeEntity>): Observable<any> {
return Observable.from(Promise.all(nodes.map(node => { return from(
const id = node.entry.nodeId || node.entry.id; Promise.all(
return this.api.favoritesApi.removeFavoriteSite('-me-', id); nodes.map(node => {
}))); const id = node.entry.nodeId || node.entry.id;
return this.api.favoritesApi.removeFavoriteSite('-me-', id);
})
)
);
} }
} }

150
src/app/services/content-management.service.spec.ts
View File

@ -25,7 +25,7 @@
import { TestBed, fakeAsync } from '@angular/core/testing'; import { TestBed, fakeAsync } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx'; import { of, throwError } from 'rxjs';
import { MatDialog, MatSnackBar } from '@angular/material'; import { MatDialog, MatSnackBar } from '@angular/material';
import { Actions, ofType, EffectsModule } from '@ngrx/effects'; import { Actions, ofType, EffectsModule } from '@ngrx/effects';
import { import {
@ -73,7 +73,7 @@ describe('ContentManagementService', () => {
dialog = TestBed.get(MatDialog); dialog = TestBed.get(MatDialog);
spyOn(dialog, 'open').and.returnValue({ spyOn(dialog, 'open').and.returnValue({
afterClosed() { afterClosed() {
return Observable.of(true); return of(true);
} }
}); });
}); });
@ -84,7 +84,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies successful copy of a node', () => { it('notifies successful copy of a node', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }]; const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }];
@ -97,7 +97,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies successful copy of multiple nodes', () => { it('notifies successful copy of multiple nodes', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy-1', name: 'name1' } }, { entry: { id: 'node-to-copy-1', name: 'name1' } },
@ -114,7 +114,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies partially copy of one node out of a multiple selection of nodes', () => { it('notifies partially copy of one node out of a multiple selection of nodes', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy-1', name: 'name1' } }, { entry: { id: 'node-to-copy-1', name: 'name1' } },
@ -130,7 +130,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies partially copy of more nodes out of a multiple selection of nodes', () => { it('notifies partially copy of more nodes out of a multiple selection of nodes', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy-0', name: 'name0' } }, { entry: { id: 'node-to-copy-0', name: 'name0' } },
@ -148,7 +148,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies of failed copy of multiple nodes', () => { it('notifies of failed copy of multiple nodes', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy-0', name: 'name0' } }, { entry: { id: 'node-to-copy-0', name: 'name0' } },
@ -164,7 +164,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies of failed copy of one node', () => { it('notifies of failed copy of one node', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy', name: 'name' } }]; { entry: { id: 'node-to-copy', name: 'name' } }];
@ -178,7 +178,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies error if success message was not emitted', () => { it('notifies error if success message was not emitted', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('')); spyOn(nodeActions, 'copyNodes').and.returnValue(of(''));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
@ -190,7 +190,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies permission error on copy of node', () => { it('notifies permission error on copy of node', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 403}})))); spyOn(nodeActions, 'copyNodes').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 403}}))));
const selection = [{ entry: { id: '1', name: 'name' } }]; const selection = [{ entry: { id: '1', name: 'name' } }];
store.dispatch(new CopyNodesAction(selection)); store.dispatch(new CopyNodesAction(selection));
@ -200,7 +200,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies generic error message on all errors, but 403', () => { it('notifies generic error message on all errors, but 403', () => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 404}})))); spyOn(nodeActions, 'copyNodes').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 404}}))));
const selection = [{ entry: { id: '1', name: 'name' } }]; const selection = [{ entry: { id: '1', name: 'name' } }];
@ -213,15 +213,15 @@ describe('ContentManagementService', () => {
describe('Undo Copy action', () => { describe('Undo Copy action', () => {
beforeEach(() => { beforeEach(() => {
spyOn(nodeActions, 'copyNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.COPY')); spyOn(nodeActions, 'copyNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.COPY'));
spyOn(snackBar, 'open').and.returnValue({ spyOn(snackBar, 'open').and.returnValue({
onAction: () => Observable.of({}) onAction: () => of({})
}); });
}); });
it('should delete the newly created node on Undo action', () => { it('should delete the newly created node on Undo action', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.of(null)); spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }]; const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }];
@ -236,7 +236,7 @@ describe('ContentManagementService', () => {
}); });
it('should delete also the node created inside an already existing folder from destination', () => { it('should delete also the node created inside an already existing folder from destination', () => {
const spyOnDeleteNode = spyOn(contentApi, 'deleteNode').and.returnValue(Observable.of(null)); const spyOnDeleteNode = spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
const selection = [ const selection = [
{ entry: { id: 'node-to-copy-1', name: 'name1' } }, { entry: { id: 'node-to-copy-1', name: 'name1' } },
@ -259,7 +259,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies when error occurs on Undo action', () => { it('notifies when error occurs on Undo action', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.throw(null)); spyOn(contentApi, 'deleteNode').and.returnValue(throwError(null));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }]; const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }];
@ -273,7 +273,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies when some error of type Error occurs on Undo action', () => { it('notifies when some error of type Error occurs on Undo action', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.throw(new Error('oops!'))); spyOn(contentApi, 'deleteNode').and.returnValue(throwError(new Error('oops!')));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }]; const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }];
@ -287,7 +287,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies permission error when it occurs on Undo action', () => { it('notifies permission error when it occurs on Undo action', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 403}})))); spyOn(contentApi, 'deleteNode').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 403}}))));
const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }]; const selection = [{ entry: { id: 'node-to-copy-id', name: 'name' } }];
const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }]; const createdItems = [{ entry: { id: 'copy-id', name: 'name' } }];
@ -328,7 +328,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [] partiallySucceeded: []
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
const selection = node; const selection = node;
@ -350,7 +350,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [] partiallySucceeded: []
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
const selection = nodes; const selection = nodes;
@ -370,7 +370,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: nodes partiallySucceeded: nodes
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
const selection = nodes; const selection = nodes;
@ -392,7 +392,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: nodes partiallySucceeded: nodes
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
const selection = nodes; const selection = nodes;
@ -413,7 +413,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [] partiallySucceeded: []
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
store.dispatch(new MoveNodesAction(nodes)); store.dispatch(new MoveNodesAction(nodes));
@ -434,7 +434,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [ nodes[1] ] partiallySucceeded: [ nodes[1] ]
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
store.dispatch(new MoveNodesAction(nodes)); store.dispatch(new MoveNodesAction(nodes));
@ -453,7 +453,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [] partiallySucceeded: []
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('')); spyOn(nodeActions, 'moveNodes').and.returnValue(of(''));
store.dispatch(new MoveNodesAction(nodes)); store.dispatch(new MoveNodesAction(nodes));
nodeActions.contentMoved.next(moveResponse); nodeActions.contentMoved.next(moveResponse);
@ -463,7 +463,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies permission error on move of node', () => { it('notifies permission error on move of node', () => {
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 403}})))); spyOn(nodeActions, 'moveNodes').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 403}}))));
const selection = [{ entry: { id: '1', name: 'name' } }]; const selection = [{ entry: { id: '1', name: 'name' } }];
store.dispatch(new MoveNodesAction(selection)); store.dispatch(new MoveNodesAction(selection));
@ -473,7 +473,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies generic error message on all errors, but 403', () => { it('notifies generic error message on all errors, but 403', () => {
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 404}})))); spyOn(nodeActions, 'moveNodes').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 404}}))));
const selection = [{ entry: { id: '1', name: 'name' } }]; const selection = [{ entry: { id: '1', name: 'name' } }];
store.dispatch(new MoveNodesAction(selection)); store.dispatch(new MoveNodesAction(selection));
@ -483,7 +483,7 @@ describe('ContentManagementService', () => {
}); });
it('notifies conflict error message on 409', () => { it('notifies conflict error message on 409', () => {
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 409}})))); spyOn(nodeActions, 'moveNodes').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 409}}))));
const selection = [{ entry: { id: '1', name: 'name' } }]; const selection = [{ entry: { id: '1', name: 'name' } }];
store.dispatch(new MoveNodesAction(selection)); store.dispatch(new MoveNodesAction(selection));
@ -500,7 +500,7 @@ describe('ContentManagementService', () => {
partiallySucceeded: [] partiallySucceeded: []
}; };
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse); spyOn(nodeActions, 'processResponse').and.returnValue(moveResponse);
store.dispatch(new MoveNodesAction(nodes)); store.dispatch(new MoveNodesAction(nodes));
@ -527,10 +527,10 @@ describe('ContentManagementService', () => {
}); });
beforeEach(() => { beforeEach(() => {
spyOn(nodeActions, 'moveNodes').and.returnValue(Observable.of('OPERATION.SUCCES.CONTENT.MOVE')); spyOn(nodeActions, 'moveNodes').and.returnValue(of('OPERATION.SUCCES.CONTENT.MOVE'));
spyOn(snackBar, 'open').and.returnValue({ spyOn(snackBar, 'open').and.returnValue({
onAction: () => Observable.of({}) onAction: () => of({})
}); });
// spyOn(snackBar, 'open').and.callThrough(); // spyOn(snackBar, 'open').and.callThrough();
@ -541,7 +541,7 @@ describe('ContentManagementService', () => {
const node = { entry: { id: 'node-to-move-id', name: 'name', parentId: initialParent } }; const node = { entry: { id: 'node-to-move-id', name: 'name', parentId: initialParent } };
const selection = [ node ]; const selection = [ node ];
spyOn(nodeActions, 'moveNodeAction').and.returnValue(Observable.of({})); spyOn(nodeActions, 'moveNodeAction').and.returnValue(of({}));
store.dispatch(new MoveNodesAction(selection)); store.dispatch(new MoveNodesAction(selection));
const movedItems = { const movedItems = {
@ -561,7 +561,7 @@ describe('ContentManagementService', () => {
const node = { entry: { id: 'node-to-move-id', name: 'name', isFolder: false, parentId: initialParent } }; const node = { entry: { id: 'node-to-move-id', name: 'name', isFolder: false, parentId: initialParent } };
const selection = [ node ]; const selection = [ node ];
spyOn(nodeActions, 'moveNodeAction').and.returnValue(Observable.of({})); spyOn(nodeActions, 'moveNodeAction').and.returnValue(of({}));
const movedItems = { const movedItems = {
failed: [], failed: [],
@ -578,7 +578,7 @@ describe('ContentManagementService', () => {
it('should restore deleted folder back to initial parent, after succeeded moving all its files', () => { it('should restore deleted folder back to initial parent, after succeeded moving all its files', () => {
// when folder was deleted after all its children were moved to a folder with the same name from destination // when folder was deleted after all its children were moved to a folder with the same name from destination
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.of(null)); spyOn(contentApi, 'restoreNode').and.returnValue(of(null));
const initialParent = 'parent-id-0'; const initialParent = 'parent-id-0';
const node = { entry: { id: 'folder-to-move-id', name: 'conflicting-name', parentId: initialParent, isFolder: true } }; const node = { entry: { id: 'folder-to-move-id', name: 'conflicting-name', parentId: initialParent, isFolder: true } };
@ -601,7 +601,7 @@ describe('ContentManagementService', () => {
}); });
it('should notify when error occurs on Undo Move action', fakeAsync(done => { it('should notify when error occurs on Undo Move action', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(null)); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(null));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -629,7 +629,7 @@ describe('ContentManagementService', () => {
})); }));
it('should notify when some error of type Error occurs on Undo Move action', fakeAsync(done => { it('should notify when some error of type Error occurs on Undo Move action', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(new Error('oops!'))); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(new Error('oops!')));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -656,7 +656,7 @@ describe('ContentManagementService', () => {
})); }));
it('should notify permission error when it occurs on Undo Move action', fakeAsync(done => { it('should notify permission error when it occurs on Undo Move action', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(new Error(JSON.stringify({error: {statusCode: 403}})))); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(new Error(JSON.stringify({error: {statusCode: 403}}))));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -686,7 +686,7 @@ describe('ContentManagementService', () => {
describe('Delete action', () => { describe('Delete action', () => {
it('should raise info message on successful single file deletion', fakeAsync(done => { it('should raise info message on successful single file deletion', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.of(null)); spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
actions$.pipe( actions$.pipe(
ofType<SnackbarInfoAction>(SNACKBAR_INFO), ofType<SnackbarInfoAction>(SNACKBAR_INFO),
@ -701,7 +701,7 @@ describe('ContentManagementService', () => {
})); }));
it('should raise error message on failed single file deletion', fakeAsync(done => { it('should raise error message on failed single file deletion', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.throw(null)); spyOn(contentApi, 'deleteNode').and.returnValue(throwError(null));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -716,7 +716,7 @@ describe('ContentManagementService', () => {
})); }));
it('should raise info message on successful multiple files deletion', fakeAsync(done => { it('should raise info message on successful multiple files deletion', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.of(null)); spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
actions$.pipe( actions$.pipe(
ofType<SnackbarInfoAction>(SNACKBAR_INFO), ofType<SnackbarInfoAction>(SNACKBAR_INFO),
@ -734,7 +734,7 @@ describe('ContentManagementService', () => {
})); }));
it('should raise error message failed multiple files deletion', fakeAsync(done => { it('should raise error message failed multiple files deletion', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.returnValue(Observable.throw(null)); spyOn(contentApi, 'deleteNode').and.returnValue(throwError(null));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -754,9 +754,9 @@ describe('ContentManagementService', () => {
it('should raise warning message when only one file is successful', fakeAsync(done => { it('should raise warning message when only one file is successful', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.callFake((id) => { spyOn(contentApi, 'deleteNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.throw(null); return throwError(null);
} else { } else {
return Observable.of(null); return of(null);
} }
}); });
@ -778,15 +778,15 @@ describe('ContentManagementService', () => {
it('should raise warning message when some files are successfully deleted', fakeAsync(done => { it('should raise warning message when some files are successfully deleted', fakeAsync(done => {
spyOn(contentApi, 'deleteNode').and.callFake((id) => { spyOn(contentApi, 'deleteNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.throw(null); return throwError(null);
} }
if (id === '2') { if (id === '2') {
return Observable.of(null); return of(null);
} }
if (id === '3') { if (id === '3') {
return Observable.of(null); return of(null);
} }
}); });
@ -817,7 +817,7 @@ describe('ContentManagementService', () => {
}); });
it('call purge nodes if selection is not empty', fakeAsync(() => { it('call purge nodes if selection is not empty', fakeAsync(() => {
spyOn(contentApi, 'purgeDeletedNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'purgeDeletedNode').and.returnValue(of({}));
const selection = [ { entry: { id: '1' } } ]; const selection = [ { entry: { id: '1' } } ];
store.dispatch(new PurgeDeletedNodesAction(selection)); store.dispatch(new PurgeDeletedNodesAction(selection));
@ -836,15 +836,15 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => { spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.of({}); return of({});
} }
if (id === '2') { if (id === '2') {
return Observable.throw({}); return throwError({});
} }
if (id === '3') { if (id === '3') {
return Observable.throw({}); return throwError({});
} }
}); });
@ -867,19 +867,19 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => { spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.of({}); return of({});
} }
if (id === '2') { if (id === '2') {
return Observable.throw({}); return throwError({});
} }
if (id === '3') { if (id === '3') {
return Observable.throw({}); return throwError({});
} }
if (id === '4') { if (id === '4') {
return Observable.of({}); return of({});
} }
}); });
@ -901,7 +901,7 @@ describe('ContentManagementService', () => {
}) })
); );
spyOn(contentApi, 'purgeDeletedNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'purgeDeletedNode').and.returnValue(of({}));
const selection = [ const selection = [
{ entry: { id: '1', name: 'name1' } } { entry: { id: '1', name: 'name1' } }
@ -918,7 +918,7 @@ describe('ContentManagementService', () => {
}) })
); );
spyOn(contentApi, 'purgeDeletedNode').and.returnValue(Observable.throw({})); spyOn(contentApi, 'purgeDeletedNode').and.returnValue(throwError({}));
const selection = [ const selection = [
{ entry: { id: '1', name: 'name1' } } { entry: { id: '1', name: 'name1' } }
@ -936,11 +936,11 @@ describe('ContentManagementService', () => {
); );
spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => { spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.of({}); return of({});
} }
if (id === '2') { if (id === '2') {
return Observable.of({}); return of({});
} }
}); });
@ -961,11 +961,11 @@ describe('ContentManagementService', () => {
); );
spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => { spyOn(contentApi, 'purgeDeletedNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.throw({}); return throwError({});
} }
if (id === '2') { if (id === '2') {
return Observable.throw({}); return throwError({});
} }
}); });
@ -1000,8 +1000,8 @@ describe('ContentManagementService', () => {
}); });
it('call restore nodes if selection has nodes with path', fakeAsync(() => { it('call restore nodes if selection has nodes with path', fakeAsync(() => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
spyOn(contentApi, 'getDeletedNodes').and.returnValue(Observable.of({ spyOn(contentApi, 'getDeletedNodes').and.returnValue(of({
list: { entries: [] } list: { entries: [] }
})); }));
@ -1030,8 +1030,8 @@ describe('ContentManagementService', () => {
describe('refresh()', () => { describe('refresh()', () => {
it('dispatch event on finish', fakeAsync(done => { it('dispatch event on finish', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
spyOn(contentApi, 'getDeletedNodes').and.returnValue(Observable.of({ spyOn(contentApi, 'getDeletedNodes').and.returnValue(of({
list: { entries: [] } list: { entries: [] }
})); }));
@ -1061,7 +1061,7 @@ describe('ContentManagementService', () => {
describe('notification', () => { describe('notification', () => {
beforeEach(() => { beforeEach(() => {
spyOn(contentApi, 'getDeletedNodes').and.returnValue(Observable.of({ spyOn(contentApi, 'getDeletedNodes').and.returnValue(of({
list: { entries: [] } list: { entries: [] }
})); }));
}); });
@ -1076,15 +1076,15 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.callFake((id) => { spyOn(contentApi, 'restoreNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.of({}); return of({});
} }
if (id === '2') { if (id === '2') {
return Observable.throw(error); return throwError(error);
} }
if (id === '3') { if (id === '3') {
return Observable.throw(error); return throwError(error);
} }
}); });
@ -1108,7 +1108,7 @@ describe('ContentManagementService', () => {
it('should raise error message when restored node exist, error 409', fakeAsync(done => { it('should raise error message when restored node exist, error 409', fakeAsync(done => {
const error = { message: '{ "error": { "statusCode": 409 } }' }; const error = { message: '{ "error": { "statusCode": 409 } }' };
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(error)); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -1134,7 +1134,7 @@ describe('ContentManagementService', () => {
it('should raise error message when restored node returns different statusCode', fakeAsync(done => { it('should raise error message when restored node returns different statusCode', fakeAsync(done => {
const error = { message: '{ "error": { "statusCode": 404 } }' }; const error = { message: '{ "error": { "statusCode": 404 } }' };
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(error)); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -1160,7 +1160,7 @@ describe('ContentManagementService', () => {
it('should raise error message when restored node location is missing', fakeAsync(done => { it('should raise error message when restored node location is missing', fakeAsync(done => {
const error = { message: '{ "error": { } }' }; const error = { message: '{ "error": { } }' };
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.throw(error)); spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe( actions$.pipe(
ofType<SnackbarErrorAction>(SNACKBAR_ERROR), ofType<SnackbarErrorAction>(SNACKBAR_ERROR),
@ -1186,11 +1186,11 @@ describe('ContentManagementService', () => {
it('should raise info message when restore multiple nodes', fakeAsync(done => { it('should raise info message when restore multiple nodes', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.callFake((id) => { spyOn(contentApi, 'restoreNode').and.callFake((id) => {
if (id === '1') { if (id === '1') {
return Observable.of({}); return of({});
} }
if (id === '2') { if (id === '2') {
return Observable.of({}); return of({});
} }
}); });
@ -1217,7 +1217,7 @@ describe('ContentManagementService', () => {
})); }));
xit('should raise info message when restore selected node', fakeAsync(done => { xit('should raise info message when restore selected node', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
actions$.pipe( actions$.pipe(
ofType<SnackbarInfoAction>(SNACKBAR_INFO), ofType<SnackbarInfoAction>(SNACKBAR_INFO),
@ -1241,7 +1241,7 @@ describe('ContentManagementService', () => {
})); }));
it('navigate to restore selected node location onAction', fakeAsync(done => { it('navigate to restore selected node location onAction', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(Observable.of({})); spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
actions$.pipe( actions$.pipe(
ofType<NavigateRouteAction>(NAVIGATE_ROUTE), ofType<NavigateRouteAction>(NAVIGATE_ROUTE),

147
src/app/services/content-management.service.ts
View File

@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { Subject, Observable } from 'rxjs/Rx'; import { Subject, Observable, forkJoin, of, zip } from 'rxjs';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { MatDialog, MatSnackBar } from '@angular/material'; import { MatDialog, MatSnackBar } from '@angular/material';
import { FolderDialogComponent, ConfirmDialogComponent, ShareDialogComponent } from '@alfresco/adf-content-services'; import { FolderDialogComponent, ConfirmDialogComponent, ShareDialogComponent } from '@alfresco/adf-content-services';
@ -48,6 +48,7 @@ import { NodeActionsService } from './node-actions.service';
import { TranslationService } from '@alfresco/adf-core'; import { TranslationService } from '@alfresco/adf-core';
import { NodePermissionsDialogComponent } from '../dialogs/node-permissions/node-permissions.dialog'; import { NodePermissionsDialogComponent } from '../dialogs/node-permissions/node-permissions.dialog';
import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog'; import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog';
import { take, map, tap, mergeMap, catchError } from 'rxjs/operators';
interface RestoredNode { interface RestoredNode {
status: number; status: number;
@ -158,7 +159,7 @@ export class ContentManagementService {
this.store this.store
.select(sharedUrl) .select(sharedUrl)
.take(1) .pipe(take(1))
.subscribe(baseShareUrl => { .subscribe(baseShareUrl => {
this.dialogRef.open(ShareDialogComponent, { this.dialogRef.open(ShareDialogComponent, {
width: '600px', width: '600px',
@ -314,11 +315,13 @@ export class ContentManagementService {
let status: DeleteStatus; let status: DeleteStatus;
Observable.forkJoin(nodesWithPath.map(node => this.restoreNode(node))) forkJoin(nodesWithPath.map(node => this.restoreNode(node)))
.do(restoredNodes => { .pipe(
status = this.processStatus(restoredNodes); tap(restoredNodes => {
}) status = this.processStatus(restoredNodes);
.flatMap(() => this.contentApi.getDeletedNodes()) }),
mergeMap(() => this.contentApi.getDeletedNodes())
)
.subscribe((nodes: DeletedNodesPaging) => { .subscribe((nodes: DeletedNodesPaging) => {
const selectedNodes = this.diff(status.fail, selection, false); const selectedNodes = this.diff(status.fail, selection, false);
const remainingNodes = this.diff( const remainingNodes = this.diff(
@ -336,7 +339,7 @@ export class ContentManagementService {
} }
copyNodes(nodes: Array<MinimalNodeEntity>) { copyNodes(nodes: Array<MinimalNodeEntity>) {
Observable.zip( zip(
this.nodeActionsService.copyNodes(nodes), this.nodeActionsService.copyNodes(nodes),
this.nodeActionsService.contentCopied this.nodeActionsService.contentCopied
).subscribe( ).subscribe(
@ -420,7 +423,7 @@ export class ContentManagementService {
this.contentApi.deleteNode(item.entry.id, { permanent: true }) this.contentApi.deleteNode(item.entry.id, { permanent: true })
); );
Observable.forkJoin(...batch).subscribe( forkJoin(...batch).subscribe(
() => { () => {
this.nodesDeleted.next(null); this.nodesDeleted.next(null);
}, },
@ -448,7 +451,7 @@ export class ContentManagementService {
moveNodes(nodes: Array<MinimalNodeEntity>) { moveNodes(nodes: Array<MinimalNodeEntity>) {
const permissionForMove = '!'; const permissionForMove = '!';
Observable.zip( zip(
this.nodeActionsService.moveNodes(nodes, permissionForMove), this.nodeActionsService.moveNodes(nodes, permissionForMove),
this.nodeActionsService.contentMoved this.nodeActionsService.contentMoved
).subscribe( ).subscribe(
@ -472,11 +475,11 @@ export class ContentManagementService {
.map((folderEntry) => { .map((folderEntry) => {
return this.contentApi return this.contentApi
.restoreNode(folderEntry.nodeId || folderEntry.id) .restoreNode(folderEntry.nodeId || folderEntry.id)
.map(node => node.entry); .pipe(map(node => node.entry));
}); });
Observable.zip(...restoreDeletedNodesBatch, Observable.of(null)) zip(...restoreDeletedNodesBatch, of(null))
.flatMap(() => { .pipe(mergeMap(() => {
const nodesToBeMovedBack = [...partiallyMovedNodes, ...movedNodes]; const nodesToBeMovedBack = [...partiallyMovedNodes, ...movedNodes];
@ -491,8 +494,8 @@ export class ContentManagementService {
} }
}); });
return Observable.zip(...revertMoveBatch, Observable.of(null)); return zip(...revertMoveBatch, of(null));
}) }))
.subscribe( .subscribe(
() => { () => {
this.nodesMoved.next(null); this.nodesMoved.next(null);
@ -521,7 +524,7 @@ export class ContentManagementService {
batch.push(this.deleteNode(node)); batch.push(this.deleteNode(node));
}); });
Observable.forkJoin(...batch).subscribe((data: DeletedNodeInfo[]) => { forkJoin(...batch).subscribe((data: DeletedNodeInfo[]) => {
const status = this.processStatus(data); const status = this.processStatus(data);
const message = this.getDeleteMessage(status); const message = this.getDeleteMessage(status);
@ -548,7 +551,7 @@ export class ContentManagementService {
batch.push(this.undoDeleteNode(item)); batch.push(this.undoDeleteNode(item));
}); });
Observable.forkJoin(...batch).subscribe(data => { forkJoin(...batch).subscribe(data => {
const processedData = this.processStatus(data); const processedData = this.processStatus(data);
if (processedData.fail.length) { if (processedData.fail.length) {
@ -567,20 +570,22 @@ export class ContentManagementService {
return this.contentApi return this.contentApi
.restoreNode(id) .restoreNode(id)
.map(() => { .pipe(
return { map(() => {
id, return {
name, id,
status: 1 name,
}; status: 1
}) };
.catch((error: any) => { }),
return Observable.of({ catchError(() => {
id, return of({
name, id,
status: 0 name,
}); status: 0
}); });
})
);
} }
private getUndoDeleteMessage(status: DeleteStatus): SnackbarAction { private getUndoDeleteMessage(status: DeleteStatus): SnackbarAction {
@ -604,19 +609,21 @@ export class ContentManagementService {
const { entry } = node; const { entry } = node;
return this.contentApi.restoreNode(entry.id) return this.contentApi.restoreNode(entry.id)
.map(() => ({ .pipe(
status: 1, map(() => ({
entry status: 1,
}))
.catch(error => {
const { statusCode } = JSON.parse(error.message).error;
return Observable.of({
status: 0,
statusCode,
entry entry
}); })),
}); catchError(error => {
const { statusCode } = JSON.parse(error.message).error;
return of({
status: 0,
statusCode,
entry
});
})
);
} }
private purgeNodes(selection: NodeInfo[] = []) { private purgeNodes(selection: NodeInfo[] = []) {
@ -626,7 +633,7 @@ export class ContentManagementService {
const batch = selection.map(node => this.purgeDeletedNode(node)); const batch = selection.map(node => this.purgeDeletedNode(node));
Observable.forkJoin(batch).subscribe(purgedNodes => { forkJoin(batch).subscribe(purgedNodes => {
const status = this.processStatus(purgedNodes); const status = this.processStatus(purgedNodes);
if (status.success.length) { if (status.success.length) {
@ -644,18 +651,20 @@ export class ContentManagementService {
return this.contentApi return this.contentApi
.purgeDeletedNode(id) .purgeDeletedNode(id)
.map(() => ({ .pipe(
status: 1, map(() => ({
id, status: 1,
name
}))
.catch(error => {
return Observable.of({
status: 0,
id, id,
name name
}); })),
}); catchError(() => {
return of({
status: 0,
id,
name
});
})
);
} }
private processStatus(data: Array<{ status: number }> = []): DeleteStatus { private processStatus(data: Array<{ status: number }> = []): DeleteStatus {
@ -839,20 +848,22 @@ export class ContentManagementService {
return this.contentApi return this.contentApi
.deleteNode(id) .deleteNode(id)
.map(() => { .pipe(
return { map(() => {
id, return {
name, id,
status: 1 name,
}; status: 1
}) };
.catch(() => { }),
return Observable.of({ catchError(() => {
id, return of({
name, id,
status: 0 name,
}); status: 0
}); });
})
);
} }
private getDeleteMessage(status: DeleteStatus): SnackbarAction { private getDeleteMessage(status: DeleteStatus): SnackbarAction {

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

@ -25,7 +25,7 @@
import { TestBed, async } from '@angular/core/testing'; import { TestBed, async } from '@angular/core/testing';
import { MatDialog } from '@angular/material'; import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Rx'; import { of, throwError } from 'rxjs';
import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core'; import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
import { DocumentListService } from '@alfresco/adf-content-services'; import { DocumentListService } from '@alfresco/adf-content-services';
import { NodeActionsService } from './node-actions.service'; import { NodeActionsService } from './node-actions.service';
@ -179,8 +179,8 @@ describe('NodeActionsService', () => {
it('should not throw error if entry in \'contentEntities\' does not have id, but has nodeId property', async(() => { it('should not throw error if entry in \'contentEntities\' does not have id, but has nodeId property', async(() => {
const contentEntities = [ new TestNode(), {entry: {nodeId: '1234'}} ]; const contentEntities = [ new TestNode(), {entry: {nodeId: '1234'}} ];
spyOn(service, 'getContentNodeSelection').and.returnValue(Observable.of([new TestNode().entry])); spyOn(service, 'getContentNodeSelection').and.returnValue(of([new TestNode().entry]));
spyOn(service, 'copyNodeAction').and.returnValue(Observable.of({})); spyOn(service, 'copyNodeAction').and.returnValue(of({}));
const doCopyBatchOperation = service.copyNodes(contentEntities).asObservable(); const doCopyBatchOperation = service.copyNodes(contentEntities).asObservable();
@ -271,8 +271,8 @@ describe('NodeActionsService', () => {
it('should be called', () => { it('should be called', () => {
const spyOnBatchOperation = spyOn(service, 'doBatchOperation').and.callThrough(); const spyOnBatchOperation = spyOn(service, 'doBatchOperation').and.callThrough();
spyOn(service, 'getContentNodeSelection').and.returnValue(Observable.of([destinationFolder.entry])); spyOn(service, 'getContentNodeSelection').and.returnValue(of([destinationFolder.entry]));
spyOn(service, 'copyNodeAction').and.returnValue(Observable.of({})); spyOn(service, 'copyNodeAction').and.returnValue(of({}));
service.copyNodes([fileToCopy, folderToCopy]); service.copyNodes([fileToCopy, folderToCopy]);
expect(spyOnBatchOperation.calls.count()).toEqual(1); expect(spyOnBatchOperation.calls.count()).toEqual(1);
@ -514,7 +514,7 @@ describe('NodeActionsService', () => {
} }
]; ];
spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes)); spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes));
spyOn(service, 'getChildByName').and.returnValue(Observable.of(existingFolder)); spyOn(service, 'getChildByName').and.returnValue(of(existingFolder));
copyObservable.toPromise() copyObservable.toPromise()
.then( .then(
@ -555,7 +555,7 @@ describe('NodeActionsService', () => {
} }
]; ];
spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes)); spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes));
spyOn(service, 'getChildByName').and.returnValue(Observable.of(existingFolder)); spyOn(service, 'getChildByName').and.returnValue(of(existingFolder));
copyObservable.toPromise() copyObservable.toPromise()
.then( .then(
@ -594,7 +594,7 @@ describe('NodeActionsService', () => {
} }
]; ];
spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes)); spyOn(nodesApi, 'getNodeChildren').and.callFake(helper.fakeGetNodeChildren(testFamilyNodes));
spyOn(service, 'getChildByName').and.returnValue(Observable.of(existingFolder)); spyOn(service, 'getChildByName').and.returnValue(of(existingFolder));
copyObservable.toPromise() copyObservable.toPromise()
.then( .then(
@ -649,9 +649,9 @@ describe('NodeActionsService', () => {
it('should allow to select destination for nodes that have permission to be moved', () => { it('should allow to select destination for nodes that have permission to be moved', () => {
const spyOnDestinationPicker = const spyOnDestinationPicker =
spyOn(service, 'getContentNodeSelection') spyOn(service, 'getContentNodeSelection')
.and.returnValue(Observable.of([destinationFolder.entry])); .and.returnValue(of([destinationFolder.entry]));
spyOn(service, 'moveContentAction').and.returnValue(Observable.of({})); spyOn(service, 'moveContentAction').and.returnValue(of({}));
spyOn(service, 'moveFolderAction').and.returnValue(Observable.of({})); spyOn(service, 'moveFolderAction').and.returnValue(of({}));
fileToMove.entry['allowableOperations'] = [permissionToMove]; fileToMove.entry['allowableOperations'] = [permissionToMove];
folderToMove.entry['allowableOperations'] = [permissionToMove]; folderToMove.entry['allowableOperations'] = [permissionToMove];
@ -664,7 +664,7 @@ describe('NodeActionsService', () => {
it('should not allow to select destination for nodes that do not have permission to be moved', () => { it('should not allow to select destination for nodes that do not have permission to be moved', () => {
const spyOnDestinationPicker = const spyOnDestinationPicker =
spyOn(service, 'getContentNodeSelection') spyOn(service, 'getContentNodeSelection')
.and.returnValue(Observable.of([destinationFolder.entry])); .and.returnValue(of([destinationFolder.entry]));
fileToMove.entry['allowableOperations'] = []; fileToMove.entry['allowableOperations'] = [];
folderToMove.entry['allowableOperations'] = []; folderToMove.entry['allowableOperations'] = [];
@ -675,9 +675,9 @@ describe('NodeActionsService', () => {
}); });
it('should call the documentListService moveNode directly for moving a file that has permission to be moved', () => { it('should call the documentListService moveNode directly for moving a file that has permission to be moved', () => {
spyOn(service, 'getContentNodeSelection').and.returnValue(Observable.of([destinationFolder.entry])); spyOn(service, 'getContentNodeSelection').and.returnValue(of([destinationFolder.entry]));
fileToMove.entry['allowableOperations'] = [permissionToMove]; fileToMove.entry['allowableOperations'] = [permissionToMove];
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and.returnValue(Observable.of([fileToMove])); spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and.returnValue(of([fileToMove]));
spyOn(service, 'moveNodeAction'); spyOn(service, 'moveNodeAction');
service.moveNodes([fileToMove], permissionToMove); service.moveNodes([fileToMove], permissionToMove);
@ -694,7 +694,7 @@ describe('NodeActionsService', () => {
it('should not throw error on conflict, to be able to show message in case of partial move of files', async(() => { it('should not throw error on conflict, to be able to show message in case of partial move of files', async(() => {
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and
.returnValue(Observable.throw(conflictError)); .returnValue(throwError(conflictError));
const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId); const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId);
moveContentActionObservable.toPromise() moveContentActionObservable.toPromise()
@ -716,7 +716,7 @@ describe('NodeActionsService', () => {
it('should not throw permission error, to be able to show message in case of partial move of files', async(() => { it('should not throw permission error, to be able to show message in case of partial move of files', async(() => {
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and
.returnValue(Observable.throw(permissionError)); .returnValue(throwError(permissionError));
const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId); const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId);
moveContentActionObservable.toPromise() moveContentActionObservable.toPromise()
@ -741,7 +741,7 @@ describe('NodeActionsService', () => {
fileToMove.entry['parentId'] = parentID; fileToMove.entry['parentId'] = parentID;
fileToMove.entry['allowableOperations'] = [permissionToMove]; fileToMove.entry['allowableOperations'] = [permissionToMove];
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and
.returnValue(Observable.of(fileToMove)); .returnValue(of(fileToMove));
const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId); const moveContentActionObservable = service.moveContentAction(fileToMove.entry, folderDestinationId);
moveContentActionObservable.toPromise() moveContentActionObservable.toPromise()
@ -772,7 +772,7 @@ describe('NodeActionsService', () => {
it('should not throw permission error in case it occurs on folder move', async(() => { it('should not throw permission error in case it occurs on folder move', async(() => {
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and
.returnValue(Observable.throw(permissionError)); .returnValue(throwError(permissionError));
const moveFolderActionObservable = service.moveFolderAction(folderToMove.entry, folderDestinationId); const moveFolderActionObservable = service.moveFolderAction(folderToMove.entry, folderDestinationId);
moveFolderActionObservable.toPromise() moveFolderActionObservable.toPromise()
@ -793,11 +793,11 @@ describe('NodeActionsService', () => {
it('should not throw error on conflict in case it occurs on folder move', async(() => { it('should not throw error on conflict in case it occurs on folder move', async(() => {
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and
.returnValue(Observable.throw(conflictError)); .returnValue(throwError(conflictError));
const newDestination = new TestNode('new-destination', !isFile, folderToMove.entry.name); const newDestination = new TestNode('new-destination', !isFile, folderToMove.entry.name);
spyOn(service, 'getChildByName').and.returnValue(Observable.of(newDestination)); spyOn(service, 'getChildByName').and.returnValue(of(newDestination));
spyOn(service, 'getNodeChildren').and.returnValue(Observable.of(emptyChildrenList)); spyOn(service, 'getNodeChildren').and.returnValue(of(emptyChildrenList));
const moveFolderActionObservable = service.moveFolderAction(folderToMove.entry, folderDestinationId); const moveFolderActionObservable = service.moveFolderAction(folderToMove.entry, folderDestinationId);
moveFolderActionObservable.toPromise() moveFolderActionObservable.toPromise()
@ -821,17 +821,17 @@ describe('NodeActionsService', () => {
spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and.callFake( spyOnDocumentListServiceAction = spyOn(documentListService, 'moveNode').and.callFake(
(contentEntryId, selectionId) => { (contentEntryId, selectionId) => {
if (contentEntryId === parentFolderToMove.entry.id) { if (contentEntryId === parentFolderToMove.entry.id) {
return Observable.throw(conflictError); return throwError(conflictError);
} }
return Observable.of({}); return of({});
}); });
spyOn(service, 'moveContentAction').and.returnValue(Observable.of({})); spyOn(service, 'moveContentAction').and.returnValue(of({}));
const newDestination = new TestNode('new-destination', !isFile, 'conflicting-name'); const newDestination = new TestNode('new-destination', !isFile, 'conflicting-name');
spyOn(service, 'getChildByName').and.returnValue(Observable.of(newDestination)); spyOn(service, 'getChildByName').and.returnValue(of(newDestination));
const childrenNodes = [ fileToMove, folderToMove ]; const childrenNodes = [ fileToMove, folderToMove ];
spyOn(service, 'getNodeChildren').and.returnValue(Observable.of( {list: {entries: childrenNodes}} )); spyOn(service, 'getNodeChildren').and.returnValue(of( {list: {entries: childrenNodes}} ));
const moveFolderActionObservable = service.moveFolderAction(parentFolderToMove.entry, folderDestinationId); const moveFolderActionObservable = service.moveFolderAction(parentFolderToMove.entry, folderDestinationId);
moveFolderActionObservable.toPromise() moveFolderActionObservable.toPromise()
@ -860,7 +860,7 @@ describe('NodeActionsService', () => {
beforeEach(() => { beforeEach(() => {
parentFolderToMove = new TestNode('parent-folder', !isFile, 'conflicting-name'); parentFolderToMove = new TestNode('parent-folder', !isFile, 'conflicting-name');
spyOnDelete = spyOn(contentApi, 'deleteNode').and.returnValue(Observable.of(null)); spyOnDelete = spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
}); });
afterEach(() => { afterEach(() => {
@ -870,7 +870,7 @@ describe('NodeActionsService', () => {
}); });
it('should take no extra delete action, if folder was moved to the same location', async(() => { it('should take no extra delete action, if folder was moved to the same location', async(() => {
spyOn(service, 'moveFolderAction').and.returnValue(Observable.of(null)); spyOn(service, 'moveFolderAction').and.returnValue(of(null));
parentFolderToMove.entry.parentId = folderDestinationId; parentFolderToMove.entry.parentId = folderDestinationId;
moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise(); moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise();
@ -892,7 +892,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', async(() => {
const movedChildrenNodes = [ fileToMove, folderToMove ]; const movedChildrenNodes = [ fileToMove, folderToMove ];
spyOn(service, 'moveFolderAction').and.returnValue(Observable.of(movedChildrenNodes)); spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes));
spyOn(service, 'processResponse').and.returnValue({ spyOn(service, 'processResponse').and.returnValue({
succeeded: [ fileToMove ], succeeded: [ fileToMove ],
failed: [ folderToMove ], failed: [ folderToMove ],
@ -919,14 +919,14 @@ describe('NodeActionsService', () => {
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 ];
spyOn(service, 'moveFolderAction').and.returnValue(Observable.of(movedChildrenNodes)); spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes));
spyOn(service, 'processResponse').and.returnValue({ spyOn(service, 'processResponse').and.returnValue({
succeeded: [ movedChildrenNodes ], succeeded: [ movedChildrenNodes ],
failed: [], failed: [],
partiallySucceeded: [] partiallySucceeded: []
}); });
const folderOnLocation = parentFolderToMove; const folderOnLocation = parentFolderToMove;
spyOn(service, 'getChildByName').and.returnValue(Observable.of(folderOnLocation)); spyOn(service, 'getChildByName').and.returnValue(of(folderOnLocation));
parentFolderToMove.entry.parentId = `not-${folderDestinationId}`; parentFolderToMove.entry.parentId = `not-${folderDestinationId}`;
moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise(); moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise();
@ -948,13 +948,13 @@ describe('NodeActionsService', () => {
it('should take no extra delete action, if folder is no longer on location', async(() => { it('should take no extra delete action, if folder is no longer on location', async(() => {
const movedChildrenNodes = [ fileToMove, folderToMove ]; const movedChildrenNodes = [ fileToMove, folderToMove ];
spyOn(service, 'moveFolderAction').and.returnValue(Observable.of(movedChildrenNodes)); spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes));
spyOn(service, 'processResponse').and.returnValue({ spyOn(service, 'processResponse').and.returnValue({
succeeded: [ movedChildrenNodes ], succeeded: [ movedChildrenNodes ],
failed: [], failed: [],
partiallySucceeded: [] partiallySucceeded: []
}); });
spyOn(service, 'getChildByName').and.returnValue(Observable.of(null)); spyOn(service, 'getChildByName').and.returnValue(of(null));
parentFolderToMove.entry.parentId = `not-${folderDestinationId}`; parentFolderToMove.entry.parentId = `not-${folderDestinationId}`;
moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise(); moveNodeActionPromise = service.moveNodeAction(parentFolderToMove.entry, folderDestinationId).toPromise();

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

@ -25,12 +25,13 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material'; import { MatDialog } from '@angular/material';
import { Observable, Subject } from 'rxjs/Rx'; import { Observable, Subject, of, zip, from } from 'rxjs';
import { AlfrescoApiService, ContentService, DataColumn, TranslationService } from '@alfresco/adf-core'; import { AlfrescoApiService, ContentService, DataColumn, TranslationService } from '@alfresco/adf-core';
import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from '@alfresco/adf-content-services'; import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from '@alfresco/adf-content-services';
import { MinimalNodeEntity, MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api'; import { MinimalNodeEntity, MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
import { ContentApiService } from '../services/content-api.service'; import { ContentApiService } from '../services/content-api.service';
import { catchError, map, mergeMap } from 'rxjs/operators';
@Injectable() @Injectable()
export class NodeActionsService { export class NodeActionsService {
@ -98,14 +99,12 @@ export class NodeActionsService {
let action$: Observable<any>; let action$: Observable<any>;
if (action === 'move' && contentEntities.length === 1 && type === 'content') { if (action === 'move' && contentEntities.length === 1 && type === 'content') {
action$ = this.documentListService[`${action}Node`].call(this.documentListService, contentEntryId, selection.id); action$ = this.documentListService.moveNode(contentEntryId, selection.id);
action$ = action$.toArray();
} else { } else {
contentEntities.forEach((node) => { contentEntities.forEach((node) => {
batch.push(this[`${action}NodeAction`](node.entry, selection.id)); batch.push(this[`${action}NodeAction`](node.entry, selection.id));
}); });
action$ = Observable.zip(...batch); action$ = zip(...batch);
} }
action$ action$
@ -328,7 +327,7 @@ export class NodeActionsService {
// use local method until new name parameter is added on ADF copyNode // use local method until new name parameter is added on ADF copyNode
return this.copyNode(contentEntryId, selectionId, _oldName) return this.copyNode(contentEntryId, selectionId, _oldName)
.catch((err) => { .pipe(catchError((err) => {
let errStatusCode; let errStatusCode;
try { try {
const {error: {statusCode}} = JSON.parse(err.message); const {error: {statusCode}} = JSON.parse(err.message);
@ -340,9 +339,9 @@ export class NodeActionsService {
return this.copyContentAction(contentEntry, selectionId, this.getNewNameFrom(_oldName, contentEntry.name)); return this.copyContentAction(contentEntry, selectionId, this.getNewNameFrom(_oldName, contentEntry.name));
} else { } else {
// do not throw error, to be able to show message in case of partial copy of files // do not throw error, to be able to show message in case of partial copy of files
return Observable.of(err || 'Server error'); return of(err || 'Server error');
} }
}); }));
} }
copyFolderAction(contentEntry, selectionId): Observable<any> { copyFolderAction(contentEntry, selectionId): Observable<any> {
@ -353,46 +352,48 @@ export class NodeActionsService {
let newDestinationFolder; let newDestinationFolder;
return this.copyNode(contentEntryId, selectionId, contentEntry.name) return this.copyNode(contentEntryId, selectionId, contentEntry.name)
.catch((err) => { .pipe(
let errStatusCode; catchError((err) => {
try { let errStatusCode;
const {error: {statusCode}} = JSON.parse(err.message); try {
errStatusCode = statusCode; const {error: {statusCode}} = JSON.parse(err.message);
} catch (e) { // errStatusCode = statusCode;
} } catch {}
if (errStatusCode && errStatusCode === 409) { if (errStatusCode && errStatusCode === 409) {
$destinationFolder = this.getChildByName(selectionId, contentEntry.name); $destinationFolder = this.getChildByName(selectionId, contentEntry.name);
$childrenToCopy = this.getNodeChildren(contentEntryId); $childrenToCopy = this.getNodeChildren(contentEntryId);
return $destinationFolder return $destinationFolder
.flatMap((destination) => { .pipe(
newDestinationFolder = destination; mergeMap((destination) => {
return $childrenToCopy; newDestinationFolder = destination;
}) return $childrenToCopy;
.flatMap((nodesToCopy) => { }),
const batch = []; mergeMap((nodesToCopy) => {
nodesToCopy.list.entries.forEach((node) => { const batch = [];
if (node.entry.isFolder) { nodesToCopy.list.entries.forEach((node) => {
batch.push(this.copyFolderAction(node.entry, newDestinationFolder.entry.id)); if (node.entry.isFolder) {
batch.push(this.copyFolderAction(node.entry, newDestinationFolder.entry.id));
} else {
batch.push(this.copyContentAction(node.entry, newDestinationFolder.entry.id));
}
});
} else { if (!batch.length) {
batch.push(this.copyContentAction(node.entry, newDestinationFolder.entry.id)); return of({});
} }
}); return zip(...batch);
})
);
if (!batch.length) { } else {
return Observable.of({}); // do not throw error, to be able to show message in case of partial copy of files
} return of(err || 'Server error');
return Observable.zip(...batch); }
}); })
);
} else {
// do not throw error, to be able to show message in case of partial copy of files
return Observable.of(err || 'Server error');
}
});
} }
moveNodeAction(nodeEntry, selectionId): Observable<any> { moveNodeAction(nodeEntry, selectionId): Observable<any> {
@ -402,11 +403,11 @@ export class NodeActionsService {
const initialParentId = nodeEntry.parentId; const initialParentId = nodeEntry.parentId;
return this.moveFolderAction(nodeEntry, selectionId) return this.moveFolderAction(nodeEntry, selectionId)
.flatMap((newContent) => { .pipe(mergeMap((newContent) => {
// take no extra action, if folder is moved to the same location // take no extra action, if folder is moved to the same location
if (initialParentId === selectionId) { if (initialParentId === selectionId) {
return Observable.of(newContent); return of(newContent);
} }
const flattenResponse = this.flatten(newContent); const flattenResponse = this.flatten(newContent);
@ -417,24 +418,28 @@ export class NodeActionsService {
// check if folder still exists on location // check if folder still exists on location
return this.getChildByName(initialParentId, nodeEntry.name) return this.getChildByName(initialParentId, nodeEntry.name)
.flatMap((folderOnInitialLocation) => { .pipe(
mergeMap(folderOnInitialLocation => {
if (folderOnInitialLocation) { if (folderOnInitialLocation) {
// Check if there's nodeId for Shared Files // Check if there's nodeId for Shared Files
const nodeEntryId = nodeEntry.nodeId || nodeEntry.id; const nodeEntryId = nodeEntry.nodeId || nodeEntry.id;
// delete it from location // delete it from location
return this.contentApi.deleteNode(nodeEntryId) return this.contentApi
.flatMap(() => { .deleteNode(nodeEntryId)
this.moveDeletedEntries.push(nodeEntry); .pipe(
return Observable.of(newContent); mergeMap(() => {
}); this.moveDeletedEntries.push(nodeEntry);
} return of(newContent);
return Observable.of(newContent); })
}); );
}
return of(newContent);
})
);
} }
return Observable.of(newContent); return of(newContent);
}); }));
} else { } else {
// any other type is treated as 'content' // any other type is treated as 'content'
@ -451,48 +456,51 @@ export class NodeActionsService {
let newDestinationFolder; let newDestinationFolder;
return this.documentListService.moveNode(contentEntryId, selectionId) return this.documentListService.moveNode(contentEntryId, selectionId)
.map((itemMoved) => { .pipe(
return { itemMoved, initialParentId }; map((itemMoved) => {
}) return { itemMoved, initialParentId };
.catch((err) => { }),
let errStatusCode; catchError(err => {
try { let errStatusCode;
const {error: {statusCode}} = JSON.parse(err.message); try {
errStatusCode = statusCode; const {error: {statusCode}} = JSON.parse(err.message);
} catch (e) { // errStatusCode = statusCode;
} } catch (e) { //
}
if (errStatusCode && errStatusCode === 409) { if (errStatusCode && errStatusCode === 409) {
$destinationFolder = this.getChildByName(selectionId, contentEntry.name); $destinationFolder = this.getChildByName(selectionId, contentEntry.name);
$childrenToMove = this.getNodeChildren(contentEntryId); $childrenToMove = this.getNodeChildren(contentEntryId);
return $destinationFolder return $destinationFolder
.flatMap((destination) => { .pipe(
newDestinationFolder = destination; mergeMap((destination) => {
return $childrenToMove; newDestinationFolder = destination;
}) return $childrenToMove;
.flatMap((childrenToMove) => { }),
const batch = []; mergeMap((childrenToMove) => {
childrenToMove.list.entries.forEach((node) => { const batch = [];
if (node.entry.isFolder) { childrenToMove.list.entries.forEach((node) => {
batch.push(this.moveFolderAction(node.entry, newDestinationFolder.entry.id)); if (node.entry.isFolder) {
batch.push(this.moveFolderAction(node.entry, newDestinationFolder.entry.id));
} else {
batch.push(this.moveContentAction(node.entry, newDestinationFolder.entry.id));
}
});
} else { if (!batch.length) {
batch.push(this.moveContentAction(node.entry, newDestinationFolder.entry.id)); return of(batch);
} }
}); return zip(...batch);
})
if (!batch.length) { );
return Observable.of(batch); } else {
} // do not throw error, to be able to show message in case of partial move of files
return Observable.zip(...batch); return of(err);
}); }
} else { })
// do not throw error, to be able to show message in case of partial move of files );
return Observable.of(err);
}
});
} }
moveContentAction(contentEntry, selectionId) { moveContentAction(contentEntry, selectionId) {
@ -500,14 +508,17 @@ export class NodeActionsService {
const contentEntryId = contentEntry.nodeId || contentEntry.id; const contentEntryId = contentEntry.nodeId || contentEntry.id;
const initialParentId = this.getEntryParentId(contentEntry); const initialParentId = this.getEntryParentId(contentEntry);
return this.documentListService.moveNode(contentEntryId, selectionId) return this.documentListService
.map((itemMoved) => { .moveNode(contentEntryId, selectionId)
return { itemMoved, initialParentId }; .pipe(
}) map((itemMoved) => {
.catch((err) => { return { itemMoved, initialParentId };
// do not throw error, to be able to show message in case of partial move of files }),
return Observable.of(err); catchError((err) => {
}); // do not throw error, to be able to show message in case of partial move of files
return of(err);
})
);
} }
getChildByName(parentId, name) { getChildByName(parentId, name) {
@ -525,7 +536,7 @@ export class NodeActionsService {
} }
}, },
(err) => { (err) => {
return Observable.of(err || 'Server error'); return of(err || 'Server error');
}); });
return matchedNodes; return matchedNodes;
} }
@ -599,7 +610,7 @@ export class NodeActionsService {
* @param params optional parameters * @param params optional parameters
*/ */
getNodeChildren(nodeId: string, params?) { getNodeChildren(nodeId: string, params?) {
return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeChildren(nodeId, params)); return from(this.apiService.getInstance().nodes.getNodeChildren(nodeId, params));
} }
// Copied from ADF document-list.service, and added the name parameter // Copied from ADF document-list.service, and added the name parameter
@ -611,7 +622,7 @@ export class NodeActionsService {
* @param name The new name for the copy that would be added on the destination folder * @param name The new name for the copy that would be added on the destination folder
*/ */
copyNode(nodeId: string, targetParentId: string, name?: string) { copyNode(nodeId: string, targetParentId: string, name?: string) {
return Observable.fromPromise(this.apiService.getInstance().nodes.copyNode(nodeId, {targetParentId, name})); return from(this.apiService.getInstance().nodes.copyNode(nodeId, {targetParentId, name}));
} }
public flatten(nDimArray) { public flatten(nDimArray) {

2
src/app/services/profile.resolver.ts
View File

@ -27,7 +27,7 @@ import { Store } from '@ngrx/store';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Resolve, Router } from '@angular/router'; import { Resolve, Router } from '@angular/router';
import { Person } from 'alfresco-js-api'; import { Person } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs';
import { AppStore } from '../store/states/app.state'; import { AppStore } from '../store/states/app.state';
import { SetUserProfileAction } from '../store/actions'; import { SetUserProfileAction } from '../store/actions';
import { ContentApiService } from './content-api.service'; import { ContentApiService } from './content-api.service';

4
src/app/store/effects/download.effects.ts
View File

@ -27,7 +27,7 @@ import { DownloadZipDialogComponent } from '@alfresco/adf-content-services';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material'; import { MatDialog } from '@angular/material';
import { Actions, Effect, ofType } from '@ngrx/effects'; import { Actions, Effect, ofType } from '@ngrx/effects';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { DownloadNodesAction, DOWNLOAD_NODES } from '../actions'; import { DownloadNodesAction, DOWNLOAD_NODES } from '../actions';
import { NodeInfo } from '../models'; import { NodeInfo } from '../models';
import { ContentApiService } from '../../services/content-api.service'; import { ContentApiService } from '../../services/content-api.service';
@ -54,7 +54,7 @@ export class DownloadEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.downloadNodes(selection.nodes); this.downloadNodes(selection.nodes);

6
src/app/store/effects/favorite.effects.ts
View File

@ -25,7 +25,7 @@
import { Effect, Actions, ofType } from '@ngrx/effects'; import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { ADD_FAVORITE, AddFavoriteAction, RemoveFavoriteAction, REMOVE_FAVORITE } from '../actions/favorite.actions'; import { ADD_FAVORITE, AddFavoriteAction, RemoveFavoriteAction, REMOVE_FAVORITE } from '../actions/favorite.actions';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../states'; import { AppStore } from '../states';
@ -49,7 +49,7 @@ export class FavoriteEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.content.addFavorite(selection.nodes); this.content.addFavorite(selection.nodes);
@ -68,7 +68,7 @@ export class FavoriteEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.content.removeFavorite(selection.nodes); this.content.removeFavorite(selection.nodes);

4
src/app/store/effects/library.effects.ts
View File

@ -25,7 +25,7 @@
import { Effect, Actions, ofType } from '@ngrx/effects'; import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { import {
DeleteLibraryAction, DELETE_LIBRARY, DeleteLibraryAction, DELETE_LIBRARY,
CreateLibraryAction, CREATE_LIBRARY CreateLibraryAction, CREATE_LIBRARY
@ -52,7 +52,7 @@ export class SiteEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.library) { if (selection && selection.library) {
this.content.deleteLibrary(selection.library.entry.id); this.content.deleteLibrary(selection.library.entry.id);

24
src/app/store/effects/node.effects.ts
View File

@ -25,7 +25,7 @@
import { Effect, Actions, ofType } from '@ngrx/effects'; import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../states/app.state'; import { AppStore } from '../states/app.state';
import { import {
@ -76,7 +76,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.file) { if (selection && selection.file) {
this.contentService.shareNode(selection.file); this.contentService.shareNode(selection.file);
@ -95,7 +95,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.contentService.unshareNodes(selection.nodes); this.contentService.unshareNodes(selection.nodes);
@ -114,7 +114,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.count > 0) { if (selection && selection.count > 0) {
this.contentService.purgeDeletedNodes( this.contentService.purgeDeletedNodes(
@ -135,7 +135,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.count > 0) { if (selection && selection.count > 0) {
this.contentService.restoreDeletedNodes( this.contentService.restoreDeletedNodes(
@ -156,7 +156,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.count > 0) { if (selection && selection.count > 0) {
this.contentService.deleteNodes(selection.nodes); this.contentService.deleteNodes(selection.nodes);
@ -185,7 +185,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(currentFolder) .select(currentFolder)
.take(1) .pipe(take(1))
.subscribe(node => { .subscribe(node => {
if (node && node.id) { if (node && node.id) {
this.contentService.createFolder(node.id); this.contentService.createFolder(node.id);
@ -204,7 +204,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.folder) { if (selection && selection.folder) {
this.contentService.editFolder(selection.folder); this.contentService.editFolder(selection.folder);
@ -223,7 +223,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.contentService.copyNodes(selection.nodes); this.contentService.copyNodes(selection.nodes);
@ -242,7 +242,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.contentService.moveNodes(selection.nodes); this.contentService.moveNodes(selection.nodes);
@ -261,7 +261,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && !selection.isEmpty) { if (selection && !selection.isEmpty) {
this.contentService.managePermissions( this.contentService.managePermissions(
@ -282,7 +282,7 @@ export class NodeEffects {
} else { } else {
this.store this.store
.select(appSelection) .select(appSelection)
.take(1) .pipe(take(1))
.subscribe(selection => { .subscribe(selection => {
if (selection && selection.file) { if (selection && selection.file) {
this.contentService.manageVersions( this.contentService.manageVersions(

4
src/app/store/effects/upload.effects.ts
View File

@ -28,7 +28,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppStore } from '../states'; import { AppStore } from '../states';
import { UploadFilesAction, UPLOAD_FILES } from '../actions'; import { UploadFilesAction, UPLOAD_FILES } from '../actions';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { FileUtils, FileModel, UploadService } from '@alfresco/adf-core'; import { FileUtils, FileModel, UploadService } from '@alfresco/adf-core';
import { currentFolder } from '../selectors/app.selectors'; import { currentFolder } from '../selectors/app.selectors';
import { UploadFolderAction, UPLOAD_FOLDER } from '../actions/upload.actions'; import { UploadFolderAction, UPLOAD_FOLDER } from '../actions/upload.actions';
@ -85,7 +85,7 @@ export class UploadEffects {
private upload(event: any): void { private upload(event: any): void {
this.store this.store
.select(currentFolder) .select(currentFolder)
.take(1) .pipe(take(1))
.subscribe(node => { .subscribe(node => {
if (node && node.id) { if (node && node.id) {
const input = <HTMLInputElement>event.currentTarget; const input = <HTMLInputElement>event.currentTarget;

4
src/app/store/effects/viewer.effects.ts
View File

@ -25,7 +25,7 @@
import { Effect, Actions, ofType } from '@ngrx/effects'; import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { VIEW_FILE, ViewFileAction } from '../actions'; import { VIEW_FILE, ViewFileAction } from '../actions';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { Store, createSelector } from '@ngrx/store'; import { Store, createSelector } from '@ngrx/store';
@ -64,7 +64,7 @@ export class ViewerEffects {
} else { } else {
this.store this.store
.select(fileToPreview) .select(fileToPreview)
.take(1) .pipe(take(1))
.subscribe(result => { .subscribe(result => {
if (result.selection && result.selection.file) { if (result.selection && result.selection.file) {
const { const {

4
src/app/testing/translation.service.ts
View File

@ -25,7 +25,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { Observable } from 'rxjs/Observable'; import { Observable, of } from 'rxjs';
@Injectable() @Injectable()
export class TranslateServiceMock extends TranslateService { export class TranslateServiceMock extends TranslateService {
@ -34,7 +34,7 @@ export class TranslateServiceMock extends TranslateService {
} }
get(key: string | Array<string>, interpolateParams?: Object): Observable<string | any> { get(key: string | Array<string>, interpolateParams?: Object): Observable<string | any> {
return Observable.of(key); return of(key);
} }
instant(key: string | Array<string>, interpolateParams?: Object): string | any { instant(key: string | Array<string>, interpolateParams?: Object): string | any {

2
src/tsconfig.spec.json
View File

@ -7,6 +7,6 @@
"target": "es5", "target": "es5",
"types": ["jasmine", "node"] "types": ["jasmine", "node"]
}, },
"files": ["test.ts"], "files": ["test.ts", "polyfills.ts"],
"include": ["node_modules", "**/*.spec.ts", "**/*.d.ts"] "include": ["node_modules", "**/*.spec.ts", "**/*.d.ts"]
} }

40
tsconfig.json
View File

@ -1,16 +1,28 @@
{ {
"compileOnSave": false, "compileOnSave": false,
"compilerOptions": { "compilerOptions": {
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"moduleResolution": "node", "moduleResolution": "node",
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"noUnusedLocals": true, "noUnusedLocals": true,
"target": "es5", "target": "es5",
"typeRoots": ["node_modules/@types"], "typeRoots": [
"lib": ["es2017", "dom"] "node_modules/@types"
}, ],
"exclude": ["node_modules"] "lib": [
"es2017",
"dom"
],
"module": "es2015",
"baseUrl": "./"
},
"exclude": [
"node_modules"
],
"angularCompilerOptions": {
"preserveWhitespaces": false
}
} }

3
tslint.json
View File

@ -14,8 +14,7 @@
"eofline": true, "eofline": true,
"forin": true, "forin": true,
"import-blacklist": [ "import-blacklist": [
true, true
"rxjs"
], ],
"import-spacing": true, "import-spacing": true,
"indent": [ "indent": [