diff --git a/lib/core/core.module.ts b/lib/core/core.module.ts index 3cd8f5f245..6b66a8ce54 100644 --- a/lib/core/core.module.ts +++ b/lib/core/core.module.ts @@ -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, diff --git a/lib/core/index.ts b/lib/core/index.ts index dabfd5a901..26249a4d00 100644 --- a/lib/core/index.ts +++ b/lib/core/index.ts @@ -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'; diff --git a/lib/core/sidebar/index.ts b/lib/core/sidebar/index.ts deleted file mode 100644 index 4c6ac1d58f..0000000000 --- a/lib/core/sidebar/index.ts +++ /dev/null @@ -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'; diff --git a/lib/core/sidebar/public-api.ts b/lib/core/sidebar/public-api.ts deleted file mode 100644 index 40f4feee03..0000000000 --- a/lib/core/sidebar/public-api.ts +++ /dev/null @@ -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'; diff --git a/lib/core/sidebar/sidebar-action.module.ts b/lib/core/sidebar/sidebar-action.module.ts deleted file mode 100644 index 70dbd7ce8b..0000000000 --- a/lib/core/sidebar/sidebar-action.module.ts +++ /dev/null @@ -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 {} diff --git a/lib/core/sidebar/sidebar-action-menu.component.html b/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.html similarity index 100% rename from lib/core/sidebar/sidebar-action-menu.component.html rename to lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.html diff --git a/lib/core/sidebar/sidebar-action-menu.component.scss b/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.scss similarity index 100% rename from lib/core/sidebar/sidebar-action-menu.component.scss rename to lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.scss diff --git a/lib/core/sidebar/sidebar-action-menu.component.spec.ts b/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts similarity index 96% rename from lib/core/sidebar/sidebar-action-menu.component.spec.ts rename to lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts index d8a861492e..9d83345969 100644 --- a/lib/core/sidebar/sidebar-action-menu.component.spec.ts +++ b/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.spec.ts @@ -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; diff --git a/lib/core/sidebar/sidebar-action-menu.component.ts b/lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts similarity index 100% rename from lib/core/sidebar/sidebar-action-menu.component.ts rename to lib/core/sidenav-layout/components/sidebar-action/sidebar-action-menu.component.ts diff --git a/lib/core/sidenav-layout/sidenav-layout.module.ts b/lib/core/sidenav-layout/sidenav-layout.module.ts index 25f52dbbcf..c2e34236e3 100644 --- a/lib/core/sidenav-layout/sidenav-layout.module.ts +++ b/lib/core/sidenav-layout/sidenav-layout.module.ts @@ -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 {} diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index 1a521cb95b..0fd157337c 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -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'; diff --git a/tools/export-check/export-2.1.0.json b/tools/export-check/export-2.1.0.json index d8c67c2d39..87a687f69e 100644 --- a/tools/export-check/export-2.1.0.json +++ b/tools/export-check/export-2.1.0.json @@ -4594,7 +4594,8 @@ "character": 8, "fileName": "lib/core/core.module.ts" }, - "name": "SideBarActionModule" + "name": "SideBarActionModule", + "skipError": true }, { "position": { diff --git a/tools/export-check/export-2.2.0.json b/tools/export-check/export-2.2.0.json index 3c24d81d87..bcf086269f 100644 --- a/tools/export-check/export-2.2.0.json +++ b/tools/export-check/export-2.2.0.json @@ -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" } -] \ No newline at end of file +] diff --git a/tools/export-check/export-2.3.0.json b/tools/export-check/export-2.3.0.json index 8746233cc9..3fcc927f85 100644 --- a/tools/export-check/export-2.3.0.json +++ b/tools/export-check/export-2.3.0.json @@ -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": {