From c3561510b96fe6efd0399709f16a56400385a8c8 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 4 Jul 2017 09:47:29 +0200 Subject: [PATCH] [ADF-868] Use new ADF prefix in all tags (#2035) * use new ADF prefix in all thr tag * fix failing test * fix datatable test --- ng2-components/README.md | 103 +++++++++--------- .../custom-loaders/generateListComponent.js | 17 +-- .../ng2-activiti-analytics/README.md | 12 +- .../analytics-generator.component.ts | 2 +- .../analytics-report-heat-map.component.html | 2 +- .../src/components/analytics.component.html | 4 +- .../src/components/analytics.component.ts | 2 +- .../ng2-activiti-diagrams/README.md | 8 +- ...diagram-alfresco-publish-task.component.ts | 2 +- ...gram-container-service-task.component.html | 4 +- .../src/components/diagram.component.spec.ts | 24 ++-- .../src/components/diagram.component.ts | 2 +- ...am-icon-alfresco-publish-task.component.ts | 2 +- ng2-components/ng2-activiti-form/README.md | 40 +++---- .../components/activiti-content.component.ts | 2 +- .../src/components/activiti-form.component.ts | 2 +- .../activiti-start-form.component.ts | 2 +- .../display-value/display-value.widget.html | 4 +- .../ng2-activiti-processlist/README.md | 40 +++---- .../components/activiti-filters.component.ts | 2 +- .../activiti-process-comments.component.ts | 2 +- ...ti-process-instance-details.component.html | 8 +- ...viti-process-instance-details.component.ts | 2 +- ...iti-process-instance-header.component.html | 2 +- ...iviti-process-instance-header.component.ts | 2 +- ...viti-process-instance-tasks.component.html | 4 +- ...tiviti-process-instance-tasks.component.ts | 2 +- ...-process-instance-variables.component.html | 4 +- ...ocess-instance-variables.component.spec.ts | 4 +- ...ti-process-instance-variables.component.ts | 2 +- .../activiti-processlist.component.html | 4 +- .../activiti-processlist.component.ts | 2 +- .../activiti-start-process.component.html | 4 +- .../activiti-start-process.component.ts | 2 +- ...adf-process-attachment-list.component.html | 4 +- ...-process-attachment-list.component.spec.ts | 4 +- .../ng2-activiti-tasklist/README.md | 46 ++++---- .../src/components/activiti-apps.component.ts | 2 +- .../activiti-checklist.component.ts | 2 +- .../components/activiti-comments.component.ts | 2 +- .../components/activiti-filters.component.ts | 2 +- .../activiti-people-search.component.ts | 2 +- .../components/activiti-people.component.html | 4 +- .../components/activiti-people.component.ts | 2 +- .../activiti-start-task.component.ts | 2 +- .../activiti-task-details.component.html | 20 ++-- .../activiti-task-details.component.ts | 2 +- .../activiti-task-header.component.ts | 2 +- .../activiti-tasklist.component.html | 4 +- .../components/activiti-tasklist.component.ts | 2 +- .../components/adf-people-list.component.html | 4 +- .../adf-task-attachment-list.component.html | 4 +- ...adf-task-attachment-list.component.spec.ts | 4 +- .../context-menu/context-menu.directive.ts | 2 +- .../material/mdl-button.directive.ts | 2 +- .../components/material/mdl-menu.directive.ts | 2 +- .../material/mdl-textfield.directive.ts | 2 +- .../ng2-alfresco-datatable/README.md | 26 ++--- .../datatable/datatable-cell.component.ts | 2 +- .../datatable/datatable.component.html | 4 +- .../datatable/datatable.component.ts | 2 +- .../pagination/pagination.component.ts | 2 +- .../ng2-alfresco-documentlist/README.md | 86 +++++++-------- .../components/document-list.component.html | 12 +- .../src/components/document-list.component.ts | 2 +- .../document-menu-action.component.ts | 2 +- ng2-components/ng2-alfresco-login/README.md | 32 +++--- .../components/alfresco-login.component.ts | 2 +- ng2-components/ng2-alfresco-search/README.md | 8 +- .../alfresco-search-autocomplete.component.ts | 2 +- .../alfresco-search-control.component.html | 4 +- .../alfresco-search-control.component.spec.ts | 16 +-- .../alfresco-search-control.component.ts | 2 +- .../components/alfresco-search.component.html | 8 +- .../components/alfresco-search.component.ts | 2 +- ng2-components/ng2-alfresco-tag/README.md | 8 +- .../src/components/tag-actions.component.ts | 2 +- .../src/components/tag-list.component.ts | 2 +- .../src/components/tag-node-list.component.ts | 2 +- ng2-components/ng2-alfresco-upload/README.md | 16 +-- .../file-uploading-dialog.component.html | 2 +- .../file-uploading-list.component.ts | 2 +- .../src/components/upload-button.component.ts | 2 +- .../components/upload-drag-area.component.ts | 2 +- .../ng2-alfresco-userinfo/README.md | 2 +- .../src/components/user-info.component.ts | 2 +- ng2-components/ng2-alfresco-viewer/README.md | 16 +-- .../src/components/viewer.component.ts | 2 +- .../ng2-alfresco-webscript/README.md | 20 ++-- .../src/webscript.component.ts | 6 +- ng2-components/package.json | 2 +- scripts/README.md | 5 +- scripts/npm-add-pkg.sh | 7 -- scripts/npm-build-all-demo.sh | 74 ------------- scripts/npm-clean.sh | 14 --- 95 files changed, 373 insertions(+), 471 deletions(-) delete mode 100755 scripts/npm-build-all-demo.sh diff --git a/ng2-components/README.md b/ng2-components/README.md index b1b15a1c66..92e0da61b7 100644 --- a/ng2-components/README.md +++ b/ng2-components/README.md @@ -21,20 +21,19 @@ ### Components -- [adf-card-view](ng2-alfresco-core/README.md) - [adf-accordion-group](ng2-alfresco-core/README.md) - [adf-accordion](ng2-alfresco-core/README.md) +- [adf-card-view](ng2-alfresco-core/README.md) - [adf-toolbar](ng2-alfresco-core/README.md) ### Directives -- [context-menu](ng2-alfresco-core/README.md) -- [alfresco-mdl-textfield](ng2-alfresco-core/README.md) -- [alfresco-mdl-menu](ng2-alfresco-core/README.md) -- [alfresco-mdl-button](ng2-alfresco-core/README.md) -- [mdl](ng2-alfresco-core/README.md) +- [adf-context-menu](ng2-alfresco-core/README.md) +- [adf-mdl-menu](ng2-alfresco-core/README.md) +- [adf-mdl-textfield](ng2-alfresco-core/README.md) +- [adf-mdl-button](ng2-alfresco-core/README.md) - [adf-upload](ng2-alfresco-core/README.md) ## Content service @@ -42,27 +41,27 @@ ### Components -- [alfresco-viewer](ng2-alfresco-viewer/README.md) -- [ng2-alfresco-userinfo](ng2-alfresco-userinfo/README.md) -- [alfresco-file-uploading-list](ng2-alfresco-upload/README.md) -- [alfresco-upload-button](ng2-alfresco-upload/README.md) -- [alfresco-upload-drag-area](ng2-alfresco-upload/README.md) -- [alfresco-tag-node-list](ng2-alfresco-tag/README.md) -- [alfresco-tag-list](ng2-alfresco-tag/README.md) -- [alfresco-tag-node-actions-list](ng2-alfresco-tag/README.md) +- [adf-userinfo](ng2-alfresco-userinfo/README.md) +- [adf-viewer](ng2-alfresco-viewer/README.md) +- [adf-file-uploading-list](ng2-alfresco-upload/README.md) +- [adf-upload-button](ng2-alfresco-upload/README.md) +- [adf-upload-drag-area](ng2-alfresco-upload/README.md) +- [adf-tag-node-list](ng2-alfresco-tag/README.md) +- [adf-tag-list](ng2-alfresco-tag/README.md) +- [adf-tag-node-actions-list](ng2-alfresco-tag/README.md) +- [adf-login](ng2-alfresco-login/README.md) +- [adf-search-autocomplete](ng2-alfresco-search/README.md) +- [adf-search-control](ng2-alfresco-search/README.md) +- [adf-search](ng2-alfresco-search/README.md) - [adf-like](ng2-alfresco-social/README.md) - [adf-rating](ng2-alfresco-social/README.md) -- [alfresco-search-autocomplete](ng2-alfresco-search/README.md) -- [alfresco-search-control](ng2-alfresco-search/README.md) -- [alfresco-search](ng2-alfresco-search/README.md) -- [alfresco-login](ng2-alfresco-login/README.md) -- [adf-breadcrumb, alfresco-document-list-breadcrumb](ng2-alfresco-documentlist/README.md) -- [alfresco-document-menu-action](ng2-alfresco-documentlist/README.md) -- [alfresco-document-list](ng2-alfresco-documentlist/README.md) -- [alfresco-datatable-cell](ng2-alfresco-datatable/README.md) -- [alfresco-datatable](ng2-alfresco-datatable/README.md) -- [alfresco-pagination](ng2-alfresco-datatable/README.md) -- [alfresco-webscript-get](ng2-alfresco-webscript/README.md) +- [adf-webscript-get](ng2-alfresco-webscript/README.md) +- [adf-breadcrumb](ng2-alfresco-documentlist/README.md) +- [adf-document-menu-action](ng2-alfresco-documentlist/README.md) +- [adf-document-list](ng2-alfresco-documentlist/README.md) +- [adf-pagination](ng2-alfresco-datatable/README.md) +- [adf-datatable](ng2-alfresco-datatable/README.md) +- [adf-datatable-cell](ng2-alfresco-datatable/README.md) @@ -73,37 +72,37 @@ ### components -- [diagram-icon-alfresco-publish-task](ng2-activiti-diagrams/README.md) -- [diagram-alfresco-publish-task](ng2-activiti-diagrams/README.md) -- [activiti-process-instance-comments](ng2-activiti-processlist/README.md) -- [activiti-process-instance-variables](ng2-activiti-processlist/README.md) -- [activiti-process-instance-tasks](ng2-activiti-processlist/README.md) -- [activiti-process-instance-header](ng2-activiti-processlist/README.md) -- [adf-people-list](ng2-activiti-tasklist/README.md) +- [adf-publish-task](ng2-activiti-diagrams/README.md) +- [adf-publish-task](ng2-activiti-diagrams/README.md) - [adf-create-task-attachment](ng2-activiti-tasklist/README.md) -- [activiti-people-search](ng2-activiti-tasklist/README.md) -- [activiti-start-task](ng2-activiti-tasklist/README.md) -- [activiti-task-details](ng2-activiti-tasklist/README.md) -- [activiti-filters](ng2-activiti-tasklist/README.md) -- [activiti-task-header](ng2-activiti-tasklist/README.md) -- [activiti-people](ng2-activiti-tasklist/README.md) +- [adf-people-list](ng2-activiti-tasklist/README.md) - [adf-task-attachment-list](ng2-activiti-tasklist/README.md) -- [activiti-comments](ng2-activiti-tasklist/README.md) -- [activiti-checklist](ng2-activiti-tasklist/README.md) -- [activiti-tasklist](ng2-activiti-tasklist/README.md) -- [activiti-apps](ng2-activiti-tasklist/README.md) -- [activiti-diagram](ng2-activiti-diagrams/README.md) +- [adf-people-search](ng2-activiti-tasklist/README.md) +- [adf-start-task](ng2-activiti-tasklist/README.md) +- [adf-task-details](ng2-activiti-tasklist/README.md) +- [adf-filters](ng2-activiti-tasklist/README.md) +- [adf-task-header](ng2-activiti-tasklist/README.md) +- [adf-people](ng2-activiti-tasklist/README.md) +- [adf-comments](ng2-activiti-tasklist/README.md) +- [adf-checklist](ng2-activiti-tasklist/README.md) +- [adf-tasklist](ng2-activiti-tasklist/README.md) +- [adf-apps](ng2-activiti-tasklist/README.md) +- [adf-process-instance-comments](ng2-activiti-processlist/README.md) +- [adf-process-instance-variables](ng2-activiti-processlist/README.md) +- [adf-process-instance-tasks](ng2-activiti-processlist/README.md) +- [adf-process-instance-header](ng2-activiti-processlist/README.md) +- [adf-diagram](ng2-activiti-diagrams/README.md) - [adf-create-process-attachment](ng2-activiti-processlist/README.md) - [adf-process-attachment-list](ng2-activiti-processlist/README.md) -- [activiti-start-process](ng2-activiti-processlist/README.md) -- [activiti-process-instance-details](ng2-activiti-processlist/README.md) -- [activiti-process-instance-filters](ng2-activiti-processlist/README.md) -- [activiti-process-instance-list](ng2-activiti-processlist/README.md) -- [activiti-analytics-generator](ng2-activiti-analytics/README.md) -- [activiti-analytics](ng2-activiti-analytics/README.md) -- [activiti-start-form](ng2-activiti-form/README.md) -- [activiti-content](ng2-activiti-form/README.md) -- [activiti-form](ng2-activiti-form/README.md) +- [adf-start-process](ng2-activiti-processlist/README.md) +- [adf-process-instance-details](ng2-activiti-processlist/README.md) +- [adf-process-instance-list](ng2-activiti-processlist/README.md) +- [adf-process-instance-filters](ng2-activiti-processlist/README.md) +- [adf-start-form](ng2-activiti-form/README.md) +- [adf-content](ng2-activiti-form/README.md) +- [adf-form](ng2-activiti-form/README.md) +- [adf-analytics-generator](ng2-activiti-analytics/README.md) +- [adf-analytics](ng2-activiti-analytics/README.md) diff --git a/ng2-components/config/custom-loaders/generateListComponent.js b/ng2-components/config/custom-loaders/generateListComponent.js index db3e56d6a0..13e508cadb 100644 --- a/ng2-components/config/custom-loaders/generateListComponent.js +++ b/ng2-components/config/custom-loaders/generateListComponent.js @@ -47,17 +47,18 @@ function generateListComponent(currentFileContent, webpackInstance) { var componentSection = componentReg.exec(currentFileContent); if (componentSection) { - var selectorReg = /(selector)(\s?):(\s?)('|")((.|)*)('|")/gm; + + var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g; var selector = selectorReg.exec(componentSection[0]); - - if (selector) { - if (selector[0].indexOf('alfresco') > 0 || selector[0].indexOf('activiti') > 0 || selector[0].indexOf('adf') > 0) { - var selector = selector[0].replace("selector: '[", "").replace("']", '').replace("]", '').replace("selector: '", "").replace("'", ''); + if (selector) { var removeRoot = webpackInstance.resourcePath.substr(webpackInstance.resourcePath.indexOf('/ng2-components') + 16, webpackInstance.resourcePath.length); var url = removeRoot.substr(0, removeRoot.indexOf('src')) + 'README.md'; - var link = '- [' + selector + '](' + url + ')'; + + var link = '- [' + selector[0] + '](' + url + ')'; + + // console.log(link); if (webpackInstance.resourcePath.match('ng2-alfresco-core')) { readmeContent = readmeContent.replace('', '\n' + link); @@ -68,14 +69,14 @@ function generateListComponent(currentFileContent, webpackInstance) { } } } - } + var directiveReg = /(@Directive)(\s?)\((\s?){(\s?)((.|\n)*)}(\s?)\)/gm; var directiveSection = directiveReg.exec(currentFileContent); if (directiveSection) { - var selectorReg = /(selector)(\s?):(\s?)('|")((.|)*)('|")/gm; + var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g; var selector = selectorReg.exec(directiveSection[0]); if (selector) { diff --git a/ng2-components/ng2-activiti-analytics/README.md b/ng2-components/ng2-activiti-analytics/README.md index e4cbe26cdf..30dcd3a5a3 100644 --- a/ng2-components/ng2-activiti-analytics/README.md +++ b/ng2-components/ng2-activiti-analytics/README.md @@ -68,10 +68,10 @@ The component shows the list of all the available reports The component shows the charts related to the reportId passed as input ```html - - + ``` ### Properties @@ -86,11 +86,11 @@ The component shows the charts related to the reportId passed as input You can also hide chart parameters UI by setting the `hideParameters` to `true`: ```html - - + ``` ![Analytics-without-parameters](docs/assets/analytics-without-parameters.png) @@ -109,10 +109,10 @@ You can also hide chart parameters UI by setting the `hideParameters` to `true`: The component generate and show the charts ```html - - + ``` ### Properties diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts index dec0e96d30..221bcb7d81 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts @@ -22,7 +22,7 @@ import { ReportQuery } from '../models/report.model'; import { Chart } from '../models/chart.model'; @Component({ - selector: 'activiti-analytics-generator', + selector: 'adf-analytics-generator, activiti-analytics-generator', templateUrl: './analytics-generator.component.html', styleUrls: ['./analytics-generator.component.css'] }) diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html index b61bbc4257..5b06f92294 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html @@ -4,6 +4,6 @@ - +
No metric found
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index 134e460d86..8193e0f7ea 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -8,8 +8,8 @@ (onEdit)="onEditReport($event)"> - - + diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 4e9b503859..bfc1608968 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -22,7 +22,7 @@ import { ReportQuery } from '../models/report.model'; import { AnalyticsGeneratorComponent } from './analytics-generator.component'; @Component({ - selector: 'activiti-analytics', + selector: 'adf-analytics, activiti-analytics', templateUrl: './analytics.component.html', styleUrls: ['./analytics.component.css'] }) diff --git a/ng2-components/ng2-activiti-diagrams/README.md b/ng2-components/ng2-activiti-diagrams/README.md index 91cc1ad69e..a8b259b3a4 100644 --- a/ng2-components/ng2-activiti-diagrams/README.md +++ b/ng2-components/ng2-activiti-diagrams/README.md @@ -36,17 +36,17 @@ npm install ng2-activiti-diagrams This component shows the diagram of a process. ```html - - + ``` Or below component shows the diagram of a running process instance with the activities highlighted according to their state (Active/Completed/Pending). ```html - - + ``` ### Properties diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts index e2bfee11ad..d540e0211c 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-alfresco-publish-task.component.ts @@ -18,7 +18,7 @@ import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core'; @Component({ - selector: 'diagram-alfresco-publish-task', + selector: 'adf-diagram-publish-task, diagram-alfresco-publish-task', templateUrl: './diagram-alfresco-publish-task.component.html' }) export class DiagramAlfrescoPublishTaskComponent { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.html b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.html index ffca2963c4..0494733cb9 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.html +++ b/ng2-components/ng2-activiti-diagrams/src/components/activities/diagram-container-service-task.component.html @@ -9,7 +9,7 @@
- +
@@ -23,4 +23,4 @@
-
\ No newline at end of file + diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts index e604f7b88d..5a91ca98be 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts @@ -428,14 +428,14 @@ describe('Test ng2-activiti-diagrams ', () => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); - let task: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-rect'); + let task: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-rect'); expect(task).not.toBeNull(); - let taskText: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-multiline-text'); + let taskText: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-multiline-text'); expect(taskText).not.toBeNull(); expect(taskText.attributes[1].value).toEqual('Fake Alfresco Publish task'); - let iconTask: any = element.querySelector('diagram-alfresco-publish-task > diagram-icon-alfresco-publish-task >' + + let iconTask: any = element.querySelector('adf-diagram-publish-task > diagram-icon-alfresco-publish-task >' + ' raphael-icon-alfresco-publish'); expect(iconTask).not.toBeNull(); @@ -2369,14 +2369,14 @@ describe('Test ng2-activiti-diagrams ', () => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); - let task: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-rect'); + let task: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-rect'); expect(task).not.toBeNull(); - let taskText: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-multiline-text'); + let taskText: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-multiline-text'); expect(taskText).not.toBeNull(); expect(taskText.attributes[1].value).toEqual('Fake Alfresco Publish task'); - let iconTask: any = element.querySelector('diagram-alfresco-publish-task > diagram-icon-alfresco-publish-task >' + + let iconTask: any = element.querySelector('adf-diagram-publish-task > diagram-icon-alfresco-publish-task >' + ' raphael-icon-alfresco-publish'); expect(iconTask).not.toBeNull(); @@ -2399,14 +2399,14 @@ describe('Test ng2-activiti-diagrams ', () => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); - let task: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-rect[ng-reflect-stroke="#017501"]'); + let task: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-rect[ng-reflect-stroke="#017501"]'); expect(task).not.toBeNull(); - let taskText: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-multiline-text'); + let taskText: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-multiline-text'); expect(taskText).not.toBeNull(); expect(taskText.attributes[1].value).toEqual('Fake Alfresco Publish task'); - let iconTask: any = element.querySelector('diagram-alfresco-publish-task > diagram-icon-alfresco-publish-task >' + + let iconTask: any = element.querySelector('adf-diagram-publish-task > diagram-icon-alfresco-publish-task >' + ' raphael-icon-alfresco-publish'); expect(iconTask).not.toBeNull(); @@ -2429,14 +2429,14 @@ describe('Test ng2-activiti-diagrams ', () => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); - let task: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-rect[ng-reflect-stroke="#2632aa"]'); + let task: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-rect[ng-reflect-stroke="#2632aa"]'); expect(task).not.toBeNull(); - let taskText: any = element.querySelector('diagram-alfresco-publish-task > diagram-task > raphael-multiline-text'); + let taskText: any = element.querySelector('adf-diagram-publish-task > diagram-task > raphael-multiline-text'); expect(taskText).not.toBeNull(); expect(taskText.attributes[1].value).toEqual('Fake Alfresco Publish task'); - let iconTask: any = element.querySelector('diagram-alfresco-publish-task > diagram-icon-alfresco-publish-task >' + + let iconTask: any = element.querySelector('adf-diagram-publish-task > diagram-icon-alfresco-publish-task >' + ' raphael-icon-alfresco-publish'); expect(iconTask).not.toBeNull(); diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts index e91c2048de..473b741efb 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts @@ -23,7 +23,7 @@ import { RaphaelService } from './raphael/raphael.service'; import { DiagramModel, DiagramElementModel } from '../models/diagram.model'; @Component({ - selector: 'activiti-diagram', + selector: 'adf-diagram, activiti-diagram', styleUrls: ['./diagram.component.css'], templateUrl: './diagram.component.html' }) diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts index 3e2937988c..01b52f4354 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts @@ -19,7 +19,7 @@ import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/cor import { DiagramColorService } from '../../services/diagram-color.service'; @Component({ - selector: 'diagram-icon-alfresco-publish-task', + selector: 'adf-diagram-icon-publish-task, diagram-icon-alfresco-publish-task', templateUrl: './diagram-icon-alfresco-publish-task.component.html' }) export class DiagramIconAlfrescoPublishTaskComponent { diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md index 0fa11ca4be..0ad4d016b1 100644 --- a/ng2-components/ng2-activiti-form/README.md +++ b/ng2-components/ng2-activiti-form/README.md @@ -71,17 +71,17 @@ npm install ng2-activiti-form The component shows a Form from Activiti ```html - - + ``` **Display form instance by task id:** ```html - - + ``` For an existing Task both form and values will be fetched and displayed. @@ -89,10 +89,10 @@ For an existing Task both form and values will be fetched and displayed. **Display form definition by form id:** ```html - - + ``` Only form definition will be fetched. @@ -100,10 +100,10 @@ Only form definition will be fetched. **Display form definition by form name:** ```html - - + ``` **Display form definition by ECM nodeId:** @@ -113,9 +113,9 @@ If there is no form definied in activiti for the type of the node, a new form will be automaticaly created in Activiti. ```html - - + ``` **Display form definition by form name, and store the form field as metadata:** @@ -123,12 +123,12 @@ a new form will be automaticaly created in Activiti. The param nameNode is optional. ```html - - + ``` **Display form definition by ECM nodeId:** @@ -137,12 +137,12 @@ In this case the metadata of the node are showed in an activiti Form, and store the form field as metadata. The param nameNode is optional. ```html - - + ``` ### Properties @@ -191,10 +191,10 @@ All `form*` events receive an instance of the `FormModel` as event argument for **MyView.component.html** ```html - - + ``` **MyView.component.ts** @@ -218,10 +218,10 @@ Alternatively you may want just running additional code on outcome execution wit **MyView.component.html** ```html - - + ``` **MyView.component.ts** @@ -262,9 +262,9 @@ will also be executed after your custom code.** The component shows the content preview. ```html - - + ``` ### Properties diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts index 2e6b18727a..99257f0ff5 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts @@ -22,7 +22,7 @@ import { ContentLinkModel } from './widgets/core/content-link.model'; import { Observable } from 'rxjs/Rx'; @Component({ - selector: 'activiti-content', + selector: 'adf-content, activiti-content', templateUrl: './activiti-content.component.html', styleUrls: ['./activiti-content.component.css'] }) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index e150640dab..7aaf39ab70 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -29,7 +29,7 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic declare var componentHandler: any; @Component({ - selector: 'activiti-form', + selector: 'adf-form, activiti-form', templateUrl: './activiti-form.component.html', styleUrls: ['./activiti-form.component.css'] }) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index de2c3e5d0d..e6c9b0789e 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -51,7 +51,7 @@ import { ContentLinkModel } from './widgets/core/content-link.model'; * @returns {ActivitiForm} . */ @Component({ - selector: 'activiti-start-form', + selector: 'adf-start-form, activiti-start-form', templateUrl: './activiti-start-form.component.html', styleUrls: ['./activiti-form.component.css'] }) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.html index 6b8cb636d6..b91c6e3881 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.html @@ -47,13 +47,13 @@
- +
- +
- + ``` ### Properties @@ -109,9 +109,9 @@ The most common usage is in driving a process instance list in order to allow th process instances are displayed in the list. ```html - - + ``` ### Properties @@ -136,9 +136,9 @@ If both `appId` and `appName` are specified then `appName` will take precedence ### How filter the activiti process filters ```html - - + ``` You can use inside the filterParam one of the following property. @@ -170,11 +170,11 @@ The AccordionComponent is exposed by the alfresco-core. [heading]="'Processes'" [isSelected]="true" [headingIcon]="'assessment'"> - - + ``` @@ -187,9 +187,9 @@ Displays a button which in turn displays a dialog when clicked, allowing the use to specify some basic details needed to start a new process instance. ```html - - + ``` ### Properties @@ -213,9 +213,9 @@ to specify some basic details needed to start a new process instance. This component displays detailed information on a specified process instance ```html - - + ``` ### Properties @@ -237,9 +237,9 @@ This component displays detailed information on a specified process instance This is a sub-component of the process details component, which renders some general information about the selected process. ```html - - + ``` ### Properties @@ -260,10 +260,10 @@ This is a sub-component of the process details component, which renders some gen Lists both the active and completed tasks associated with a particular process instance ```html - - + ``` ### Properties @@ -284,9 +284,9 @@ Lists both the active and completed tasks associated with a particular process i Displays comments associated with a particular process instances and allows the user to add new comments ```html - - + ``` ### Properties @@ -326,11 +326,11 @@ This component displays attached documents on a specified process instance This component displays Upload Component(Drag and Click) to upload the attachment to a specified process instance ```html - - + ``` ![process-create-attachment](docs/assets/process-create-attachment.png) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts index 946682fbe3..e6ec18f7ee 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts @@ -24,7 +24,7 @@ import { ActivitiProcessService } from './../services/activiti-process.service'; declare let componentHandler: any; @Component({ - selector: 'activiti-process-instance-filters', + selector: 'adf-process-instance-filters, activiti-process-instance-filters', templateUrl: './activiti-filters.component.html', styleUrls: ['activiti-filters.component.css'] }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts index 85e97405ee..dbce0010f7 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts @@ -26,7 +26,7 @@ declare let componentHandler: any; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-process-instance-comments', + selector: 'adf-process-instance-comments, activiti-process-instance-comments', templateUrl: './activiti-process-comments.component.html', styleUrls: ['./activiti-process-comments.component.css'], providers: [ActivitiProcessService] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html index dc3535307e..64d13a7d0e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html @@ -1,16 +1,16 @@
{{ 'DETAILS.MESSAGES.NONE'|translate }}

{{ getProcessNameOrDescription('medium') }}

- - +
- - +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 4ac62eb633..3e500bb654 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -26,7 +26,7 @@ import {ActivitiProcessInstanceTasks} from './activiti-process-instance-tasks.co import {ProcessInstance} from '../models/process-instance.model'; @Component({ - selector: 'activiti-process-instance-details', + selector: 'adf-process-instance-details, activiti-process-instance-details', templateUrl: './activiti-process-instance-details.component.html', styleUrls: ['./activiti-process-instance-details.component.css'] }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html index cee39f13a2..8d8aa72980 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html @@ -9,7 +9,7 @@ {{getFormatDate(processInstance.started, 'medium')}}
- +
{{ 'DETAILS.LABELS.ENDED' | translate }}: diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts index 8f7ce0b23c..813a1e8cdb 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts @@ -23,7 +23,7 @@ import { DatePipe } from '@angular/common'; declare let componentHandler: any; @Component({ - selector: 'activiti-process-instance-header', + selector: 'adf-process-instance-header, activiti-process-instance-header', templateUrl: './activiti-process-instance-header.component.html', styleUrls: ['./activiti-process-instance-header.component.css'] }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index ed5749a4c6..9ac6db69d8 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -74,10 +74,10 @@

{{ 'DETAILS.LABELS.START_FORM'|translate }}

- - +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index adfa62a7d0..1296edfe63 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -27,7 +27,7 @@ declare let componentHandler: any; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-process-instance-tasks', + selector: 'adf-process-instance-tasks, activiti-process-instance-tasks', templateUrl: './activiti-process-instance-tasks.component.html', styleUrls: ['./activiti-process-instance-tasks.component.css'] }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html index d3c7f3e362..1766131e18 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html @@ -5,8 +5,8 @@
- +
{{ 'DETAILS.VARIABLES.NONE' | translate }} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts index 9f1d6a6471..6c84e2f2ab 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts @@ -102,7 +102,7 @@ describe('ActivitiProcessInstanceVariables', () => { fixture.detectChanges(); fixture.whenStable(); tick(); - let datatable: DebugElement = fixture.debugElement.query(By.css('alfresco-datatable')); + let datatable: DebugElement = fixture.debugElement.query(By.css('adf-datatable')); expect(datatable).toBeNull(); })); @@ -130,7 +130,7 @@ describe('ActivitiProcessInstanceVariables', () => { fixture.detectChanges(); fixture.whenStable(); tick(); - let datatable: DebugElement = fixture.debugElement.query(By.css('alfresco-datatable')); + let datatable: DebugElement = fixture.debugElement.query(By.css('adf-datatable')); expect(datatable).not.toBeNull(); })); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts index dad7269fbf..b4617eec41 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts @@ -26,7 +26,7 @@ declare let componentHandler: any; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-process-instance-variables', + selector: 'adf-process-instance-variables, activiti-process-instance-variables', templateUrl: './activiti-process-instance-variables.component.html', styleUrls: [], providers: [ActivitiProcessService] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html index c11b3fabdd..797404ba8c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html @@ -1,10 +1,10 @@
{{ 'FILTERS.MESSAGES.NONE' | translate }}
- - +
{{ 'PROCESSLIST.NONE' | translate }} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index 7ce260bc08..03eb04923b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -24,7 +24,7 @@ import { ProcessInstance } from '../models/process-instance.model'; import { ActivitiProcessService } from '../services/activiti-process.service'; @Component({ - selector: 'activiti-process-instance-list', + selector: 'adf-process-instance-list, activiti-process-instance-list', styleUrls: ['./activiti-processlist.component.css'], templateUrl: './activiti-processlist.component.html' }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html index 2e0bb7ab10..451d9e8e1b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html @@ -17,9 +17,9 @@
- - +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts index d76fbb4407..f38d21c14a 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts @@ -27,7 +27,7 @@ declare let componentHandler: any; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-start-process', + selector: 'adf-start-process, activiti-start-process', templateUrl: './activiti-start-process.component.html', styleUrls: ['./activiti-start-process.component.css'] }) diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html index f9001080a7..c7fc64d343 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html @@ -1,7 +1,7 @@
No Attachments Found
- - + diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts index 191165be6e..37a00c0ee6 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts @@ -157,7 +157,7 @@ describe('Activiti Process Instance Attachment List', () => { fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.debugElement.queryAll(By.css('alfresco-datatable tbody tr')).length).toBe(2); + expect(fixture.debugElement.queryAll(By.css('adf-datatable tbody tr')).length).toBe(2); }); })); @@ -172,7 +172,7 @@ describe('Activiti Process Instance Attachment List', () => { fixture.detectChanges(); fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.debugElement.queryAll(By.css('alfresco-datatable tbody tr')).length).toBe(0); + expect(fixture.debugElement.queryAll(By.css('adf-datatable tbody tr')).length).toBe(0); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index 5c5aaed318..fba35d3ca7 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -69,22 +69,22 @@ npm install ng2-activiti-tasklist This component renders a list containing all the tasks matched by the parameters specified. ```html - - + ``` You can also use HTML-based schema declaration like shown below: ```html - + - + ``` ### DataColumn Properties @@ -138,9 +138,9 @@ Example: The component shows the details of the task id passed in input ```html - - + ``` ### Properties @@ -183,14 +183,14 @@ No Tasks This can be changed by adding the following custom html template: ```html - + - + ``` Note that can put any HTML content as part of the template, includuing other Angualr components. @@ -200,9 +200,9 @@ Note that can put any HTML content as part of the template, includuing other Ang The component shows all the available apps. ```html - - + ``` ### Properties @@ -223,12 +223,12 @@ The component shows all the available apps. If you want show some specific apps you can specify them through the filtersAppId parameters ```html - - + ``` In this specific case only the Tasks app, the app with deploymentId 15037 and the app with "my app name" will be showed @@ -253,7 +253,7 @@ You can use inside the filter one of the following property The component shows all the available filters. ```html - + ``` ### Properties @@ -278,9 +278,9 @@ If both `appId` and `appName` are specified then `appName` will take precedence ### How filter the activiti task filters ```html - - + ``` You can use inside the filterParam one of the following property. @@ -309,13 +309,13 @@ The AccordionComponent is exposed by the alfresco-core. ```html - - + ``` @@ -327,11 +327,11 @@ The AccordionComponent is exposed by the alfresco-core. The component shows the checklist task functionality. ```html - + ``` ### Properties @@ -401,9 +401,9 @@ The component shows all the information related to a task. The purpose of the component is populate the local variable called `properties` (array of CardViewModel), with all the information that we want display. ```html - - + ``` ### Properties @@ -436,11 +436,11 @@ The purpose of the component is populate the local variable called `properties` This component displays involved users to a specified task ```html - - + ``` ![activiti-people](docs/assets/activiti_people.png) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts index 04a5a5ca55..fdee229260 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts @@ -26,7 +26,7 @@ import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; @Component({ - selector: 'activiti-apps', + selector: 'adf-apps, activiti-apps', templateUrl: 'activiti-apps.component.html', styleUrls: ['./activiti-apps.component.css', './activiti-apps-grid.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 1e6ded3b2e..04a999f08c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -24,7 +24,7 @@ import { Observer, Observable } from 'rxjs/Rx'; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-checklist', + selector: 'adf-checklist, activiti-checklist', templateUrl: './activiti-checklist.component.html', styleUrls: ['./activiti-checklist.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts index 4adcc7307d..5f6c483a83 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts @@ -24,7 +24,7 @@ import { Observer, Observable } from 'rxjs/Rx'; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-comments', + selector: 'adf-comments, activiti-comments', templateUrl: './activiti-comments.component.html', styleUrls: ['./activiti-comments.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 272c53f2a6..107a7c9b87 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -24,7 +24,7 @@ import { FilterRepresentationModel, FilterParamsModel } from '../models/filter.m declare let componentHandler: any; @Component({ - selector: 'activiti-filters', + selector: 'adf-filters, activiti-filters', templateUrl: './activiti-filters.component.html', styleUrls: ['activiti-filters.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index ffb6be6235..eb29b25cf7 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -25,7 +25,7 @@ declare let componentHandler: any; declare var require: any; @Component({ - selector: 'activiti-people-search', + selector: 'adf-people-search, activiti-people-search', templateUrl: './activiti-people-search.component.html', styleUrls: ['./activiti-people-search.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html index ad36978b4f..d161ab5d62 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html @@ -11,12 +11,12 @@
- - +
expand_less {{taskDetails.name || 'No name'}} - - +
- - +
- - +
- - +
{{ 'TASK_DETAILS.MESSAGES.CLAIM' | translate }} @@ -71,12 +71,12 @@
- - +

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 64b5870756..c33ca259ae 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -37,7 +37,7 @@ declare var require: any; declare let dialogPolyfill: any; @Component({ - selector: 'activiti-task-details', + selector: 'adf-task-details, activiti-task-details', templateUrl: './activiti-task-details.component.html', styleUrls: ['./activiti-task-details.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index 950bfd2a2c..01c6900d69 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -21,7 +21,7 @@ import { TaskDetailsModel } from '../models/index'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @Component({ - selector: 'activiti-task-header', + selector: 'adf-task-header, activiti-task-header', templateUrl: './activiti-task-header.component.html', styleUrls: ['./activiti-task-header.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html index 7f95c193d8..b71b2d9078 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html @@ -1,10 +1,10 @@
{{ 'TASK_FILTERS.MESSAGES.NONE' | translate }}
- - +
{{ 'TASK_LIST.MESSAGES.NONE' | translate }} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index 3a8e04e020..e8f8733f04 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -37,7 +37,7 @@ import { ActivitiTaskListService } from './../services/activiti-tasklist.service import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; @Component({ - selector: 'activiti-tasklist', + selector: 'adf-tasklist, activiti-tasklist', templateUrl: './activiti-tasklist.component.html', styleUrls: ['./activiti-tasklist.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html index ad652783f0..ce6964b3e4 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html @@ -1,7 +1,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html index ec0aaf4c1b..f377d700b3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html @@ -1,7 +1,7 @@
No Attachments Found
- - + diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts index 1ad70d54d8..c528c016ba 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts @@ -152,7 +152,7 @@ describe('TaskAttachmentList', () => { fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.debugElement.queryAll(By.css('alfresco-datatable tbody tr')).length).toBe(2); + expect(fixture.debugElement.queryAll(By.css('adf-datatable tbody tr')).length).toBe(2); }); })); @@ -167,7 +167,7 @@ describe('TaskAttachmentList', () => { fixture.detectChanges(); fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.debugElement.queryAll(By.css('alfresco-datatable tbody tr')).length).toBe(0); + expect(fixture.debugElement.queryAll(By.css('adf-datatable tbody tr')).length).toBe(0); }); })); diff --git a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.ts b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.ts index 0bcfef10d0..24a8a9aab0 100644 --- a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.ts +++ b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.directive.ts @@ -19,7 +19,7 @@ import { Directive, Input, HostListener } from '@angular/core'; import { ContextMenuService } from './context-menu.service'; @Directive({ - selector: '[context-menu]' + selector: '[adf-context-menu], [context-menu]' }) export class ContextMenuDirective { @Input('context-menu') diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-button.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-button.directive.ts index 96f82aad74..f386ff3cf2 100644 --- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-button.directive.ts +++ b/ng2-components/ng2-alfresco-core/src/components/material/mdl-button.directive.ts @@ -20,7 +20,7 @@ import { Directive, ElementRef, AfterViewInit } from '@angular/core'; declare var componentHandler; @Directive({ - selector: '[alfresco-mdl-button]' + selector: '[adf-mdl-button] ,[alfresco-mdl-button]' }) export class AlfrescoMdlButtonDirective implements AfterViewInit { diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts index 370665234b..c3c5a60687 100644 --- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts +++ b/ng2-components/ng2-alfresco-core/src/components/material/mdl-menu.directive.ts @@ -20,7 +20,7 @@ import { Directive, ElementRef, AfterViewInit } from '@angular/core'; declare var componentHandler; @Directive({ - selector: '[alfresco-mdl-menu]' + selector: '[adf-mdl-menu], [alfresco-mdl-menu]' }) export class AlfrescoMdlMenuDirective implements AfterViewInit { diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts index d8e0a1be0b..f91e95f43c 100644 --- a/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts +++ b/ng2-components/ng2-alfresco-core/src/components/material/mdl-textfield.directive.ts @@ -20,7 +20,7 @@ import { Directive, ElementRef, AfterViewInit } from '@angular/core'; declare var componentHandler; @Directive({ - selector: '[alfresco-mdl-textfield]' + selector: '[adf-mdl-textfield]], [alfresco-mdl-textfield]' }) export class AlfrescoMdlTextFieldDirective implements AfterViewInit { diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 3d220e38d7..f7983abe8f 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -54,9 +54,9 @@ npm install ng2-alfresco-datatable **app.component.html** ```html - - + ``` **app.component.ts** @@ -100,7 +100,7 @@ export class DataTableDemo { You can also use HTML-based schema declaration like shown below: ```html - + @@ -108,7 +108,7 @@ You can also use HTML-based schema declaration like shown below: - + ``` ```ts @@ -198,7 +198,7 @@ These events are bubbled up the element tree and can be subscribed to from withi ```html - + ``` @@ -216,7 +216,7 @@ onRowClick(event) { You can add a template that will be showed when there are no result in your datatable: ```html - - + ``` ### Loading content template @@ -243,7 +243,7 @@ You can add a template that will be showed when there are no result in your data You can add a template that will be showed during the loading of your data: ```html - - + ``` ```js @@ -281,7 +281,7 @@ Note: the `` and `` can be used t It is possible assigning a custom column template like the following: ```html - + - + ``` Example above shows access to the underlying cell value by binding `value` property to the underlying context `value`: @@ -433,13 +433,13 @@ then `executeRowAction` will be automatically executed when user clicks corresponding menu item. ```html - - + ``` ```ts diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable-cell.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable-cell.component.ts index eb5b892042..b778c245d8 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable-cell.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable-cell.component.ts @@ -19,7 +19,7 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; import { DataTableAdapter, DataColumn, DataRow } from '../../data/datatable-adapter'; @Component({ - selector: 'alfresco-datatable-cell', + selector: 'adf-datatable-cell, alfresco-datatable-cell', changeDetection: ChangeDetectionStrategy.OnPush, template: '{{value}}' }) diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index 8828ba883a..6662bfb777 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -81,11 +81,11 @@
- +
- +
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index f8e0b766f3..26724b1714 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -30,7 +30,7 @@ import { Observable, Observer } from 'rxjs/Rx'; declare var componentHandler; @Component({ - selector: 'alfresco-datatable', + selector: 'adf-datatable, alfresco-datatable', styleUrls: ['./datatable.component.css'], templateUrl: './datatable.component.html' }) diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts index 6d5a9d1908..1ca78e8d12 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts @@ -20,7 +20,7 @@ import { PaginationData } from '../../models/pagination.data'; import { Pagination } from 'alfresco-js-api'; @Component({ - selector: 'alfresco-pagination', + selector: 'adf-pagination, alfresco-pagination', templateUrl: './pagination.component.html', styleUrls: ['./pagination.component.css'] }) diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 79720a364e..af5473c9f5 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -67,13 +67,13 @@ npm install ng2-alfresco-documentlist ## Document List ```html - - + ``` ### Properties @@ -143,11 +143,11 @@ Here's a basic example on handling DOM events in the parent elements:
- - + + ... - - + +
``` @@ -205,9 +205,9 @@ It helps examining other valuable information you can have access to if needed: Typically you will be binding DocumentList properties to your application/component class properties: ```html - - + ``` with the underlying class being implemented similar to the following one: @@ -229,10 +229,10 @@ section of the official docs. Here's an example of getting reference: ```html - - + ``` Note the `#documentList` ID we've just added to be able referencing this component later on. @@ -282,7 +282,7 @@ DocumentList provides simple breadcrumb element to indicate the current position ``` -***Note:*** the `` and `` are the same component you can still use the old tag name +***Note:*** the `` and `` are the same component you can still use the old tag name ![Breadcrumb](docs/assets/breadcrumb.png) @@ -306,9 +306,9 @@ DocumentList provides simple breadcrumb element to indicate the current position DocumentList provides simple creation menu actions that provide the action to create a new folder. ```html - - + ``` ![Creation Menu Action](docs/assets/document-list-creation-menu-actions-1.png) @@ -326,7 +326,7 @@ By default special `$thumbnail` and `displayName` columns are rendered. A custom set of columns can look like the following: ```html - + - + ``` ![Custom columns](docs/assets/custom-columns.png) @@ -358,7 +358,7 @@ A custom set of columns can look like the following: You can also use HTML-based schema declaration used by DataTable, TaskList and other components: ```html - + @@ -366,7 +366,7 @@ You can also use HTML-based schema declaration used by DataTable, TaskList and o - + ``` ### DataColumn Properties @@ -415,7 +415,7 @@ createdByUser.displayName Here's a short example: ```html - + @@ -424,7 +424,7 @@ Here's a short example: key="createdByUser.displayName"> - + ``` ## Column definition @@ -513,7 +513,7 @@ In the Example below will add the [ng2-alfresco-tag](https://www.npmjs.com/packa sortable="true" class="full-width ellipsis-cell"> ``` @@ -529,7 +529,7 @@ You can define both folder and document actions at the same time. #### Menu actions ```html - + - + ``` ```ts @@ -581,7 +581,7 @@ The ContentActionComponent provides the event permissionEvent that is raised whe You can subscribe to this event from your component and use the NotificationService to show a message. ```html - + - + ``` ```ts @@ -615,7 +615,7 @@ The ContentActionComponent provides the property permission that must contain th you want see the button disabled. ```html - + - + ``` ![Delete disable action button](docs/assets/content-action-disable-delete-button.png) @@ -637,7 +637,7 @@ The ContentActionComponent provides the property permission that must contain th Initiates download of the corresponding document file. ```html - + - + ``` ![Download document action](docs/assets/document-action-download.png) @@ -657,7 +657,7 @@ Initiates download of the corresponding document file. Folder actions have the same declaration as document actions except ```taget="folder"``` attribute value. ```html - + - + ``` ### Events @@ -766,9 +766,9 @@ _Note that for the sake of simplicity the example code below was reduced to the **View1.component.html** ```html - - + ``` **View1.component.ts** @@ -818,7 +818,7 @@ _Note that for the sake of simplicity the example code below was reduced to the **View1.component.html** ```html - @@ -826,7 +826,7 @@ _Note that for the sake of simplicity the example code below was reduced to the - + ``` **View1.component.ts** @@ -882,7 +882,7 @@ You can hide columns on small screens by means of custom CSS rules: Now you can declare columns and assign `desktop-only` class where needed: ```html - + @@ -909,7 +909,7 @@ Now you can declare columns and assign `desktop-only` class where needed: class="desktop-only"> - + ``` **Desktop View** @@ -929,13 +929,13 @@ By default DocumentList provides the following content for the empty folder: This can be changed by means of the custom html template: ```html - + - + ``` That will give the following output: @@ -954,7 +954,7 @@ Example below demonstrates how a new action handler can be registered with the `DocumentActionsService`. ```html - + - + ``` You register custom handler called `my-handler` that will be executing `myDocumentActionHandler` diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html index 902ff9a0ff..0f2550aaa4 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html @@ -1,11 +1,11 @@ - - - +
- - + - + diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index cecb22c17c..31afe69472 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -39,7 +39,7 @@ import { NodeEntityEvent, NodeEntryEvent } from './node.event'; declare var require: any; @Component({ - selector: 'alfresco-document-list', + selector: 'adf-document-list, alfresco-document-list', styleUrls: ['./document-list.component.css'], templateUrl: './document-list.component.html' }) diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts index b42ee4e572..16dc245223 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts @@ -28,7 +28,7 @@ declare let dialogPolyfill: any; const ERROR_FOLDER_ALREADY_EXIST = 409; @Component({ - selector: 'alfresco-document-menu-action', + selector: 'adf-document-menu-action, alfresco-document-menu-action', styleUrls: ['./document-menu-action.component.css'], templateUrl: './document-menu-action.component.html' }) diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md index 1975e40dd8..023f0ef82f 100644 --- a/ng2-components/ng2-alfresco-login/README.md +++ b/ng2-components/ng2-alfresco-login/README.md @@ -46,11 +46,11 @@ This component allow to authenticate to Alfresco One and Alfresco Activiti. **app.component.html** ```html - - + ``` **app.component.ts** @@ -97,9 +97,9 @@ export class AppComponent { You can replace the entire content in the footer of the login component with your custom content. ```html - + -` +` ``` ## Change header content @@ -109,9 +109,9 @@ You can replace the entire content in the footer of the login component with you You can replace the entire content in the header of the login component with your custom content. ```html - + -` +` ``` ## Extra content @@ -120,11 +120,11 @@ You can put additional html content between `alfresco-login` tags to get it rend This becomes handy in case you need extending it with custom input fields handled by your application or parent component: ```html - +
You extra content
- + ``` Here's an example of custom content: @@ -136,10 +136,10 @@ Here's an example of custom content: It is possible changing logo and background images to custom values. ```html - - + ``` Should give you something like the following: @@ -149,10 +149,10 @@ Should give you something like the following: Alternatively you can bind to your component properties and provide values dynamically if needed: ```html - - + ``` ## Customize Validation rules @@ -163,10 +163,10 @@ form. You can add/modify the default rules of the login form. **MyCustomLogin.component.html** ```html - - + ``` **MyCustomLogin.component.ts** @@ -207,10 +207,10 @@ Alternatively you may want just running additional code without suppressing defa **MyCustomLogin.component.html** ```html - - + ``` **MyCustomLogin.component.ts** diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index aeeabcfee1..7c03d0bcdb 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -36,7 +36,7 @@ enum LoginSteps { } @Component({ - selector: 'alfresco-login', + selector: 'adf-login, alfresco-login', templateUrl: './alfresco-login.component.html', styleUrls: ['./alfresco-login.component.css'], host: {'(blur)': 'onBlur($event)'} diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md index 548c5da915..fb57d39fcd 100644 --- a/ng2-components/ng2-alfresco-search/README.md +++ b/ng2-components/ng2-alfresco-search/README.md @@ -37,13 +37,13 @@ npm install ng2-alfresco-search ## Basic usage ```html - - + ``` Example of an component that uses the search control. In this example the search term is simply logged to the console @@ -76,9 +76,9 @@ results component embedded inside the same component. ## Basic usage Search results ```html - - + ``` Example of an component that displays search results, using the Angular2 router to supply a 'q' parameter containing the diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts index 91d6fb45ae..0e39a43c81 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts @@ -24,7 +24,7 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi declare var require: any; @Component({ - selector: 'alfresco-search-autocomplete', + selector: 'adf-search-autocomplete, alfresco-search-autocomplete', templateUrl: './alfresco-search-autocomplete.component.html', styleUrls: ['./alfresco-search-autocomplete.component.css'] }) diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html index 0343158ec7..65a7868738 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html @@ -22,7 +22,7 @@
- + (cancel)="onAutoCompleteCancel($event)"> diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index 19270e1583..79ef73cb6a 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -165,13 +165,13 @@ describe('AlfrescoSearchControlComponent', () => { it('should display a find-as-you-type control by default', () => { fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete).not.toBeNull(); }); it('should make find-as-you-type control hidden initially', () => { fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); }); @@ -180,7 +180,7 @@ describe('AlfrescoSearchControlComponent', () => { inputEl.dispatchEvent(new FocusEvent('focus')); window.setTimeout(() => { // wait for debounce() to complete fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(true); done(); }, 100); @@ -192,7 +192,7 @@ describe('AlfrescoSearchControlComponent', () => { inputEl.dispatchEvent(new FocusEvent('blur')); window.setTimeout(() => { fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); done(); }, 100); @@ -210,7 +210,7 @@ describe('AlfrescoSearchControlComponent', () => { component.onAutoCompleteFocus(new FocusEvent('focus')); window.setTimeout(() => { // wait for debounce() to complete fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(true); done(); }, 100); @@ -223,7 +223,7 @@ describe('AlfrescoSearchControlComponent', () => { key: 'Escape' })); fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); }); @@ -237,7 +237,7 @@ describe('AlfrescoSearchControlComponent', () => { key: 'ArrowDown' })); fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(true); }); @@ -280,7 +280,7 @@ describe('AlfrescoSearchControlComponent', () => { it('should NOT display a find-as-you-type control when configured not to', () => { fixture.componentInstance.liveSearchEnabled = false; fixture.detectChanges(); - let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); + let autocomplete: Element = element.querySelector('adf-search-autocomplete'); expect(autocomplete).toBeNull(); }); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts index 802d40086d..c4f5a3dd10 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts @@ -23,7 +23,7 @@ import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocompl import { SearchTermValidator } from './../forms/search-term-validator'; @Component({ - selector: 'alfresco-search-control', + selector: 'adf-search-control, alfresco-search-control', templateUrl: './alfresco-search-control.component.html', styleUrls: ['./alfresco-search-control.component.css'] }) diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html index 3039780cda..7bbb0449e5 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html @@ -2,7 +2,7 @@ class="mdl-data-table mdl-js-data-table mdl-shadow--2dp full-width">

{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}

- - - + - +
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts index 94dcd60bd0..1c7e457348 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts @@ -22,7 +22,7 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { NodePaging, Pagination } from 'alfresco-js-api'; @Component({ - selector: 'alfresco-search', + selector: 'adf-search, alfresco-search', styleUrls: ['./alfresco-search.component.css'], templateUrl: './alfresco-search.component.html' }) diff --git a/ng2-components/ng2-alfresco-tag/README.md b/ng2-components/ng2-alfresco-tag/README.md index 52494085c5..729706dbd2 100644 --- a/ng2-components/ng2-alfresco-tag/README.md +++ b/ng2-components/ng2-alfresco-tag/README.md @@ -45,9 +45,9 @@ In this component are present three different tags: ## alfresco-tag-node-actions-list ```html - - + ``` ### Properties @@ -61,9 +61,9 @@ In this component are present three different tags: ## alfresco-tag-node-list ```html - - + ``` ### Properties diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts index 6d28dd5070..8d079e9a97 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts @@ -27,7 +27,7 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core'; */ @Component({ - selector: 'alfresco-tag-node-actions-list', + selector: 'adf-tag-node-actions-list, alfresco-tag-node-actions-list', templateUrl: './tag-actions.component.html', styleUrls: ['./tag-actions.component.css'] }) diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts index 8db185e749..c2c06b1081 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts @@ -26,7 +26,7 @@ import { TagService } from '../services/tag.service'; */ @Component({ - selector: 'alfresco-tag-list', + selector: 'adf-tag-list, alfresco-tag-list', templateUrl: './tag-list.component.html' }) export class TagList { diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts index 20193f34cb..e6435c2429 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts @@ -26,7 +26,7 @@ import { TagService } from '../services/tag.service'; */ @Component({ - selector: 'alfresco-tag-node-list', + selector: 'adf-tag-node-list, alfresco-tag-node-list', templateUrl: './tag-node-list.component.html', styleUrls: ['./tag-node-list.component.css'] }) diff --git a/ng2-components/ng2-alfresco-upload/README.md b/ng2-components/ng2-alfresco-upload/README.md index 0ce4fa1eff..137faa4880 100644 --- a/ng2-components/ng2-alfresco-upload/README.md +++ b/ng2-components/ng2-alfresco-upload/README.md @@ -64,14 +64,14 @@ npm install ng2-alfresco-upload ## UploadButtonComponent ```html - - + ``` @@ -105,10 +105,10 @@ The UploadButtonComponent provides the event permissionEvent that is raised when You can subscribe to this event from your component and use the NotificationService to show a message. ```html - - + ``` ```ts @@ -131,10 +131,10 @@ You can easily disable the button when the user doesn't own the permission to pe The UploadButtonComponent provides the property disableWithNoPermission that can be true. In this way the button should be disabled if the delete permission is missing for the node. ```html - - + ``` ![Upload disable button](docs/assets/upload-disable-button.png) @@ -144,11 +144,11 @@ The UploadButtonComponent provides the property disableWithNoPermission that can This component, provide a drag and drop are to upload files to alfresco. ```html - +
DRAG HERE
- + ``` diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html index 545232110b..dc268fe5cc 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html @@ -15,6 +15,6 @@
- +
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts index 2b399be04d..15152242cf 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts @@ -20,7 +20,7 @@ import { FileModel, FileUploadStatus } from '../models/file.model'; import { UploadService } from '../services/upload.service'; @Component({ - selector: 'alfresco-file-uploading-list', + selector: 'adf-file-uploading-list, alfresco-file-uploading-list', templateUrl: './file-uploading-list.component.html', styleUrls: ['./file-uploading-list.component.css'] }) diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 0530fe1cf6..9bb2f74895 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -24,7 +24,7 @@ import { FileModel } from '../models/file.model'; import { PermissionModel } from '../models/permissions.model'; @Component({ - selector: 'alfresco-upload-button', + selector: 'adf-upload-button, alfresco-upload-button', templateUrl: './upload-button.component.html', styleUrls: ['./upload-button.component.css'] }) diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index de576a7637..8eac3caa9b 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -21,7 +21,7 @@ import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @Component({ - selector: 'alfresco-upload-drag-area', + selector: 'adf-upload-drag-area, alfresco-upload-drag-area', templateUrl: './upload-drag-area.component.html', styleUrls: ['./upload-drag-area.component.css'] }) diff --git a/ng2-components/ng2-alfresco-userinfo/README.md b/ng2-components/ng2-alfresco-userinfo/README.md index 722f69a959..3122c33744 100644 --- a/ng2-components/ng2-alfresco-userinfo/README.md +++ b/ng2-components/ng2-alfresco-userinfo/README.md @@ -33,7 +33,7 @@ npm install ng2-alfresco-userinfo ## Basic usage ```html - + ``` ### Properties diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index 915e103cad..9cd4829c18 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -26,7 +26,7 @@ declare let componentHandler: any; declare var require: any; @Component({ - selector: 'ng2-alfresco-userinfo', + selector: 'adf-userinfo, ng2-alfresco-userinfo', styleUrls: ['./user-info.component.css'], templateUrl: './user-info.component.html' }) diff --git a/ng2-components/ng2-alfresco-viewer/README.md b/ng2-components/ng2-alfresco-viewer/README.md index 7e6da41796..ccdd14aedd 100644 --- a/ng2-components/ng2-alfresco-viewer/README.md +++ b/ng2-components/ng2-alfresco-viewer/README.md @@ -41,20 +41,20 @@ npm install ng2-alfresco-viewer Using with node id: ```html - - + ``` Using with file url: ```html - - + ``` ## Properties @@ -91,7 +91,7 @@ If you want handle other file formats that are not yet supported by the ng2-alfr Below you can find an example where with the use of `extension-viewer` if you can handle 3d files ```html - @@ -105,7 +105,7 @@ Below you can find an example where with the use of `extension-viewer` if you ca - + ``` Note: you need adding `ng2-3d-editor` dependency to your `package.json` file to make example above work. @@ -113,7 +113,7 @@ Note: you need adding `ng2-3d-editor` dependency to your `package.json` file to It is possible to define multiple `extension-viewer` templates: ```html - @@ -133,7 +133,7 @@ It is possible to define multiple `extension-viewer` templates: - + ``` ## Build from sources diff --git a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.ts index 9360a593cf..1da533dca6 100644 --- a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.ts @@ -21,7 +21,7 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @Component({ - selector: 'alfresco-viewer', + selector: 'adf-viewer, alfresco-viewer', templateUrl: './viewer.component.html', styleUrls: ['./viewer.component.css'] }) diff --git a/ng2-components/ng2-alfresco-webscript/README.md b/ng2-components/ng2-alfresco-webscript/README.md index e164e2e881..a100bbc1c0 100644 --- a/ng2-components/ng2-alfresco-webscript/README.md +++ b/ng2-components/ng2-alfresco-webscript/README.md @@ -37,7 +37,7 @@ npm install ng2-alfresco-webscript ## Basic usage ```html - - + ``` Another example: @@ -53,13 +53,13 @@ Another example: **app.component.html** ```html - - + ``` **app.component.ts** @@ -97,13 +97,13 @@ This sample Web Scripts reside in your Alfresco Server AND you can access the http://localhost:8080/alfresco/service/sample/folder/Company%20Home ```html - - + ``` ![Custom columns](docs/assets/HTML.png) @@ -115,13 +115,13 @@ This sample demonstrates how to implement a Webscript component that renders the http://localhost:8080/alfresco/service/sample/folder/DATATABLE ```html - - + ``` If you want show the result from a webscript inside a ng2-alfresco-datatable you have to return from the GET of the webscript the datatructure below: @@ -173,7 +173,7 @@ This sample Web Scripts reside in your Alfresco Server AND you can access the http://localhost:8080/alfresco/service/sample/folder/JSON%EXAMPLE ```html - - + ``` You can get the plain data from the webscript through the **onSuccess** event parameter and use it as you need in your application diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts index d3f2c31c2c..d98d1f9479 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts @@ -20,13 +20,13 @@ import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; /** - *
{{data | json}}
diff --git a/ng2-components/package.json b/ng2-components/package.json index 51edfa2311..e351d9a19d 100644 --- a/ng2-components/package.json +++ b/ng2-components/package.json @@ -14,7 +14,7 @@ "prepublishOnly": "npm run build", "pkg-build": "package-json-merge ng2-alfresco-core/package.json ng2-alfresco-datatable/package.json ng2-activiti-diagrams/package.json ng2-activiti-analytics/package.json ng2-activiti-form/package.json ng2-activiti-tasklist/package.json ng2-activiti-processlist/package.json ng2-alfresco-documentlist/package.json ng2-alfresco-login/package.json ng2-alfresco-search/package.json ng2-alfresco-tag/package.json ng2-alfresco-upload/package.json ng2-alfresco-viewer/package.json ng2-alfresco-webscript/package.json ng2-alfresco-webscript/package.json ng2-alfresco-userinfo/package.json ng2-alfresco-social/package.json package-base.json > package.json", "toc": "markdown-toc -i ng2-alfresco-core/README.md && markdown-toc -i ng2-alfresco-datatable/README.md && markdown-toc -i ng2-activiti-diagrams/README.md && markdown-toc -i ng2-activiti-analytics/README.md && markdown-toc -i ng2-activiti-form/README.md && markdown-toc -i ng2-activiti-tasklist/README.md && markdown-toc -i ng2-activiti-processlist/README.md && markdown-toc -i ng2-alfresco-documentlist/README.md && markdown-toc -i ng2-alfresco-login/README.md && markdown-toc -i ng2-alfresco-search/README.md && markdown-toc -i ng2-alfresco-tag/README.md && markdown-toc -i ng2-alfresco-upload/README.md && markdown-toc -i ng2-alfresco-viewer/README.md && markdown-toc -i ng2-alfresco-webscript/README.md && markdown-toc -i ng2-alfresco-webscript/README.md && markdown-toc -i ng2-alfresco-userinfo/README.md && markdown-toc -i ng2-alfresco-social/README.md && markdown-toc -i README.md", - "doc": "npm run toc && npm run npm run webpack -- --config config/webpack.doc.js --progress --profile --bail", + "doc": "npm run toc && npm run webpack -- --config config/webpack.doc.js --progress --profile --bail", "tslint": "", "prepublish": "", "tsc": "", diff --git a/scripts/README.md b/scripts/README.md index 92edf4c6fb..7d5615cbc9 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -239,14 +239,13 @@ For development environment configuration please refer to [project docs](../demo # npm-clean.sh -***npm-clean.sh*** clean all the projects folder : ng2-components, ng2-components/*.*/demo and demo-shell-ng2. +***npm-clean.sh*** clean all the projects folder : ng2-components and demo-shell-ng2. ## Options | Option | Description | | --- | --- | | -h or --help | show the help | -| -sd or --skipDemo | skip the demo folder clean | # npm-check-bundles.sh @@ -270,8 +269,6 @@ Add a package across all the pacakge json in the project | -h or --help | show the help | | --save | save it in dependencies | | --save-dev | save it in dev dependencies | -| -sd | skip the demo projects | - * Add a package in the project diff --git a/scripts/npm-add-pkg.sh b/scripts/npm-add-pkg.sh index 1eafe93a23..e101004dea 100755 --- a/scripts/npm-add-pkg.sh +++ b/scripts/npm-add-pkg.sh @@ -2,7 +2,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -eval EXEC_DEMO=true eval NAME_PKG='' eval SAVE_OPT=false eval SAVE_DEV_OPT=false @@ -11,7 +10,6 @@ show_help() { echo "Usage: npm-clean.sh" echo "--save" echo "--save-dev" - echo "-sd or -skipDemo skip the clean of the demo folder of any components" } eval projects=( "ng2-activiti-diagrams" @@ -32,10 +30,6 @@ eval projects=( "ng2-activiti-diagrams" "ng2-alfresco-webscript" "ng2-alfresco-userinfo" ) -clea_demo() { - EXEC_DEMO=false -} - save(){ NAME_PKG=$1 SAVE_OPT=true @@ -51,7 +45,6 @@ while [[ $1 == -* ]]; do -h|--help|-\?) show_help; exit 0;; --save) save $2; shift 2;; --save-dev) save_dev $2; shift 2;; - -sd|--skipDemo) clea_demo; shift;; -*) echo "invalid option: $1" 1>&2; show_help; exit 0;; esac done diff --git a/scripts/npm-build-all-demo.sh b/scripts/npm-build-all-demo.sh deleted file mode 100755 index f65f92bc52..0000000000 --- a/scripts/npm-build-all-demo.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -eval EXEC_GIT_NPM_INSTALL_JSAPI=false -eval EXEC_BUILD=true -eval EXEC_INSTALL=true - -eval projects=( - "ng2-alfresco-core" - "ng2-alfresco-datatable" - "ng2-activiti-diagrams" - "ng2-activiti-analytics" - "ng2-activiti-form" - "ng2-activiti-tasklist" - "ng2-activiti-processlist" - "ng2-alfresco-documentlist" - "ng2-alfresco-login" - "ng2-alfresco-search" - "ng2-alfresco-social" - "ng2-alfresco-tag" - "ng2-alfresco-social" - "ng2-alfresco-upload" - "ng2-alfresco-viewer" - "ng2-alfresco-webscript" - "ng2-alfresco-userinfo" ) - -enable_js_api_git_link() { - GIT_ISH='git://github.com/Alfresco/alfresco-js-api.git#'$1 - EXEC_GIT_NPM_INSTALL_JSAPI=true -} - -show_help() { - echo "Usage: npm-build-all-demo.sh" - echo "" - echo "-t or -test build all your local component and run also the test on them , this parameter accept also a wildecard to execute test for example -t "ng2-alfresco-core" " - echo "-gitjsapi to build all the components against a commit-ish version of the JS-API" -} - -exclude_build(){ - EXEC_BUILD=false -} - -exec_install(){ - EXEC_INSTALL=false -} - -while [[ $1 == -* ]]; do - case "$1" in - -h|--help|-\?) show_help; exit 0;; - -si|--skipinstall) exec_install; shift;; - -sb|--skipbuild) exclude_build; shift;; - -gitjsapi) enable_js_api_git_link $2; shift 2;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; - esac -done - -cd "$DIR/../ng2-components/" - -for PACKAGE in ${projects[@]} -do - DESTDIR="$DIR/../ng2-components/$PACKAGE/demo" - if $EXEC_GIT_NPM_INSTALL_JSAPI == true; then - echo "====== Use the alfresco JS-API '$GIT_ISH' in $PACKAGE demo =====" - cd $DESTDIR - npm install $GIT_ISH - cd "$DIR/../ng2-components/$PACKAGE/demo/node_modules/alfresco-js-api" - npm install - fi - cd $DESTDIR - npm run buil:dev - -done - diff --git a/scripts/npm-clean.sh b/scripts/npm-clean.sh index 527195b976..4e65adb68f 100755 --- a/scripts/npm-clean.sh +++ b/scripts/npm-clean.sh @@ -7,7 +7,6 @@ eval EXEC_CLEAN_DEMO=true show_help() { echo "Usage: npm-clean.sh" echo "" - echo "-sd or -skipDemo skip the clean of the demo folder of any components" } eval projects=( "ng2-activiti-diagrams" @@ -28,13 +27,9 @@ eval projects=( "ng2-activiti-diagrams" "ng2-alfresco-webscript" "ng2-alfresco-userinfo" ) -clea_demo() { - EXEC_CLEAN_DEMO=false -} while [[ $1 == -* ]]; do case "$1" in -h|--help|-\?) show_help; exit 0;; - -sd|--skipDemo) clea_demo; shift;; -*) echo "invalid option: $1" 1>&2; show_help; exit 0;; esac done @@ -46,15 +41,6 @@ do echo "====== clean component: ${PACKAGE} =====" cd "$DIR/../ng2-components/${PACKAGE}" npm run clean - - if $EXEC_CLEAN_DEMO == true; then - if [ -d "$DIR/../ng2-components/${PACKAGE}/demo" ]; then - echo "====== clean component demo: ${PACKAGE} =====" - cd "$DIR/../ng2-components/${PACKAGE}/demo" - npm install rimraf - npm run clean - fi - fi done cd "$DIR/../demo-shell-ng2"