[ADF-1968] fix packaging issues i18n and assets (#2665)

* fix packaging issues i18n and assets

* remove other not used fodler
This commit is contained in:
Eugenio Romano 2017-11-17 15:08:26 +00:00 committed by GitHub
parent 1021cba9fc
commit a8e209c5b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 99 additions and 191 deletions

View File

@ -5,6 +5,7 @@
},
"apps": [
{
"name" : "dist",
"root": "src",
"outDir": "dist",
"assets": [
@ -25,42 +26,22 @@
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-core/bundles/assets",
"output": "./core/assets/"
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-insights/bundles/assets",
"output": "./insights/assets/"
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-process-services/bundles/assets",
"output": "./process-services/assets/"
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "./content-services/assets/"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-core/i18n",
"output": "./assets/@alfresco/core/i18n"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-insights/i18n",
"output": "./assets/@alfresco/insights/i18n"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-process-services/i18n",
"output": "./assets/@alfresco/process-services/i18n"
},
{
"glob": "**/*",
"input": "../node_modules/@alfresco/adf-content-services/i18n",
"output": "./assets/@alfresco/content-services/i18n"
"output": "./assets/"
},
{ "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
],
@ -92,8 +73,8 @@
"prod": "environments/environment.prod.ts"
}
},
{
"name" :"dev",
"root": "src",
"outDir": "dist",
"assets": [
@ -125,26 +106,6 @@
"input": "../../lib/insights/bundles/assets",
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../../lib/core/i18n",
"output": "./@alfresco/core/i18n"
},
{
"glob": "**/*",
"input": "../../lib/insights/i18n",
"output": "./@alfresco/insights/i18n"
},
{
"glob": "**/*",
"input": "../../lib/process-services/i18n",
"output": "./@alfresco/process-services/i18n"
},
{
"glob": "**/*",
"input": "../../lib/content-services/i18n",
"output": "./@alfresco/content-services/i18n"
},
{ "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
],
"index": "index.html",

View File

@ -5,9 +5,9 @@
"author": "Alfresco Software, Ltd.",
"scripts": {
"ng": "ng",
"start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --app=0 --open --aot=true",
"start:dev": "npm run style:dev & npm run clean-lib-angular && npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --app=1 pp-dev --proxy-config proxy.conf.js --open",
"start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --app=0",
"start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --app dist --open --aot=true",
"start:dev": "npm run style:dev & npm run clean-lib-angular && npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --app dev pp-dev --proxy-config proxy.conf.js --open",
"start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --app dist",
"build": "npm run server-versions && rimraf dist && ng build -app=0",
"build:dev": "npm run style:dev & npm run server-versions && rimraf dist && ng build -app=1",
"style:dev": "npm run webpack -- --config config/webpack.style.js --progress --profile --bail --watch",

View File

@ -16,7 +16,7 @@
*/
import { Component, Inject, OnInit } from '@angular/core';
import { FormModel, FormService, LogService } from '@alfresco/adf-core';
import { FormModel, FormService } from '@alfresco/adf-core';
import { InMemoryFormService } from '../../services/in-memory-form.service';
import { DemoForm } from './demo-form';
@ -32,12 +32,8 @@ export class FormComponent implements OnInit {
form: FormModel;
constructor(@Inject(FormService) private formService: InMemoryFormService, private logSevice: LogService) {
// Prevent default outcome actions
formService.executeOutcome.subscribe(e => {
e.preventDefault();
this.logSevice.log(e.outcome);
});
constructor(@Inject(FormService) private formService: InMemoryFormService) {
}
ngOnInit() {

View File

@ -16,7 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService } from '@alfresco/adf-core';
import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService, FormValues, FormModel, FormOutcomeModel } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
interface ActivitiData {
@ -62,6 +62,23 @@ export class InMemoryFormService extends FormService {
});
}
parseForm(json: any, data?: FormValues, readOnly: boolean = false): FormModel {
if (json) {
let form = new FormModel(json, data, readOnly, this);
if (!json.fields) {
form.outcomes = [
new FormOutcomeModel(form, {
id: '$custom',
name: FormOutcomeModel.SAVE_ACTION,
isSystem: true
})
];
}
return form;
}
return null;
}
/** @override */
getRestFieldValuesByProcessId(processDefinitionId: string, fieldId: string): Observable<any> {
// Uncomment this to use original call

View File

@ -109,7 +109,9 @@ module.exports = {
return resourcePath.replace('assets/', 'bundles/assets/') + url;
},
publicPath: (url, resourcePath)=> {
return resourcePath + url;
var component = resourcePath.substring(0, resourcePath.indexOf('/'));
var path = resourcePath.replace(component, '');
return path + url;
}
}
}
@ -145,7 +147,7 @@ module.exports = {
... alfrescoLibs.map(lib => {
return {
from: `${lib}/i18n/`,
to: `${lib}/bundles/assets/${lib}/i18n/`
to: `${lib}/bundles/assets/adf-${lib}/i18n/`
}
})
]),

View File

@ -2,13 +2,6 @@ npm-debug.log
.idea
.npmrc
coverage/
demo/
dist/
node_modules
typings/
fonts/
/.editorconfig
/.travis.yml
/*.json
@ -17,3 +10,18 @@ fonts/
/gulpfile.ts
/.npmignore
/.happypack
**/*.html
**/*.js
**/*.ts
!**/*.d.ts
!**/adf-content-services.js
coverage/
demo/
dist/
node_modules
typings/
fonts/
i18n/
assets/

View File

@ -62,8 +62,8 @@ import { DirectiveModule } from './directive';
provide: TRANSLATION_PROVIDER,
multi: true,
useValue: {
name: '@alfresco/content-services',
source: '@alfresco/content-services'
name: 'adf-content-services',
source: 'assets/adf-content-services'
}
}
],

View File

@ -2,13 +2,6 @@ npm-debug.log
.idea
.npmrc
coverage/
demo/
dist/
node_modules
typings/
fonts/
/.editorconfig
/.travis.yml
/*.json
@ -17,3 +10,17 @@ fonts/
/gulpfile.ts
/.npmignore
/.happypack
**/*.html
**/*.js
**/*.ts
!**/*.d.ts
!**/adf-core.js
coverage/
demo/
dist/
node_modules
typings/
fonts/
i18n/
assets/

View File

@ -85,8 +85,8 @@ export function createTranslateLoader(http: HttpClient, logService: LogService)
provide: TRANSLATION_PROVIDER,
multi: true,
useValue: {
name: '@alfresco/core',
source: '@alfresco/core'
name: 'adf-core',
source: 'assets/adf-core'
}
}
],

View File

@ -1,97 +0,0 @@
# Node Permission Directive
<!-- markdown-toc start - Don't edit this section. npm run toc to generate it-->
<!-- toc -->
- [Properties](#properties)
- [HTML element example](#html-element-example)
- [Angular component example](#angular-component-example)
* [Implementing the NodePermissionSubject interface](#implementing-the-nodepermissionsubject-interface)
* [Defining your components as an EXTENDIBLE_COMPONENT parent component](#defining-your-components-as-an-extendible_component-parent-component)
<!-- tocstop -->
<!-- markdown-toc end -->
The `NodePermissionDirective` allows you to disable an HTML element or Angular component
by taking a collection of the `MinimalNodeEntity` instances and checking the particular permission.
The decorated element will be disabled if:
- there are no nodes in the collection
- at least one of the nodes has no expected permission
## Properties
| Name | Type | Default | Description |
| --- | --- | --- | --- |
| adf-node-permission | [Permissions](https://github.com/Alfresco/alfresco-ng2-components/blob/master/ng2-components/ng2-alfresco-core/src/models/permissions.enum.ts) | null | Node permission to check (create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions)|
| adf-nodes | MinimalNodeEntity[] | [] | Nodes to check permission for |
## HTML element example
The best example to show `NodePermissionDirective` in action is by binding DocumentList selection property to a toolbar button.
For example the "Delete" button should be disabled if no selection is present or if user has no rights to delete at least one node in the selection.
```html
<adf-toolbar title="toolbar example">
<button md-icon-button
adf-node-permission="delete"
[adf-nodes]="documentList.selection">
<md-icon>delete</md-icon>
</button>
</adf-toolbar>
<adf-document-list #documentList ...>
...
</adf-document-list>
```
The button will become disabled by default, and is going to change its state once user selects/unselects one or multiple documents that current user has permission to delete.
## Angular component example
You can apply the directive on any angular component which implements the NodePermissionSubject interface. The upload drag area component can be a good candidate, since this one implements that interface. Applying the directive on an angular component is pretty much the same as applying it on an html element.
```html
<alfresco-upload-drag-area
[parentId]="..."
[versioning]="..."
[adf-node-permission]="'create'"
[adf-nodes]="getCurrentDocumentListNode()">
...
</alfresco-upload-drag-area>
```
When designing a component you want to work this directive with, you have two important things to care about.
### Implementing the NodePermissionSubject interface
The component has to implement the NodePermissionSubject interface which basically means it has to have a boolean **disabled** property. This is the property which will be set by the directive.
```js
import { NodePermissionSubject } from 'ng2-alfresco-core';
@Component({...})
export class UploadDragAreaComponent implements NodePermissionSubject {
public disabled: boolean = false;
}
```
### Defining your components as an EXTENDIBLE_COMPONENT parent component
The directive will look up the component in the dependency injection tree, up to at most one step above the current DI level (@Host). Because of this, you have to provide your component with forward referencing as the EXTENDIBLE_COMPONENT.
```js
import { EXTENDIBLE_COMPONENT } from 'ng2-alfresco-core';
@Component({
...
providers: [
{ provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadDragAreaComponent)}
]
})
export class UploadDragAreaComponent implements NodePermissionSubject { ... }
```

View File

@ -2,13 +2,6 @@ npm-debug.log
.idea
.npmrc
coverage/
demo/
dist/
node_modules
typings/
fonts/
/.editorconfig
/.travis.yml
/*.json
@ -17,3 +10,17 @@ fonts/
/gulpfile.ts
/.npmignore
/.happypack
**/*.html
**/*.js
**/*.ts
!**/*.d.ts
!**/adf-insights.js
coverage/
demo/
dist/
node_modules
typings/
fonts/
i18n/
assets/

View File

@ -42,8 +42,8 @@ import { DiagramsModule } from './diagram';
provide: TRANSLATION_PROVIDER,
multi: true,
useValue: {
name: '@alfresco/insights',
source: '@alfresco/insights'
name: 'adf-insights',
source: 'assets/adf-insights'
}
}
],

View File

@ -2,13 +2,6 @@ npm-debug.log
.idea
.npmrc
coverage/
demo/
dist/
node_modules
typings/
fonts/
/.editorconfig
/.travis.yml
/*.json
@ -17,3 +10,17 @@ fonts/
/gulpfile.ts
/.npmignore
/.happypack
**/*.html
**/*.js
**/*.ts
!**/*.d.ts
!**/adf-process-services.js
coverage/
demo/
dist/
node_modules
typings/
fonts/
i18n/
assets/

View File

@ -50,8 +50,8 @@ import { PeopleModule } from './people';
provide: TRANSLATION_PROVIDER,
multi: true,
useValue: {
name: '@alfresco/process-services',
source: '@alfresco/process-services'
name: 'adf-process-services',
source: 'assets/adf-process-services'
}
}
],