core electron integration (#356)

* core electron integration

* test fixes
This commit is contained in:
Denys Vuika
2018-05-14 04:12:45 +01:00
committed by Cilibiu Bogdan
parent daf7d65c03
commit e1ea9fbfc1
7 changed files with 71 additions and 7 deletions

View File

@@ -35,6 +35,7 @@
</adf-upload-button>
<adf-upload-button
*ngIf="!isDesktopApp"
[tooltip]="
(permission.check(node, ['create'])
? 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS'
@@ -46,6 +47,20 @@
[uploadFolders]="true"
[staticTitle]="'APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER' | translate">
</adf-upload-button>
<button
*ngIf="isDesktopApp"
mat-menu-item
[title]="
(permission.check(node, ['create'])
? 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS'
: 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS_NOT_ALLOWED'
) | translate"
[disabled]="!permission.check(node, ['create'])"
(click)="uploadFolderDesktop()">
<mat-icon>file_upload</mat-icon>
<span>{{ 'APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER' | translate }}</span>
</button>
</div>
</adf-sidebar-action-menu>
</div>
@@ -79,4 +94,4 @@
</li>
</ul>
</div>
</div>
</div>

View File

@@ -38,6 +38,7 @@ import { BrowsingFilesService } from '../../common/services/browsing-files.servi
import { NodePermissionService } from '../../common/services/node-permission.service';
import { SidenavComponent } from './sidenav.component';
import { ElectronModule } from '@ngstack/electron';
describe('SidenavComponent', () => {
let fixture;
@@ -61,7 +62,8 @@ describe('SidenavComponent', () => {
MatMenuModule,
MatSnackBarModule,
TranslateModule.forRoot(),
RouterTestingModule
RouterTestingModule,
ElectronModule
],
declarations: [
SidenavComponent

View File

@@ -31,6 +31,7 @@ import { AppConfigService, NotificationService } from '@alfresco/adf-core';
import { BrowsingFilesService } from '../../common/services/browsing-files.service';
import { NodePermissionService } from '../../common/services/node-permission.service';
import { ElectronService } from '@ngstack/electron';
@Component({
selector: 'app-sidenav',
@@ -40,6 +41,7 @@ import { NodePermissionService } from '../../common/services/node-permission.ser
export class SidenavComponent implements OnInit, OnDestroy {
@Input() showLabel: boolean;
isDesktopApp = false;
node: MinimalNodeEntryEntity = null;
navigation = [];
@@ -49,7 +51,8 @@ export class SidenavComponent implements OnInit, OnDestroy {
private notificationService: NotificationService,
private browsingFilesService: BrowsingFilesService,
private appConfig: AppConfigService,
public permission: NodePermissionService
public permission: NodePermissionService,
private electronService: ElectronService
) {}
ngOnInit() {
@@ -59,6 +62,8 @@ export class SidenavComponent implements OnInit, OnDestroy {
this.browsingFilesService.onChangeParent
.subscribe((node: MinimalNodeEntryEntity) => this.node = node)
]);
this.isDesktopApp = this.electronService.isDesktopApp;
}
openSnackMessage(event: any) {
@@ -78,4 +83,8 @@ export class SidenavComponent implements OnInit, OnDestroy {
return Object.keys(data).map((key) => data[key]);
}
uploadFolderDesktop() {
this.electronService.send('core:uploadFolder', this.node.id);
}
}