diff --git a/.dockerignore b/.dockerignore index 20cf9cd24e..d7673dbfac 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,3 +14,13 @@ integration tools demo-shell/src/ demo-shell/resources/ +/angular.json +/desktop.ini +/cspell.json +/.travis.yml +/CODE_OF_CONDUCT.md +/.stylelintignore +/ALFRESCOCORS.md +/CONTRIBUTING.md +/appveyor.yml +/BROWSER-SUPPORT.md diff --git a/.gitignore b/.gitignore index 05cf3cd719..ef96eca235 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ src/environments/ /docs/docs.json /protractorFailuresReport coverage/ +/desktop.ini diff --git a/.travis.yml b/.travis.yml index 8f2dc8eba7..5923d9f4bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ jobs: - npm run stylelint || exit 1 - rm -rf tmp && (./scripts/smart-build.sh -b $TRAVIS_BRANCH || exit 1;); - npm run build:dist || exit 1 + - npm run bundlesize-check || exit 1 - stage: Unit test name: core script: diff --git a/README.md b/README.md index 0c76dac03d..1121952421 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,6 @@ travis Status - - travis - Status - Coverage Status @@ -20,6 +16,7 @@

+ ## Introduction See the [Introduction page](INTRODUCTION.md) to get started with the Alfresco Application Development Framework. diff --git a/assets/angular2.png b/assets/angular2.png deleted file mode 100644 index 7355128e27..0000000000 Binary files a/assets/angular2.png and /dev/null differ diff --git a/assets/browserstack.png b/assets/browserstack.png deleted file mode 100644 index 5a0cea27a1..0000000000 Binary files a/assets/browserstack.png and /dev/null differ diff --git a/demo-shell/proxy.conf.js b/demo-shell/proxy.conf.js index 773c3410c6..7da0babb2f 100644 --- a/demo-shell/proxy.conf.js +++ b/demo-shell/proxy.conf.js @@ -15,7 +15,7 @@ module.exports = { } }, "/activiti-app": { - "target": "http://localhost:9999", + "target": "http://localhost:8080", "secure": false, "pathRewrite": { "^/activiti-app/activiti-app": "" diff --git a/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts index d933b7fa3f..62738bfed9 100644 --- a/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts +++ b/demo-shell/src/app/components/content-node-selector/content-node-selector.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewEncapsulation } from '@angular/core'; -import { SitePaging, SiteEntry, MinimalNodeEntryEntity } from 'alfresco-js-api'; +import { SitePaging, SiteEntry, MinimalNodeEntryEntity } from '@alfresco/js-api'; import { ShareDataRow } from '@alfresco/adf-content-services'; import { DataRow, DataColumn, ThumbnailService } from '@alfresco/adf-core'; @@ -44,20 +44,20 @@ export class ContentNodeSelectorComponent { customImageResolver: any = null; defaultSites: SiteEntry[] = [ - { entry: { title: 'MINE', guid: '-my-' } }, - { entry: { title: 'ROOTY', guid: '-root-' } }]; + new SiteEntry({ entry: { title: 'MINE', guid: '-my-' } }), + new SiteEntry({ entry: { title: 'ROOTY', guid: '-root-' } })]; - customSites: SitePaging = { + customSites: SitePaging = new SitePaging({ list: { entries: [ { entry: { title: 'MINE', guid: '-my-' } }, { entry: { title: 'ROOTY', guid: '-root-' } }], pagination: {} } - }; + }); onClickAddSite() { - const newSiteEntry: SiteEntry = { entry: { title: this.customSideTitle, guid: this.customSideGuid } }; + const newSiteEntry: SiteEntry = new SiteEntry({ entry: { title: this.customSideTitle, guid: this.customSideGuid } }); this.customSites.list.entries.push(newSiteEntry); this.customSideGuid = ''; this.customSideTitle = ''; diff --git a/demo-shell/src/app/components/file-view/file-view.component.html b/demo-shell/src/app/components/file-view/file-view.component.html index 25490e12a2..78aeeee989 100644 --- a/demo-shell/src/app/components/file-view/file-view.component.html +++ b/demo-shell/src/app/components/file-view/file-view.component.html @@ -208,16 +208,6 @@

-

- - Allow Share - -

-

+ [nodeId]="nodeId"> diff --git a/demo-shell/src/app/components/permissions/demo-permissions.component.ts b/demo-shell/src/app/components/permissions/demo-permissions.component.ts index 6e8c5752d5..f6a7a5fafb 100644 --- a/demo-shell/src/app/components/permissions/demo-permissions.component.ts +++ b/demo-shell/src/app/components/permissions/demo-permissions.component.ts @@ -18,7 +18,7 @@ import { Component, Optional, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { PermissionListComponent, NodePermissionDialogService } from '@alfresco/adf-content-services'; -import { MinimalNodeEntryEntity } from 'alfresco-js-api'; +import { MinimalNodeEntryEntity } from '@alfresco/js-api'; import { NodesApiService, NotificationService } from '@alfresco/adf-core'; @Component({ diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts index 12d4cf205d..15493d9a11 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.ts +++ b/demo-shell/src/app/components/process-service/process-service.component.ts @@ -33,7 +33,7 @@ import { ProcessInstanceFilterRepresentation, Pagination, UserProcessInstanceFilterRepresentation -} from 'alfresco-js-api'; +} from '@alfresco/js-api'; import { FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService, FormService, DynamicTableRow, ValidateDynamicTableRowEvent, AppConfigService, PaginationComponent, UserPreferenceValues diff --git a/demo-shell/src/app/components/search/search-bar.component.ts b/demo-shell/src/app/components/search/search-bar.component.ts index 85c9421b7f..d4fe4da066 100644 --- a/demo-shell/src/app/components/search/search-bar.component.ts +++ b/demo-shell/src/app/components/search/search-bar.component.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { MinimalNodeEntity } from 'alfresco-js-api'; +import { MinimalNodeEntity } from '@alfresco/js-api'; import { PreviewService } from '../../services/preview.service'; @Component({ diff --git a/demo-shell/src/app/components/search/search-config-test.service.ts b/demo-shell/src/app/components/search/search-config-test.service.ts index fcf72d6352..78bb3d28fa 100644 --- a/demo-shell/src/app/components/search/search-config-test.service.ts +++ b/demo-shell/src/app/components/search/search-config-test.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { QueryBody } from 'alfresco-js-api'; +import { QueryBody } from '@alfresco/js-api'; import { SearchConfigurationInterface } from '@alfresco/adf-core'; export class TestSearchConfigurationService implements SearchConfigurationInterface { diff --git a/demo-shell/src/app/components/search/search-extended.component.ts b/demo-shell/src/app/components/search/search-extended.component.ts index 8f6842b746..109b1d3534 100644 --- a/demo-shell/src/app/components/search/search-extended.component.ts +++ b/demo-shell/src/app/components/search/search-extended.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewChild, ViewEncapsulation } from '@angular/core'; -import { NodePaging, Pagination, QueryBody, MinimalNodeEntity } from 'alfresco-js-api'; +import { NodePaging, Pagination, QueryBody, MinimalNodeEntity } from '@alfresco/js-api'; import { SearchComponent } from '@alfresco/adf-content-services'; import { ThumbnailService } from '@alfresco/adf-core'; import { SearchService, SearchConfigurationService } from '@alfresco/adf-core'; diff --git a/demo-shell/src/app/components/search/search-result.component.ts b/demo-shell/src/app/components/search/search-result.component.ts index d1c08f7b9a..9b834590cd 100644 --- a/demo-shell/src/app/components/search/search-result.component.ts +++ b/demo-shell/src/app/components/search/search-result.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit, Optional, OnDestroy } from '@angular/core'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { NodePaging, Pagination } from 'alfresco-js-api'; +import { NodePaging, Pagination, ResultSetPaging } from '@alfresco/js-api'; import { SearchQueryBuilderService } from '@alfresco/adf-content-services'; import { UserPreferencesService, SearchService, AppConfigService } from '@alfresco/adf-core'; import { Subscription } from 'rxjs'; @@ -61,10 +61,10 @@ export class SearchResultComponent implements OnInit, OnDestroy { this.isLoading = true; }), - this.queryBuilder.executed.subscribe((data) => { + this.queryBuilder.executed.subscribe((resultSetPaging: ResultSetPaging) => { this.queryBuilder.paging.skipCount = 0; - this.onSearchResultLoaded(data); + this.onSearchResultLoaded(resultSetPaging); this.isLoading = false; }) ); @@ -79,7 +79,12 @@ export class SearchResultComponent implements OnInit, OnDestroy { this.queryBuilder.update(); } else { this.queryBuilder.userQuery = null; - this.queryBuilder.executed.next({ list: { pagination: { totalItems: 0 }, entries: [] } }); + this.queryBuilder.executed.next(new ResultSetPaging({ + list: { + pagination: { totalItems: 0 }, + entries: [] + } + })); } }); } @@ -101,9 +106,9 @@ export class SearchResultComponent implements OnInit, OnDestroy { this.subscriptions = []; } - onSearchResultLoaded(nodePaging: NodePaging) { - this.data = nodePaging; - this.pagination = { ...nodePaging.list.pagination }; + onSearchResultLoaded(resultSetPaging: ResultSetPaging) { + this.data = resultSetPaging; + this.pagination = { ...resultSetPaging.list.pagination }; } onRefreshPagination(pagination: Pagination) { diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.ts b/demo-shell/src/app/components/trashcan/trashcan.component.ts index f45ff9e96a..e6a4d3e334 100644 --- a/demo-shell/src/app/components/trashcan/trashcan.component.ts +++ b/demo-shell/src/app/components/trashcan/trashcan.component.ts @@ -19,7 +19,7 @@ import { Component, ViewChild } from '@angular/core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; import { UserPreferencesService, UserPreferenceValues, RestoreMessageModel, NotificationService } from '@alfresco/adf-core'; import { Router } from '@angular/router'; -import { PathInfoEntity } from 'alfresco-js-api'; +import { PathInfoEntity } from '@alfresco/js-api'; @Component({ templateUrl: './trashcan.component.html', diff --git a/demo-shell/src/tsconfig.dev.json b/demo-shell/src/tsconfig.dev.json index e366bcde70..c136985665 100644 --- a/demo-shell/src/tsconfig.dev.json +++ b/demo-shell/src/tsconfig.dev.json @@ -8,8 +8,8 @@ "skipLibCheck": false, "types": [], "paths": { - "alfresco-js-api": [ - "../../node_modules/alfresco-js-api/dist/alfresco-js-api.js" + "@alfresco/js-api": [ + "../../node_modules/@alfresco/js-api" ], "rxjs/*": [ "../../node_modules/rxjs/*" diff --git a/docs/core/viewer.component.md b/docs/core/viewer.component.md index 1b19338b18..0c9f527feb 100644 --- a/docs/core/viewer.component.md +++ b/docs/core/viewer.component.md @@ -38,7 +38,7 @@ Using with node id: + [nodeId]="'d367023a-7ebe-4f3a-a7d0-4f27c43f1045'"> ``` @@ -106,7 +106,6 @@ See the [Custom layout](#custom-layout) section for full details of all availabl | thumbnailsTemplate | [`TemplateRef`](https://angular.io/api/core/TemplateRef)`` | null | The template for the pdf thumbnails. | | urlFile | `string` | "" | If you want to load an external file that does not come from ACS you can use this URL to specify where to load the file from. | | urlFileViewer | `string` | null | Viewer to use with the `urlFile` address (`pdf`, `image`, `media`, `text`). Used when `urlFile` has no filename and extension. | -| fileNodeId | `void` | | (**Deprecated:** 2.4.0 use nodeId) Node Id of the file to load. | ### Events @@ -147,7 +146,7 @@ Below is the most simple integration of the Viewer and + [nodeId]="nodeId"> ``` @@ -276,7 +275,7 @@ the [Viewer component](../core/viewer.component.md). Below is an example that sh to handle 3D data files: ```html - + @@ -295,7 +294,7 @@ Note: you need to add the `ng2-3d-editor` dependency to your `package.json` file You can define multiple `adf-viewer-extension` templates if required: ```html - + @@ -377,7 +376,7 @@ transclusion, which will display all content placed inside the ` @@ -424,7 +423,7 @@ You can enable a custom "Open With" menu by providing at least one action inside `adf-viewer-open-with` tag: ```html - + - -