diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html index cdb4077c1f..0dedd55407 100644 --- a/demo-shell-ng2/app/app.component.html +++ b/demo-shell-ng2/app/app.component.html @@ -64,7 +64,7 @@
- +
diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts index 29aeab1cc7..933d484f3c 100644 --- a/demo-shell-ng2/app/app.module.ts +++ b/demo-shell-ng2/app/app.module.ts @@ -16,58 +16,131 @@ */ import { NgModule } from '@angular/core'; +import { HttpModule } from '@angular/http'; import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { TranslateModule } from 'ng2-translate/ng2-translate'; import { SearchModule } from 'ng2-alfresco-search'; +import { LoginModule } from 'ng2-alfresco-login'; import { AppComponent } from './app.component'; import { routing } from './app.routes'; import { SearchBarComponent } from './components/index'; -import { MDL, ALFRESCO_CORE_PROVIDERS, CONTEXT_MENU_DIRECTIVES, AlfrescoPipeTranslate } from 'ng2-alfresco-core'; -import { ALFRESCO_LOGIN_DIRECTIVES } from 'ng2-alfresco-login'; +import { MDL, ALFRESCO_CORE_PROVIDERS, CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core'; import { ALFRESCO_DATATABLE_DIRECTIVES, PaginationComponent } from 'ng2-alfresco-datatable'; import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist'; import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist'; -import { ActivitiForm, ATIVITI_FORM_PROVIDERS } from 'ng2-activiti-form'; +import { ActivitiForm, ATIVITI_FORM_PROVIDERS, CONTAINER_WIDGET_DIRECTIVES, PRIMITIVE_WIDGET_DIRECTIVES } from 'ng2-activiti-form'; import { DOCUMENT_LIST_DIRECTIVES, DOCUMENT_LIST_PROVIDERS } from 'ng2-alfresco-documentlist'; -import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload'; +import { ALFRESCO_ULPOAD_COMPONENTS, ALFRESCO_ULPOAD_DIRECTIVES, ALFRESCO_ULPOAD_SERVICES } from 'ng2-alfresco-upload'; import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer'; -import { ALFRESCO_SEARCH_DIRECTIVES, ALFRESCO_SEARCH_PROVIDERS } from 'ng2-alfresco-search'; import { TAGCOMPONENT, TAGSERVICES } from 'ng2-alfresco-tag'; import { WEBSCRIPTCOMPONENT } from 'ng2-alfresco-webscript'; + +import { + UploadButtonComponent, + DataTableDemoComponent, + SearchComponent, + SearchBarComponent, + LoginDemoComponent, + ActivitiDemoComponent, + FormViewer, + WebscriptComponent, + TagComponent, + AboutComponent, + FilesComponent, + FormNodeViewer +} from './components/index'; + +import { + TabsWidget, ContainerWidget, + TextWidget, + NumberWidget, + CheckboxWidget, + MultilineTextWidget, + DropdownWidget, + HyperlinkWidget, + RadioButtonsWidget, + DisplayValueWidget, + DisplayTextWidget, + UploadWidget, + AttachWidget, + TypeaheadWidget, + FunctionalGroupWidget, + PeopleWidget +} from 'ng2-activiti-form'; + +// todo: temp +const ACTIVITI_FORM_DIRECTIVES: any[] = [ + ActivitiForm, + + TabsWidget, + ContainerWidget, + TextWidget, + NumberWidget, + CheckboxWidget, + MultilineTextWidget, + DropdownWidget, + HyperlinkWidget, + RadioButtonsWidget, + DisplayValueWidget, + DisplayTextWidget, + UploadWidget, + AttachWidget, + TypeaheadWidget, + FunctionalGroupWidget, + PeopleWidget +]; + @NgModule({ imports: [ BrowserModule, + FormsModule, + ReactiveFormsModule, + HttpModule, + TranslateModule.forRoot(), routing, + LoginModule, SearchModule.forRoot() ], declarations: [ AppComponent, SearchBarComponent, MDL, - ...ALFRESCO_LOGIN_DIRECTIVES, ...ALFRESCO_DATATABLE_DIRECTIVES, PaginationComponent, ...ALFRESCO_TASKLIST_DIRECTIVES, ...ACTIVITI_PROCESSLIST_DIRECTIVES, - ActivitiForm, + ...ACTIVITI_FORM_DIRECTIVES, ...DOCUMENT_LIST_DIRECTIVES, ...CONTEXT_MENU_DIRECTIVES, ...ALFRESCO_ULPOAD_COMPONENTS, ...VIEWERCOMPONENT, - ...ALFRESCO_SEARCH_DIRECTIVES, ...TAGCOMPONENT, ...WEBSCRIPTCOMPONENT, - AlfrescoPipeTranslate + ...ALFRESCO_ULPOAD_COMPONENTS, ...ALFRESCO_ULPOAD_DIRECTIVES, + + UploadButtonComponent, + DataTableDemoComponent, + SearchComponent, + SearchBarComponent, + LoginDemoComponent, + ActivitiDemoComponent, + FormViewer, + WebscriptComponent, + TagComponent, + AboutComponent, + FilesComponent, + FormNodeViewer ], providers: [ ...ALFRESCO_CORE_PROVIDERS, ...DOCUMENT_LIST_PROVIDERS, ...ATIVITI_FORM_PROVIDERS, - ...ALFRESCO_SEARCH_PROVIDERS, ...TAGSERVICES, - UploadService + ...ALFRESCO_ULPOAD_SERVICES ], bootstrap: [ AppComponent ] }) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 0fc290de5f..1ea0941097 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -1,9 +1,7 @@
diff --git a/ng2-components/ng2-alfresco-upload/index.ts b/ng2-components/ng2-alfresco-upload/index.ts index 3c83f3a629..8fff701772 100644 --- a/ng2-components/ng2-alfresco-upload/index.ts +++ b/ng2-components/ng2-alfresco-upload/index.ts @@ -19,6 +19,7 @@ import { UploadDragAreaComponent } from './src/components/upload-drag-area.compo import { FileDraggableDirective } from './src/directives/file-draggable.directive'; import { UploadButtonComponent } from './src/components/upload-button.component'; import { FileUploadingDialogComponent } from './src/components/file-uploading-dialog.component'; +import { FileUploadingListComponent } from './src/components/file-uploading-list.component'; import { UploadService } from './src/services/upload.service'; /** @@ -42,17 +43,13 @@ export * from './src/components/file-uploading-dialog.component'; export * from './src/components/upload-drag-area.component'; export * from './src/services/upload.service'; export * from './src/directives/file-draggable.directive'; - -export default { - components: [UploadDragAreaComponent, UploadButtonComponent, FileUploadingDialogComponent], - providers: [FileDraggableDirective], - directives: [UploadService] -}; +export * from './src/components/file-uploading-list.component'; export const ALFRESCO_ULPOAD_COMPONENTS: [any] = [ UploadDragAreaComponent, UploadButtonComponent, - FileUploadingDialogComponent + FileUploadingDialogComponent, + FileUploadingListComponent ]; export const ALFRESCO_ULPOAD_DIRECTIVES: [any] = [ diff --git a/ng2-components/ng2-alfresco-viewer/index.ts b/ng2-components/ng2-alfresco-viewer/index.ts index fe53440435..9ed3a121b5 100644 --- a/ng2-components/ng2-alfresco-viewer/index.ts +++ b/ng2-components/ng2-alfresco-viewer/index.ts @@ -15,9 +15,6 @@ * limitations under the License. */ -import { ViewerComponent } from './src/componets/viewer.component'; -import { RenderingQueueServices } from './src/services/rendering-queue.services'; - /** * ng2-alfresco-viewer, provide components to view files. * @@ -27,16 +24,26 @@ import { RenderingQueueServices } from './src/services/rendering-queue.services' * */ +import { ViewerComponent } from './src/componets/viewer.component'; +import { RenderingQueueServices } from './src/services/rendering-queue.services'; +import { ImgViewerComponent } from './src/componets/imgViewer.component'; +import { MediaPlayerComponent } from './src/componets/mediaPlayer.component'; +import { NotSupportedFormat } from './src/componets/notSupportedFormat.component'; +import { PdfViewerComponent } from './src/componets/pdfViewer.component'; + export * from './src/componets/viewer.component'; export * from './src/services/rendering-queue.services'; - -export default { - components: [ViewerComponent], - directives: [RenderingQueueServices] -}; +export * from './src/componets/imgViewer.component'; +export * from './src/componets/mediaPlayer.component'; +export * from './src/componets/notSupportedFormat.component'; +export * from './src/componets/pdfViewer.component'; export const VIEWERCOMPONENT: [any] = [ - ViewerComponent + ViewerComponent, + ImgViewerComponent, + MediaPlayerComponent, + NotSupportedFormat, + PdfViewerComponent ]; export const ALFRESCO_VIEWER_SERVICES: [any] = [ diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts index df1b4a039f..6ba7780178 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts @@ -32,6 +32,9 @@ export class MediaPlayerComponent { @Input() mimeType: string; + @Input() + nameFile: string; + ngOnChanges(changes) { if (!this.urlFile) { throw new Error('Attribute urlFile is required');