[ADF-2821] move module sidebar action menu (#3321)

* move module sidebar action menu

* fix core import test

* remove sidebar module

* skip error

* skiperror old versions
This commit is contained in:
Eugenio Romano 2018-05-15 17:15:56 +01:00 committed by GitHub
parent d67f160fdc
commit 35ee120d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 27 additions and 97 deletions

View File

@ -38,7 +38,6 @@ import { UserInfoModule } from './userinfo/userinfo.module';
import { ViewerModule } from './viewer/viewer.module';
import { FormModule } from './form/form.module';
import { SidenavLayoutModule } from './sidenav-layout/sidenav-layout.module';
import { SideBarActionModule } from './sidebar/sidebar-action.module';
import { CommentsModule } from './comments/comments.module';
import { ButtonsMenuModule } from './buttons-menu/buttons-menu.module';
@ -130,7 +129,6 @@ export function providers() {
imports: [
ViewerModule,
SidenavLayoutModule,
SideBarActionModule,
PipeModule,
CommonModule,
DirectiveModule,
@ -164,7 +162,6 @@ export function providers() {
],
exports: [
ViewerModule,
SideBarActionModule,
SidenavLayoutModule,
PipeModule,
CommonModule,
@ -198,7 +195,6 @@ export class CoreModuleLazy {
@NgModule({
imports: [
ViewerModule,
SideBarActionModule,
SidenavLayoutModule,
PipeModule,
CommonModule,
@ -236,7 +232,6 @@ export class CoreModuleLazy {
],
exports: [
ViewerModule,
SideBarActionModule,
SidenavLayoutModule,
PipeModule,
CommonModule,

View File

@ -23,7 +23,6 @@ export * from './pagination/index';
export * from './login/index';
export * from './language-menu/index';
export * from './info-drawer/index';
export * from './sidebar/index';
export * from './data-column/index';
export * from './datatable/index';
export * from './context-menu/index';

View File

@ -1,18 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export * from './public-api';

View File

@ -1,18 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export * from './sidebar-action-menu.component';

View File

@ -1,43 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { NgModule } from '@angular/core';
import { MaterialModule } from '../material.module';
import { SidebarActionMenuComponent, SidebarMenuDirective, SidebarMenuExpandIconDirective, SidebarMenuTitleIconDirective } from './sidebar-action-menu.component';
export function declarations() {
return [
SidebarActionMenuComponent,
SidebarMenuDirective,
SidebarMenuExpandIconDirective,
SidebarMenuTitleIconDirective
];
}
@NgModule({
imports: [
CommonModule,
MaterialModule,
FlexLayoutModule
],
declarations: declarations(),
exports: declarations()
})
export class SideBarActionModule {}

View File

@ -17,10 +17,10 @@
import { Component } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MaterialModule } from '../material.module';
import { MaterialModule } from '../../../material.module';
import { SidebarActionMenuComponent } from './sidebar-action-menu.component';
import { setupTestBed } from '../testing/setupTestBed';
import { CoreTestingModule } from '../testing/core.testing.module';
import { setupTestBed } from '../../../testing/setupTestBed';
import { CoreTestingModule } from '../../../testing/core.testing.module';
describe('SidebarActionMenuComponent', () => {
let element: HTMLElement;

View File

@ -23,6 +23,8 @@ import { SidenavLayoutHeaderDirective } from './directives/sidenav-layout-header
import { SidenavLayoutNavigationDirective } from './directives/sidenav-layout-navigation.directive';
import { SidenavLayoutComponent } from './components/sidenav-layout/sidenav-layout.component';
import { LayoutContainerComponent } from './components/layout-container/layout-container.component';
import { SidebarActionMenuComponent, SidebarMenuDirective,
SidebarMenuExpandIconDirective, SidebarMenuTitleIconDirective } from './components/sidebar-action/sidebar-action-menu.component';
@NgModule({
imports: [
@ -34,14 +36,22 @@ import { LayoutContainerComponent } from './components/layout-container/layout-c
SidenavLayoutContentDirective,
SidenavLayoutNavigationDirective,
SidenavLayoutComponent,
LayoutContainerComponent
LayoutContainerComponent,
SidebarActionMenuComponent,
SidebarMenuDirective,
SidebarMenuExpandIconDirective,
SidebarMenuTitleIconDirective
],
declarations: [
SidenavLayoutHeaderDirective,
SidenavLayoutContentDirective,
SidenavLayoutNavigationDirective,
SidenavLayoutComponent,
LayoutContainerComponent
LayoutContainerComponent,
SidebarActionMenuComponent,
SidebarMenuDirective,
SidebarMenuExpandIconDirective,
SidebarMenuTitleIconDirective
]
})
export class SidenavLayoutModule {}

View File

@ -22,7 +22,7 @@
@import '../viewer/components/txtViewer.component';
@import '../viewer/components/imgViewer.component';
@import '../form/components/form.component';
@import '../sidebar/sidebar-action-menu.component';
@import '../sidenav-layout/components/sidebar-action/sidebar-action-menu.component';
@import '../comments/comment-list.component';
@import '../comments/comments.component';
@import '../sidenav-layout/components/layout-container/layout-container.component';

View File

@ -4594,7 +4594,8 @@
"character": 8,
"fileName": "lib/core/core.module.ts"
},
"name": "SideBarActionModule"
"name": "SideBarActionModule",
"skipError": true
},
{
"position": {

View File

@ -4829,7 +4829,8 @@
"character": 8,
"fileName": "lib/core/core.module.ts"
},
"name": "SideBarActionModule"
"name": "SideBarActionModule",
"skipError": true
},
{
"position": {
@ -4837,7 +4838,8 @@
"character": 8,
"fileName": "lib/core/core.module.ts"
},
"name": "SideBarActionModule"
"name": "SideBarActionModule",
"skipError": true
},
{
"position": {
@ -5879,4 +5881,4 @@
},
"name": "WidgetComponent"
}
]
]

View File

@ -5303,7 +5303,8 @@
"character": 8,
"fileName": "lib/core/core.module.ts"
},
"name": "SideBarActionModule"
"name": "SideBarActionModule",
"skipError": true
},
{
"position": {
@ -5311,7 +5312,8 @@
"character": 8,
"fileName": "lib/core/core.module.ts"
},
"name": "SideBarActionModule"
"name": "SideBarActionModule",
"skipError": true
},
{
"position": {