Move 'pagination' to the core, barrel files for core

demo-shell-ng2/app/components/files/files.component.html

@@ -92,10 +92,10 @@
                 </content-action>
             </content-actions>
         </alfresco-document-list>
-        <alfresco-document-list-pagination
+        <alfresco-pagination
             [provider]="documentList.data"
             [supportedPageSizes]="[5, 10, 15, 20]">
-        </alfresco-document-list-pagination>
+        </alfresco-pagination>
     </alfresco-upload-drag-area>
 </div>
 

demo-shell-ng2/app/components/files/files.component.ts

@@ -25,8 +25,10 @@ import {
     MDL,
     AlfrescoContentService,
     CONTEXT_MENU_DIRECTIVES,
-    AlfrescoPipeTranslate
+    AlfrescoPipeTranslate/*,
+    PaginationComponent*/
 } from 'ng2-alfresco-core';
+import { PaginationComponent } from 'ng2-alfresco-core';
 import { ALFRESCO_ULPOAD_COMPONENTS } from 'ng2-alfresco-upload';
 import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
 
@@ -42,7 +44,8 @@ declare let __moduleName: string;
         MDL,
         ALFRESCO_ULPOAD_COMPONENTS,
         VIEWERCOMPONENT,
-        CONTEXT_MENU_DIRECTIVES
+        CONTEXT_MENU_DIRECTIVES,
+        PaginationComponent
     ],
     providers: [DOCUMENT_LIST_PROVIDERS],
     pipes: [AlfrescoPipeTranslate]

ng2-components/ng2-alfresco-core/index.ts

@@ -15,37 +15,20 @@
  * limitations under the License.
  */
 
-import { AlfrescoSettingsService } from './src/services/AlfrescoSettingsService.service';
+import {
-import { AlfrescoTranslationLoader } from './src/services/AlfrescoTranslationLoader.service';
+    AlfrescoSettingsService,
-import { AlfrescoTranslationService } from './src/services/AlfrescoTranslationService.service';
+    AlfrescoTranslationLoader,
-import { AlfrescoPipeTranslate } from './src/services/AlfrescoPipeTranslate.service';
+    AlfrescoTranslationService,
-import { AlfrescoAuthenticationService } from './src/services/AlfrescoAuthenticationService.service';
+    AlfrescoPipeTranslate,
-import { AlfrescoContentService } from './src/services/AlfrescoContentService.service';
+    AlfrescoAuthenticationService,
-import { ContextMenuService } from './src/services/context-menu.service';
+    AlfrescoContentService
-import { ContextMenuHolderComponent } from './src/components/context-menu-holder.component';
+} from './src/services/index';
-import { ContextMenuDirective } from './src/components/context-menu.directive';
-import { MDL } from './src/material/MaterialDesignLiteUpgradeElement';
-import { AlfrescoMdlButtonDirective } from './src/material/mdl-button.directive';
-import { AlfrescoMdlMenuDirective } from './src/material/mdl-menu.directive';
 
-export * from './src/services/AlfrescoSettingsService.service';
+import { ContextMenuService } from './src/components/context-menu/context-menu.service';
-export * from './src/services/AlfrescoTranslationLoader.service';
-export * from './src/services/AlfrescoTranslationService.service';
-export * from './src/services/AlfrescoPipeTranslate.service';
-export * from './src/services/AlfrescoAuthenticationService.service';
-export * from './src/services/AlfrescoContentService.service';
 
-// Material Design Lite integration
+export * from './src/services/index';
-export * from './src/material/MaterialDesignLiteUpgradeElement';
+export * from './src/components/index';
-export * from './src/material/mdl-button.directive';
+export * from './src/utils/index';
-export * from './src/material/mdl-menu.directive';
-
-export * from './src/services/context-menu.service';
-export * from './src/components/context-menu-holder.component';
-export * from './src/components/context-menu.directive';
-
-export * from './src/data/pagination-provider';
-export * from './src/utils/object-utils';
 
 export const ALFRESCO_CORE_PROVIDERS: [any] = [
     AlfrescoAuthenticationService,
@@ -57,17 +40,3 @@ export const ALFRESCO_CORE_PROVIDERS: [any] = [
     ContextMenuService
 ];
 
-export const CONTEXT_MENU_PROVIDERS: [any] = [
-    ContextMenuService
-];
-
-export const CONTEXT_MENU_DIRECTIVES: [any] = [
-    ContextMenuHolderComponent,
-    ContextMenuDirective
-];
-
-export const MATERIAL_DESIGN_DIRECTIVES: [any] = [
-    MDL,
-    AlfrescoMdlButtonDirective,
-    AlfrescoMdlMenuDirective
-];

ng2-components/ng2-alfresco-core/package.json

@@ -6,13 +6,14 @@
   "scripts": {
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
-    "build": "npm run tslint && typings install && rimraf dist && tsc && license-check",
+    "build": "npm run tslint && typings install && rimraf dist && tsc && npm run copy-static && license-check",
     "build:w": "npm run tslint && typings install && rimraf dist && npm run watch-task",
     "watch-task": "concurrently \"npm run tsc:w\" \"license-check\"",
     "tslint": "npm run tslint-src && npm run tslint-root",
     "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
     "tslint-root": "tslint -c tslint.json *.ts",
     "licensecheck": "license-check",
+    "copy-static": "cpx \"./src/**/*.{html,css}\" ./dist/src",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "pretest": "npm run build",

ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { describe, it, beforeEach } from '@angular/core/testing';
-import { ContextMenuService } from './../services/context-menu.service';
+import { ContextMenuService } from './context-menu.service';
 import { ContextMenuHolderComponent } from './context-menu-holder.component';
 
 describe('ContextMenuHolderComponent', () => {

ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, HostListener } from '@angular/core';
-import { ContextMenuService } from './../services/context-menu.service';
+import { ContextMenuService } from './context-menu.service';
 
 @Component({
     selector:'context-menu-holder',

ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.spec.ts

@@ -17,7 +17,7 @@
 
 import { describe, it, beforeEach } from '@angular/core/testing';
 import { ContextMenuDirective } from './context-menu.directive';
-import { ContextMenuService } from './../services/context-menu.service';
+import { ContextMenuService } from './context-menu.service';
 
 describe('ContextMenuDirective', () => {
 

ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.ts

@@ -16,7 +16,7 @@
  */
 
 import { Directive, Input, HostListener } from '@angular/core';
-import { ContextMenuService } from './../services/context-menu.service';
+import { ContextMenuService } from './context-menu.service';
 
 @Directive({
     selector:'[context-menu]'

ng2-components/ng2-alfresco-core/src/components/context-menu/index.ts

@@ -0,0 +1,33 @@
+/*!
+ * @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 { ContextMenuService } from './context-menu.service';
+import { ContextMenuHolderComponent } from './context-menu-holder.component';
+import { ContextMenuDirective } from './context-menu.directive';
+
+export * from './context-menu.service';
+export * from './context-menu-holder.component';
+export * from './context-menu.directive';
+
+export const CONTEXT_MENU_PROVIDERS: [any] = [
+    ContextMenuService
+];
+
+export const CONTEXT_MENU_DIRECTIVES: [any] = [
+    ContextMenuHolderComponent,
+    ContextMenuDirective
+];

ng2-components/ng2-alfresco-core/src/components/index.ts

@@ -0,0 +1,20 @@
+/*!
+ * @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 './context-menu/index';
+export * from './material/index';
+export * from './pagination/index';

ng2-components/ng2-alfresco-core/src/components/material/index.ts

@@ -0,0 +1,30 @@
+/*!
+ * @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 { MDL } from './MaterialDesignLiteUpgradeElement';
+import { AlfrescoMdlButtonDirective } from './mdl-button.directive';
+import { AlfrescoMdlMenuDirective } from './mdl-menu.directive';
+
+export * from './MaterialDesignLiteUpgradeElement';
+export * from './mdl-button.directive';
+export * from './mdl-menu.directive';
+
+export const MATERIAL_DESIGN_DIRECTIVES: [any] = [
+    MDL,
+    AlfrescoMdlButtonDirective,
+    AlfrescoMdlMenuDirective
+];

ng2-components/ng2-alfresco-core/src/components/pagination/index.ts

@@ -0,0 +1,19 @@
+/*!
+ * @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 './pagination-provider';
+export * from './pagination.component';

ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts

@@ -16,21 +16,20 @@
  */
 
 import { Component, Input } from '@angular/core';
-import {
+
-    MATERIAL_DESIGN_DIRECTIVES,
+import { MATERIAL_DESIGN_DIRECTIVES } from './../material/index';
-    PaginationProvider
+import { PaginationProvider } from './pagination-provider';
-} from 'ng2-alfresco-core';
 
 declare let __moduleName: string;
 
 @Component({
     moduleId: __moduleName,
-    selector: 'alfresco-document-list-pagination',
+    selector: 'alfresco-pagination',
     templateUrl: './pagination.component.html',
     styleUrls: ['./pagination.component.css'],
     directives: [MATERIAL_DESIGN_DIRECTIVES]
 })
-export class DocumentListPagination {
+export class PaginationComponent {
 
     DEFAULT_PAGE_SIZE: number = 20;
 

ng2-components/ng2-alfresco-core/src/services/index.ts

@@ -0,0 +1,23 @@
+/*!
+ * @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 './AlfrescoSettingsService.service';
+export * from './AlfrescoTranslationLoader.service';
+export * from './AlfrescoTranslationService.service';
+export * from './AlfrescoPipeTranslate.service';
+export * from './AlfrescoAuthenticationService.service';
+export * from './AlfrescoContentService.service';

ng2-components/ng2-alfresco-core/src/utils/index.ts

@@ -0,0 +1,18 @@
+/*!
+ * @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 './object-utils';

ng2-components/ng2-alfresco-documentlist/index.ts

@@ -22,7 +22,6 @@ import { ContentAction } from './src/components/content-action';
 import { ContentActionList } from './src/components/content-action-list';
 import { EmptyFolderContent } from './src/components/empty-folder-content';
 import { DocumentListBreadcrumb } from './src/components/breadcrumb/breadcrumb.component';
-import { DocumentListPagination } from './src/components/pagination/pagination.component';
 
 import { FolderActionsService } from './src/services/folder-actions.service';
 import { DocumentActionsService } from './src/services/document-actions.service';
@@ -36,7 +35,6 @@ export * from './src/components/content-action';
 export * from './src/components/content-action-list';
 export * from './src/components/empty-folder-content';
 export * from './src/components/breadcrumb/breadcrumb.component';
-export * from './src/components/pagination/pagination.component';
 
 // services
 export * from './src/services/folder-actions.service';
@@ -50,8 +48,7 @@ export const DOCUMENT_LIST_DIRECTIVES: [any] = [
     ContentAction,
     ContentActionList,
     EmptyFolderContent,
-    DocumentListBreadcrumb,
+    DocumentListBreadcrumb
-    DocumentListPagination
 ];
 
 export const DOCUMENT_LIST_PROVIDERS: [any] = [