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

[ACA-1407] Version Manager - file name conflict message (#398)

Browse Source 
* upoad file conflict message

* SnackbarErrorAction
This commit is contained in:
Cilibiu Bogdan
2018-06-12 09:51:57 +03:00
committed by Denys Vuika
parent 8d58d00c08
commit 9076c7ee9f
9 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/recent-files/recent-files.component.spec.ts
View File

@@ -30,7 +30,7 @@ import { RouterTestingModule } from '@angular/router/testing';
import { HttpClientModule } from '@angular/common/http';
import {
NotificationService, TranslationService, TranslationMock,
NodesApiService, AlfrescoApiService, ContentService,
NodesApiService, AlfrescoApiService, ContentService, UploadService,
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService, AuthenticationService,
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
@@ -99,7 +99,8 @@ describe('RecentFiles Routed Component', () => {
NodesApiService,
DocumentListService,
ThumbnailService,
CustomResourcesService
CustomResourcesService,
UploadService
],
schemas: [ NO_ERRORS_SCHEMA ]
})

6
src/app/components/recent-files/recent-files.component.ts
View File

@@ -26,7 +26,7 @@
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { UserPreferencesService } from '@alfresco/adf-core';
import { UserPreferencesService, UploadService } from '@alfresco/adf-core';
import { ContentManagementService } from '../../common/services/content-management.service';
import { PageComponent } from '../page.component';
@@ -43,6 +43,7 @@ export class RecentFilesComponent extends PageComponent implements OnInit {
router: Router,
route: ActivatedRoute,
store: Store<AppStore>,
private uploadService: UploadService,
private content: ContentManagementService,
public permission: NodePermissionService,
preferences: UserPreferencesService) {
@@ -55,7 +56,8 @@ export class RecentFilesComponent extends PageComponent implements OnInit {
this.subscriptions = this.subscriptions.concat([
this.content.nodesDeleted.subscribe(() => this.reload()),
this.content.nodesMoved.subscribe(() => this.reload()),
this.content.nodesRestored.subscribe(() => this.reload())
this.content.nodesRestored.subscribe(() => this.reload()),
this.uploadService.fileUploadError.subscribe((error) => this.onFileUploadedError(error))
]);
}