+
+
+
+
+ more_vert
+
+
+
+
-
-
+
+
more_vert
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
index 97ee9b96175..db1ec812505 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { CoreModule } from 'ng2-alfresco-core';
import { DataTableComponent } from './datatable.component';
import {
DataRow,
@@ -26,23 +28,75 @@ import {
describe('DataTable', () => {
+ let fixture: ComponentFixture;
let dataTable: DataTableComponent;
+ let element: any;
let eventMock: any;
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [
+ CoreModule.forRoot()
+ ],
+ declarations: [DataTableComponent]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DataTableComponent);
+ dataTable = fixture.componentInstance;
+ element = fixture.debugElement.nativeElement;
+
+ // usernameInput = element.querySelector('#username');
+ // passwordInput = element.querySelector('#password');
+
+ fixture.detectChanges();
+ });
+
beforeEach(() => {
// reset MDL handler
window['componentHandler'] = null;
- dataTable = new DataTableComponent();
+ // dataTable = new DataTableComponent();
eventMock = {
preventDefault: function () {}
};
});
+ it('should put actions menu to the right by default', () => {
+ dataTable.data = new ObjectDataTableAdapter([], [
+ {},
+ {},
+ {}
+ ]);
+ dataTable.actions = true;
+ fixture.detectChanges();
+
+ let headers = element.querySelectorAll('th');
+ expect(headers.length).toBe(4);
+ expect(headers[headers.length - 1].classList.contains('alfresco-datatable__actions-header')).toBeTruthy();
+ });
+
+ it('should put actions menu to the left', () => {
+ dataTable.data = new ObjectDataTableAdapter([], [
+ {},
+ {},
+ {}
+ ]);
+ dataTable.actions = true;
+ dataTable.actionsPosition = 'left';
+ fixture.detectChanges();
+
+ let headers = element.querySelectorAll('th');
+ expect(headers.length).toBe(4);
+ expect(headers[0].classList.contains('alfresco-datatable__actions-header')).toBeTruthy();
+ });
+
it('should initialize default adapter', () => {
- expect(dataTable.data).toBeUndefined();
- dataTable.ngOnInit();
- expect(dataTable.data).toEqual(jasmine.any(ObjectDataTableAdapter));
+ let table = new DataTableComponent();
+ expect(table.data).toBeUndefined();
+ table.ngOnInit();
+ expect(table.data).toEqual(jasmine.any(ObjectDataTableAdapter));
});
it('should initialize with custom data', () => {
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 b8497b9ebcd..312c817a56b 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
@@ -44,6 +44,9 @@ export class DataTableComponent implements OnInit {
@Input()
actions: boolean = false;
+ @Input()
+ actionsPosition: string = 'right'; // left|right
+
@Input()
fallbackThumbnail: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md
index 72b9c57675f..79adda68487 100644
--- a/ng2-components/ng2-alfresco-documentlist/README.md
+++ b/ng2-components/ng2-alfresco-documentlist/README.md
@@ -92,8 +92,8 @@ Follow the 3 steps below:
- ng2-alfresco-datatable
- ng2-alfresco-documentlist
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+
## Basic usage
@@ -181,6 +181,7 @@ The properties currentFolderId, folderNode and node are the entry initialization
| `fallbackThumbnail` | string | | Path to fallback image to use if the row thumbnail is missing |
| `multiselect` | boolean | false | Toggles multiselect mode |
| `contentActions` | boolean | false | Toggles content actions for each row |
+| `contentActionsPosition` | string (left\|right) | right | Position of the content actions dropdown menu. |
| `contextMenuActions` | boolean | false | Toggles context menus for each row |
| `enablePagination` | boolean | true | Shows pagination |
| `creationMenuActions` | boolean | true | Toggles the creation menu actions|
@@ -488,7 +489,7 @@ context.row.getValue('name')
context.row.getValue('createdByUser.displayName')
```
-_You may want using **row** api to get raw value access.
+You may want using **row** api to get raw value access.
```html
@@ -501,7 +502,7 @@ _You may want using **row** api to get raw value access.
Use **data** api to get values with post-processing, like datetime/icon conversion._
-Final example, we'll name the context as `entry`:
+In the Example below will prepend `Hi!` to each file and folder name in the list:
```html
@@ -511,9 +512,21 @@ Final example, we'll name the context as `entry`:
```
-Example above will prepend `Hi!` to each file and folder name in the list.
+In the Example below will add the [ng2-alfresco-tag](https://www.npmjs.com/package/ng2-alfresco-tag) component is integrate in the document list.
+```html
+
+
+
+
+```
+
### Actions
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index 581bb68be74..f4ebcfd99b3 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -12,6 +12,7 @@
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+ "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -35,10 +36,10 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-datatable": "1.1.0",
- "ng2-alfresco-documentlist": "^1.1.0",
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-datatable": "1.2.0",
+ "ng2-alfresco-documentlist": "1.2.0",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"intl": "^1.2.5"
diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png
new file mode 100644
index 00000000000..769147a677c
Binary files /dev/null and b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png differ
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 3eba47e40c2..1c765ff0de8 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-documentlist",
"description": "Alfresco Angular2 Document List Component",
- "version": "1.1.0",
+ "version": "1.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@@ -69,13 +69,13 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-datatable": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-datatable": "1.2.0"
},
"devDependencies": {
- "@types/jasmine": "^2.2.33",
- "@types/node": "^6.0.42",
+ "@types/jasmine": "2.5.35",
+ "@types/node": "6.0.45",
"autoprefixer": "^6.5.4",
"concurrently": "^2.2.0",
"cpx": "1.3.1",
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 340bdfad79f..58901295083 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
@@ -7,6 +7,7 @@
-
-
- add {{ 'BUTTON.ACTION_CREATE' | translate }}
+
+ add
+ {{ 'ALFRESCO_DOCUMENT_LIST.BUTTON.ACTION_CREATE' | translate }}
+
+
+
+ create_new_folder
+ {{ 'ALFRESCO_DOCUMENT_LIST.BUTTON.ACTION_NEW_FOLDER' | translate }}
-
-
+
- {{ 'BUTTON.ACTION_NEW_FOLDER' | translate }}
+ {{ 'ALFRESCO_DOCUMENT_LIST.BUTTON.ACTION_NEW_FOLDER' | translate }}
- {{ 'BUTTON.CREATE' | translate }}
- {{ 'BUTTON.CANCEL' | translate}}
+ {{ 'ALFRESCO_DOCUMENT_LIST.BUTTON.CREATE' | translate }}
+ {{ 'ALFRESCO_DOCUMENT_LIST.BUTTON.CANCEL' | translate}}
-
\ No newline at end of file
+
diff --git a/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json b/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
index e3beb136010..18a639d2513 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
@@ -1,22 +1,10 @@
{
- "ICONS": {
- "ft_ic_folder": "Folder",
- "ft_ic_raster_image": "Image file",
- "ft_ic_pdf": "PDF document",
- "ft_ic_ms_excel": "Microsoft Excel file",
- "ft_ic_ms_word": "Microsoft Word document",
- "ft_ic_ms_powerpoint": "Microsoft PowerPoint file",
- "ft_ic_video": "Video file",
- "ft_ic_document": "Document file",
- "ft_ic_website": "Web resource",
- "ft_ic_archive": "Archive file",
- "ft_ic_presentation": "Presentation file",
- "ft_ic_spreadsheet": "Spreadsheet file"
- },
- "BUTTON": {
- "ACTION_CREATE": "Create...",
- "ACTION_NEW_FOLDER": "New Folder",
- "CREATE": "Create",
- "CANCEL": "Cancel"
+ "ALFRESCO_DOCUMENT_LIST": {
+ "BUTTON": {
+ "ACTION_CREATE": "Create...",
+ "ACTION_NEW_FOLDER": "New Folder",
+ "CREATE": "Create",
+ "CANCEL": "Cancel"
+ }
}
}
diff --git a/ng2-components/ng2-alfresco-documentlist/src/i18n/ru.json b/ng2-components/ng2-alfresco-documentlist/src/i18n/ru.json
new file mode 100644
index 00000000000..25e86e88633
--- /dev/null
+++ b/ng2-components/ng2-alfresco-documentlist/src/i18n/ru.json
@@ -0,0 +1,10 @@
+{
+ "ALFRESCO_DOCUMENT_LIST": {
+ "BUTTON": {
+ "ACTION_CREATE": "Создать...",
+ "ACTION_NEW_FOLDER": "Новая папка",
+ "CREATE": "Создать",
+ "CANCEL": "Отмена"
+ }
+ }
+}
diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md
index 86dd38ea257..b5ea5646869 100644
--- a/ng2-components/ng2-alfresco-login/README.md
+++ b/ng2-components/ng2-alfresco-login/README.md
@@ -37,6 +37,8 @@
Before you start using this development framework, make sure you have installed all required software and done all the
necessary configuration, see this [page](https://github.com/Alfresco/alfresco-ng2-components/blob/master/PREREQUISITES.md).
+See it live: [Login Quickstart](http://embed.plnkr.co/PfZytJyHcl3xIsa8pdMo/)
+
## Install
Follow the 3 steps below:
@@ -90,8 +92,8 @@ Follow the 3 steps below:
- alfresco-js-api
- ng2-alfresco-login
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+
## Basic usage
@@ -177,7 +179,7 @@ platformBrowserDynamic().bootstrapModule(AppModule);
## Change footer content
-{{'LOGIN.LABEL.USERNAME' | translate }}
;
@@ -130,7 +131,7 @@ export class AlfrescoLoginComponent implements OnInit {
if (args.defaultPrevented) {
return false;
} else {
- this.performeLogin(values);
+ this.performLogin(values);
}
}
@@ -161,7 +162,7 @@ export class AlfrescoLoginComponent implements OnInit {
* Performe the login service
* @param values
*/
- private performeLogin(values: any) {
+ private performLogin(values: any) {
this.authService.login(values.username, values.password)
.subscribe(
(token: any) => {
@@ -266,6 +267,13 @@ export class AlfrescoLoginComponent implements OnInit {
return !field.valid && field.dirty && !field.pristine;
}
+ /**
+ * Trim username
+ */
+ trimUsername(event: any) {
+ event.target.value = event.target.value.trim();
+ }
+
/**
* Default formError values
*/
@@ -299,14 +307,14 @@ export class AlfrescoLoginComponent implements OnInit {
}
};
- this.translateService.get('LOGIN.MESSAGES.USERNAME-MIN', {minLenght: this.minLenght}).subscribe((res: string) => {
+ this.translateService.get('LOGIN.MESSAGES.USERNAME-MIN', {minLength: this.minLength}).subscribe((res: string) => {
this._message['username']['minlength'] = res;
});
}
private initFormFieldsDefault() {
this.form = this._fb.group({
- username: ['', Validators.compose([Validators.required, Validators.minLength(this.minLenght)])],
+ username: ['', Validators.compose([Validators.required, Validators.minLength(this.minLength)])],
password: ['', Validators.required]
});
}
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json
index 6abc5529652..3ca1c4cb95d 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json
@@ -16,7 +16,7 @@
"LOGIN-SUCCESS": "Login successful",
"LOGIN-ERROR-CORS": "CORS exception, check your server configuration",
"LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component",
- "LOGIN-ECM-LICENSE": "The ECM is in read-only mode"
+ "LOGIN-ECM-LICENSE": "Content Services repository is in read-only mode"
},
"BUTTON": {
"LOGIN": "SIGN IN"
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json
index b1c50a86bfb..44856a36821 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/it.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/it.json
@@ -15,7 +15,7 @@
"LOGIN-SUCCESS": "Login effettuata con successo",
"LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server",
"LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component",
- "LOGIN-ECM-LICENSE": "l'ECM e' in read-only mode"
+ "LOGIN-ECM-LICENSE": "l'Content Services e' in read-only mode"
},
"BUTTON": {
"LOGIN": "Accedi"
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/ru.json b/ng2-components/ng2-alfresco-login/src/i18n/ru.json
new file mode 100644
index 00000000000..29a02225ac6
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/i18n/ru.json
@@ -0,0 +1,29 @@
+{
+ "LOGIN": {
+ "LOGO": "Alfresco",
+ "LABEL": {
+ "LOGIN": "Логин",
+ "USERNAME": "Имя пользователя",
+ "PASSWORD": "Пароль",
+ "REMEMBER": "Запомнить?"
+ },
+ "MESSAGES": {
+ "USERNAME-REQUIRED": "Обязательное поле",
+ "USERNAME-MIN": "Имя пользователя должно быть не меньше {{customMinLenght}} символов.",
+ "PASSWORD-REQUIRED": "Введите пароль для входа",
+ "LOGIN-ERROR-CREDENTIALS": "Не правильный логин или пароль",
+ "LOGIN-ERROR-PROVIDERS": "Ошибка при авторизации",
+ "LOGIN-SUCCESS": "Вы успешно авторизовались",
+ "LOGIN-ERROR-CORS": "CORS exception, проверьте настройки на сервере",
+ "LOGIN-ERROR-CSRF": "CSRF exception, установите [disableCsrf]=\"true\" в alfresco-login компоненте",
+ "LOGIN-ECM-LICENSE": "Content Services находится в режиме для чтения"
+ },
+ "BUTTON": {
+ "LOGIN": "ВОЙТИ"
+ },
+ "ACTION": {
+ "HELP": "НУЖНА ПОМОЩЬ?",
+ "REGISTER": "РЕГИСТРАЦИЯ"
+ }
+ }
+}
diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md
index 7023fc91c06..8adfd5bd9e6 100644
--- a/ng2-components/ng2-alfresco-search/README.md
+++ b/ng2-components/ng2-alfresco-search/README.md
@@ -91,8 +91,8 @@ Follow the 3 steps below:
- ng2-alfresco-search
- ng2-alfresco-documentlist
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+
#### Basic usage
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index a0b87ffac02..389856ab1b6 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -12,6 +12,7 @@
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+ "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -68,11 +69,11 @@
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-datatable": "1.1.0",
- "ng2-alfresco-documentlist": "1.1.0",
- "ng2-alfresco-search": "^1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-datatable": "1.2.0",
+ "ng2-alfresco-documentlist": "1.2.0",
+ "ng2-alfresco-search": "1.2.0"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index f5a42668bd7..0e32422a610 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-search",
"description": "Alfresco Angular2 Search Component",
- "version": "1.1.0",
+ "version": "1.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@@ -69,14 +69,14 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-datatable": "1.1.0",
- "ng2-alfresco-documentlist": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-datatable": "1.2.0",
+ "ng2-alfresco-documentlist": "1.2.0"
},
"devDependencies": {
- "@types/jasmine": "^2.2.33",
- "@types/node": "^6.0.42",
+ "@types/jasmine": "2.5.35",
+ "@types/node": "6.0.45",
"autoprefixer": "^6.5.4",
"concurrently": "^2.2.0",
"cpx": "1.3.1",
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
index f9fc563d48c..e0515470150 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
@@ -37,13 +37,13 @@ export class AlfrescoSearchService {
* @param options Additional options passed to the search
* @returns {Observable} Search results
*/
- public getNodeQueryResults(term: string, options?: SearchOptions): Observable {
+ getNodeQueryResults(term: string, options?: SearchOptions): Observable {
return Observable.fromPromise(this.getQueryNodesPromise(term, options))
.map(res => res)
.catch(err => this.handleError(err));
}
- private getQueryNodesPromise(term: string, opts: SearchOptions): Promise {
+ getQueryNodesPromise(term: string, opts: SearchOptions): Promise {
return this.apiService.getInstance().core.queriesApi.findNodes(term, opts);
}
diff --git a/ng2-components/ng2-alfresco-tag/README.md b/ng2-components/ng2-alfresco-tag/README.md
index f46fb226707..92286a232c9 100644
--- a/ng2-components/ng2-alfresco-tag/README.md
+++ b/ng2-components/ng2-alfresco-tag/README.md
@@ -91,8 +91,8 @@ Follow the 3 steps below:
- ng2-alfresco-core
- ng2-alfresco-tag
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+
#### Basic usage
diff --git a/ng2-components/ng2-alfresco-tag/demo/package.json b/ng2-components/ng2-alfresco-tag/demo/package.json
index 026ae547ed5..173840b52b7 100644
--- a/ng2-components/ng2-alfresco-tag/demo/package.json
+++ b/ng2-components/ng2-alfresco-tag/demo/package.json
@@ -12,6 +12,7 @@
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+ "travis": "npm link ng2-alfresco-core",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -40,9 +41,9 @@
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-tag": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-tag": "1.2.0"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json
index f82bd328acd..8adb39e0642 100644
--- a/ng2-components/ng2-alfresco-tag/package.json
+++ b/ng2-components/ng2-alfresco-tag/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-tag",
"description": "Alfresco tag component",
- "version": "1.1.0",
+ "version": "1.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@@ -48,12 +48,12 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0"
},
"devDependencies": {
- "@types/jasmine": "^2.2.33",
- "@types/node": "^6.0.42",
+ "@types/jasmine": "2.5.35",
+ "@types/node": "6.0.45",
"autoprefixer": "^6.5.4",
"concurrently": "^2.2.0",
"cpx": "^1.3.1",
diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.css b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.css
index 4814eedacc3..02bb5dc60a1 100644
--- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.css
+++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.css
@@ -7,13 +7,8 @@
}
.tag-input {
+ margin-right: 11px;
float: left;
- margin-left: 11px!important;
-}
-
-.tag-label {
- left: 10px!important;
- top: 12px!important;
}
.tag-container-input{
@@ -26,3 +21,7 @@
.tag-button{
float:left
}
+
+.mdl-textfield__error {
+ visibility: visible !important;
+}
diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html
index 928a7028224..ba07f745740 100644
--- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html
+++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html
@@ -9,13 +9,14 @@
-
@@ -28,12 +29,13 @@
-
-
-
New Tag...
+
+ {{'TAG.LABEL.NEWTAG' | translate }}
+ {{errorMsg}}
+
+ {{'TAG.BUTTON.ADD' | translate }}
+
-
- Add tag
-
diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts
index cf0a1c92105..5c203504d7e 100644
--- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts
+++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts
@@ -153,5 +153,24 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
status: 200
});
});
+
+ it('The input box should be cleared after add tag', (done) => {
+ component.nodeId = 'fake-node-id';
+ component.newTagName = 'fake-tag-name';
+
+ fixture.detectChanges();
+
+ component.addEmitter.subscribe(() => {
+ expect(component.newTagName).toBe('');
+ done();
+ });
+
+ let addButton: any = element.querySelector('#add-tag');
+ addButton.click();
+
+ jasmine.Ajax.requests.mostRecent().respondWith({
+ status: 200
+ });
+ });
});
});
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 be67f174077..65880a2f334 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
@@ -17,6 +17,7 @@
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { TagService } from './../services/tag.service';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
/**
*
@@ -49,14 +50,15 @@ export class TagActionsComponent {
tagsEntries: any;
- /**
- * Constructor
- * @param authService
- */
- constructor(private tagService: TagService) {
+ errorMsg: string;
+
+ constructor(private tagService: TagService, private translateService: AlfrescoTranslationService) {
+ if (translateService) {
+ translateService.addTranslationFolder('ng2-alfresco-tag', 'node_modules/ng2-alfresco-tag/src');
+ }
}
- ngOnChanges(changes) {
+ ngOnChanges() {
return this.refreshTag();
}
@@ -68,12 +70,31 @@ export class TagActionsComponent {
}
addTag() {
- this.tagService.addTag(this.nodeId, this.newTagName).subscribe((res) => {
+ if (this.searchTag(this.newTagName)) {
+ this.translateService.get('TAG.MESSAGES.EXIST').subscribe((error) => {
+ this.errorMsg = error;
+ });
+ }
+
+ this.tagService.addTag(this.nodeId, this.newTagName).subscribe(() => {
+ this.newTagName = '';
this.refreshTag();
this.addEmitter.emit(this.nodeId);
});
}
+ searchTag(searchTagName: string) {
+ if (this.tagsEntries) {
+ return this.tagsEntries.find((currentTag) => {
+ return (searchTagName === currentTag.entry.tag);
+ });
+ }
+ }
+
+ cleanErrorMsg() {
+ this.errorMsg = '';
+ }
+
removeTag(tag: string) {
this.tagService.removeTag(this.nodeId, tag).subscribe(() => {
this.refreshTag();
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 7337f019df2..3afe4187f65 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
@@ -39,7 +39,7 @@ export class TagList {
/**
* Constructor
- * @param authService
+ * @param tagService
*/
constructor(private tagService: TagService) {
}
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 a0f7fe134ed..84d16b8c978 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
@@ -43,12 +43,12 @@ export class TagNodeList {
/**
* Constructor
- * @param authService
+ * @param tagService
*/
constructor(private tagService: TagService) {
}
- ngOnChanges(changes) {
+ ngOnChanges() {
return this.refreshTag();
}
diff --git a/ng2-components/ng2-alfresco-tag/src/i18n/en.json b/ng2-components/ng2-alfresco-tag/src/i18n/en.json
new file mode 100644
index 00000000000..3e21bd46461
--- /dev/null
+++ b/ng2-components/ng2-alfresco-tag/src/i18n/en.json
@@ -0,0 +1,13 @@
+{
+ "TAG": {
+ "LABEL": {
+ "NEWTAG": "New Tag"
+ },
+ "MESSAGES": {
+ "EXIST":"Tag already exist"
+ },
+ "BUTTON": {
+ "ADD": "Add Tag"
+ }
+ }
+}
diff --git a/ng2-components/ng2-alfresco-tag/src/i18n/it.json b/ng2-components/ng2-alfresco-tag/src/i18n/it.json
new file mode 100644
index 00000000000..6e3be152cbf
--- /dev/null
+++ b/ng2-components/ng2-alfresco-tag/src/i18n/it.json
@@ -0,0 +1,13 @@
+{
+ "TAG": {
+ "LABEL": {
+ "NEWTAG": "Nuovo Tag"
+ },
+ "MESSAGES": {
+ "EXIST":"Tag già presente"
+ },
+ "BUTTON": {
+ "ADD": "Aggiungi Tag"
+ }
+ }
+}
diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts
index 72e77d221e8..6027115b11d 100644
--- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts
+++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts
@@ -20,17 +20,11 @@ import { Observable } from 'rxjs/Rx';
import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
/**
- * @returns {TagService} .
+ * @returns {TagService}
*/
-declare let __moduleName: string;
-
@Injectable()
export class TagService {
- /**
- * Constructor
- * @param apiService
- */
constructor(private apiService: AlfrescoApiService,
private logService: LogService) {
}
diff --git a/ng2-components/ng2-alfresco-upload/README.md b/ng2-components/ng2-alfresco-upload/README.md
index 8f0476eb309..d53522d3eae 100644
--- a/ng2-components/ng2-alfresco-upload/README.md
+++ b/ng2-components/ng2-alfresco-upload/README.md
@@ -91,8 +91,8 @@ Follow the 3 steps below:
- ng2-alfresco-core
- ng2-alfresco-upload
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+
#### Basic usage
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index fa2a29a919c..960fe7de025 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -12,6 +12,7 @@
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+ "travis": "npm link ng2-alfresco-core",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -68,9 +69,9 @@
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-upload": "^1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-upload": "1.2.0"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 3a8444df699..cbc96bc516d 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-upload",
"description": "Alfresco Angular2 Upload Component",
- "version": "1.1.0",
+ "version": "1.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@@ -70,12 +70,12 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0"
},
"devDependencies": {
- "@types/jasmine": "^2.2.33",
- "@types/node": "^6.0.42",
+ "@types/jasmine": "2.5.35",
+ "@types/node": "6.0.45",
"autoprefixer": "^6.5.4",
"concurrently": "^2.2.0",
"cpx": "1.3.1",
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 4fb35ec4862..4ae3b1d1b38 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
@@ -156,7 +156,7 @@ export class UploadButtonComponent {
* @param path
* @param files
*/
- private uploadFiles(path: string, files: any[]) {
+ uploadFiles(path: string, files: any[]) {
if (files.length) {
let latestFilesAdded = this.uploadService.addToQueue(files);
this.uploadService.uploadFilesInTheQueue(this.rootFolderId, path, this.onSuccess);
diff --git a/ng2-components/ng2-alfresco-upload/src/i18n/ru.json b/ng2-components/ng2-alfresco-upload/src/i18n/ru.json
new file mode 100644
index 00000000000..29e22359a04
--- /dev/null
+++ b/ng2-components/ng2-alfresco-upload/src/i18n/ru.json
@@ -0,0 +1,25 @@
+{
+ "FILE_UPLOAD": {
+ "BUTTON": {
+ "UPLOAD_FILE": "Загрузить файл",
+ "UPLOAD_FOLDER": "Загрузить папку",
+ "CANCEL": "ОТМЕНА"
+ },
+ "MESSAGES": {
+ "SINGLE_COMPLETED": "файл загружен",
+ "COMPLETED": "файлы загружены",
+ "PROGRESS": "Идет загрузка...",
+ "FOLDER_ALREADY_EXIST": "Папка {0} уже существует",
+ "FOLDER_NOT_SUPPORTED": "Данный браузер не поддерживает загрузку папки"
+ },
+ "FILE_INFO": {
+ "NAME": "Имя файла",
+ "PROGRESS": "File progress",
+ "SIZE": "Размер",
+ "ACTION": "Действие"
+ },
+ "ACTION": {
+ "UNDO": "Отменить"
+ }
+ }
+}
diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
index 480a766d93d..788cf7f4a7f 100644
--- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
+++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
@@ -20,6 +20,7 @@ import { Response } from '@angular/http';
import { Observer, Observable } from 'rxjs/Rx';
import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
import { FileModel } from '../models/file.model';
+import { MinimalNodeEntity } from 'alfresco-js-api';
/**
*
@@ -170,7 +171,7 @@ export class UploadService {
.catch(err => this.handleError(err));
}
- private callApiCreateFolder(relativePath: string, name: string) {
+ callApiCreateFolder(relativePath: string, name: string): Promise
{
return this.apiService.getInstance().nodes.createFolder(name, relativePath);
}
diff --git a/ng2-components/ng2-alfresco-userinfo/README.md b/ng2-components/ng2-alfresco-userinfo/README.md
index 7ee340242ae..0073c8fd54f 100644
--- a/ng2-components/ng2-alfresco-userinfo/README.md
+++ b/ng2-components/ng2-alfresco-userinfo/README.md
@@ -91,8 +91,8 @@ Follow the 3 steps below:
- ng2-alfresco-core
- ng2-alfresco-userinfo
- Please refer to the following example file: [systemjs.config.js](demo/systemjs
- .config.js) .
+ Please refer to the following example file: [systemjs.config.js](demo/systemjs.config.js) .
+.
## Basic usage
diff --git a/ng2-components/ng2-alfresco-userinfo/demo/package.json b/ng2-components/ng2-alfresco-userinfo/demo/package.json
index 5d47fa3c61f..af1565e3b70 100644
--- a/ng2-components/ng2-alfresco-userinfo/demo/package.json
+++ b/ng2-components/ng2-alfresco-userinfo/demo/package.json
@@ -12,6 +12,7 @@
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+ "travis": "npm link ng2-alfresco-core",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -40,10 +41,10 @@
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0",
- "ng2-alfresco-login": "1.1.0",
- "ng2-alfresco-userinfo": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0",
+ "ng2-alfresco-login": "1.2.0",
+ "ng2-alfresco-userinfo": "1.2.0"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json
index 37294ef70c3..21845e344ef 100644
--- a/ng2-components/ng2-alfresco-userinfo/package.json
+++ b/ng2-components/ng2-alfresco-userinfo/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-userinfo",
"description": "Alfresco User Info component",
- "version": "1.1.0",
+ "version": "1.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@@ -48,12 +48,12 @@
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.1.0",
- "ng2-alfresco-core": "1.1.0"
+ "alfresco-js-api": "~1.2.0",
+ "ng2-alfresco-core": "1.2.0"
},
"devDependencies": {
- "@types/jasmine": "^2.2.33",
- "@types/node": "^6.0.42",
+ "@types/jasmine": "2.5.35",
+ "@types/node": "6.0.45",
"autoprefixer": "^6.5.4",
"concurrently": "^2.2.0",
"cpx": "^1.3.1",
diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
index cc90f10709c..4cd58d5c4b9 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
@@ -13,8 +13,8 @@
for="user-profile" (click)="stopClosing($event)">