[AAE-11496] Make aca-content buildable (#2859)

This commit is contained in:
Bartosz Sekula 2023-01-31 19:32:27 +01:00 committed by GitHub
parent c8e861907d
commit 93cc64b9a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 92 additions and 58 deletions

View File

@ -106,7 +106,13 @@
"glob": "**/*", "glob": "**/*",
"input": "projects/aca-folder-rules/assets", "input": "projects/aca-folder-rules/assets",
"output": "./assets/aca-folder-rules" "output": "./assets/aca-folder-rules"
},
{
"glob": "**/*",
"input": "projects/aca-content/assets",
"output": "./assets"
} }
], ],
"styles": [ "styles": [
"app/src/assets/fonts/material-icons/material-icons.css", "app/src/assets/fonts/material-icons/material-icons.css",
@ -282,6 +288,7 @@
"assets": [ "assets": [
"app/src/assets", "app/src/assets",
"app/src/favicon-96x96.png", "app/src/favicon-96x96.png",
"projects/aca-content/assets",
{ {
"input": "app/.tmp", "input": "app/.tmp",
"output": "/", "output": "/",

View File

@ -64,6 +64,8 @@ import { ContentVersionService } from '@alfresco/adf-content-services';
import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store'; import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store';
import { ShellModule, SHELL_APP_SERVICE, SHELL_AUTH_TOKEN } from '@alfresco/adf-core/shell'; import { ShellModule, SHELL_APP_SERVICE, SHELL_AUTH_TOKEN } from '@alfresco/adf-core/shell';
import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { APP_ROUTES } from './app.routes';
import { AppLoginModule } from './components/login/login.module';
registerLocaleData(localeFr); registerLocaleData(localeFr);
registerLocaleData(localeDe); registerLocaleData(localeDe);
@ -89,9 +91,10 @@ registerLocaleData(localeSv);
CoreModule.forRoot(), CoreModule.forRoot(),
SharedModule.forRoot(), SharedModule.forRoot(),
CoreExtensionsModule.forRoot(), CoreExtensionsModule.forRoot(),
AppLoginModule,
environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule, environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
!environment.production ? StoreDevtoolsModule.instrument({ maxAge: 25 }) : [], !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 25 }) : [],
RouterModule.forRoot([], { RouterModule.forRoot(APP_ROUTES, {
useHash: true, useHash: true,
enableTracing: false, // enable for debug only enableTracing: false, // enable for debug only
relativeLinkResolution: 'legacy' relativeLinkResolution: 'legacy'

16
app/src/app/app.routes.ts Normal file
View File

@ -0,0 +1,16 @@
import { BlankPageComponent } from '@alfresco/adf-core';
import { LoginComponent } from './components/login/login.component';
export const APP_ROUTES = [
{
path: 'blank',
component: BlankPageComponent
},
{
path: 'login',
component: LoginComponent,
data: {
title: 'APP.SIGN_IN'
}
}
];

View File

@ -14,7 +14,7 @@
"prebuild": "mkdir -p ./app/.tmp && cp ./app/src/app.config.json.tpl ./app/.tmp/app.config.json", "prebuild": "mkdir -p ./app/.tmp && cp ./app/src/app.config.json.tpl ./app/.tmp/app.config.json",
"build": "ng build content-ce", "build": "ng build content-ce",
"build.release": "npm run build -- --configuration=production,release", "build.release": "npm run build -- --configuration=production,release",
"build-libs": "ng build aca-shared && ng build adf-office-services-ext && ng build aca-settings && ng build aca-about && ng build aca-viewer && ng build aca-preview", "build-libs": "ng build aca-shared && ng build adf-office-services-ext && ng build aca-settings && ng build aca-about && ng build aca-viewer && ng build aca-preview && ng build aca-folder-rules && ng build aca-content",
"test": "ng test", "test": "ng test",
"test:ci": "ng test adf-office-services-ext && ng test content-ce --code-coverage", "test:ci": "ng test adf-office-services-ext && ng test content-ce --code-coverage",
"lint": "NODE_OPTIONS=--max_old_space_size=4096 ng lint && npm run spellcheck && npm run e2e.typecheck", "lint": "NODE_OPTIONS=--max_old_space_size=4096 ng lint && npm run spellcheck && npm run e2e.typecheck",

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 794 B

View File

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

View File

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -1,10 +1,16 @@
{ {
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json", "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/aca-content", "dest": "../../dist/@alfresco/aca-content",
"lib": { "lib": {
"styleIncludePaths": [ "styleIncludePaths": ["projects/aca-content/src/lib/ui"],
"projects/aca-content/src/lib/ui"
],
"entryFile": "src/public-api.ts" "entryFile": "src/public-api.ts"
} },
"assets": [
{
"glob": "**/*",
"input": "./src/lib/ui/",
"output": "ui"
},
"assets"
]
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "aca-content", "name": "@alfresco/aca-content",
"version": "0.0.1", "version": "0.0.1",
"peerDependencies": { "peerDependencies": {
"@angular/common": "^14.1.0", "@angular/common": "^14.1.0",
@ -7,5 +7,8 @@
}, },
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
},
"publishConfig": {
"access": "public"
} }
} }

View File

@ -67,7 +67,6 @@ import { AppLayoutModule } from './components/layout/layout.module';
import { AppSearchInputModule } from './components/search/search-input.module'; import { AppSearchInputModule } from './components/search/search-input.module';
import { DocumentListCustomComponentsModule } from './components/dl-custom-components/document-list-custom-components.module'; import { DocumentListCustomComponentsModule } from './components/dl-custom-components/document-list-custom-components.module';
import { AppSearchResultsModule } from './components/search/search-results.module'; import { AppSearchResultsModule } from './components/search/search-results.module';
import { AppLoginModule } from './components/login/login.module';
import { AppHeaderModule } from './components/header/header.module'; import { AppHeaderModule } from './components/header/header.module';
import { AppNodeVersionModule } from './components/node-version/node-version.module'; import { AppNodeVersionModule } from './components/node-version/node-version.module';
import { FavoritesComponent } from './components/favorites/favorites.component'; import { FavoritesComponent } from './components/favorites/favorites.component';
@ -118,6 +117,9 @@ import { RouterModule } from '@angular/router';
import { UploadFilesDialogComponent } from './components/upload-files-dialog/upload-files-dialog.component'; import { UploadFilesDialogComponent } from './components/upload-files-dialog/upload-files-dialog.component';
import { SidenavWrapperComponent } from './components/sidenav/sidenav-wrapper/sidenav-wrapper.component'; import { SidenavWrapperComponent } from './components/sidenav/sidenav-wrapper/sidenav-wrapper.component';
import { AppLayoutComponent } from './components/layout/app-layout/app-layout.component'; import { AppLayoutComponent } from './components/layout/app-layout/app-layout.component';
import { AppTrashcanModule } from './components/trashcan/trashcan.module';
import { AppSharedLinkViewModule } from './components/shared-link-view/shared-link-view.module';
import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
registerLocaleData(localeFr); registerLocaleData(localeFr);
registerLocaleData(localeDe); registerLocaleData(localeDe);
@ -149,7 +151,6 @@ registerLocaleData(localeSv);
SharedModule, SharedModule,
MaterialModule, MaterialModule,
AppStoreModule, AppStoreModule,
AppLoginModule,
AppCommonModule, AppCommonModule,
AppLayoutModule, AppLayoutModule,
DirectivesModule, DirectivesModule,
@ -164,7 +165,10 @@ registerLocaleData(localeSv);
AppHeaderModule, AppHeaderModule,
AppNodeVersionModule, AppNodeVersionModule,
HammerModule, HammerModule,
ViewProfileModule ViewProfileModule,
AppTrashcanModule,
AppSharedLinkViewModule,
AcaFolderRulesModule
], ],
declarations: [ declarations: [
FilesComponent, FilesComponent,

View File

@ -30,7 +30,7 @@ import { FavoriteLibrariesComponent } from './components/favorite-libraries/favo
import { SearchResultsComponent } from './components/search/search-results/search-results.component'; import { SearchResultsComponent } from './components/search/search-results/search-results.component';
import { SearchLibrariesResultsComponent } from './components/search/search-libraries-results/search-libraries-results.component'; import { SearchLibrariesResultsComponent } from './components/search/search-libraries-results/search-libraries-results.component';
import { AppSharedRuleGuard, GenericErrorComponent, ExtensionRoute, ExtensionsDataLoaderGuard } from '@alfresco/aca-shared'; import { AppSharedRuleGuard, GenericErrorComponent, ExtensionRoute, ExtensionsDataLoaderGuard } from '@alfresco/aca-shared';
import { AuthGuard, BlankPageComponent } from '@alfresco/adf-core'; import { AuthGuard } from '@alfresco/adf-core';
import { FavoritesComponent } from './components/favorites/favorites.component'; import { FavoritesComponent } from './components/favorites/favorites.component';
import { RecentFilesComponent } from './components/recent-files/recent-files.component'; import { RecentFilesComponent } from './components/recent-files/recent-files.component';
import { SharedFilesComponent } from './components/shared-files/shared-files.component'; import { SharedFilesComponent } from './components/shared-files/shared-files.component';
@ -38,24 +38,22 @@ import { DetailsComponent } from './components/details/details.component';
import { HomeComponent } from './components/home/home.component'; import { HomeComponent } from './components/home/home.component';
import { ViewProfileComponent } from './components/view-profile/view-profile.component'; import { ViewProfileComponent } from './components/view-profile/view-profile.component';
import { ViewProfileRuleGuard } from './components/view-profile/view-profile.guard'; import { ViewProfileRuleGuard } from './components/view-profile/view-profile.guard';
import { LoginComponent } from './components/login/login.component';
import { Route } from '@angular/router'; import { Route } from '@angular/router';
import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
import { TrashcanComponent } from './components/trashcan/trashcan.component';
export const CONTENT_ROUTES: ExtensionRoute[] = [ export const CONTENT_ROUTES: ExtensionRoute[] = [
{
path: 'blank',
component: BlankPageComponent
},
{ {
path: 'preview/s/:id', path: 'preview/s/:id',
loadChildren: () => import('./components/shared-link-view/shared-link-view.module').then((m) => m.AppSharedLinkViewModule) children: [
}, {
{ path: '',
path: 'login', component: SharedLinkViewComponent,
component: LoginComponent, data: {
data: { title: 'APP.PREVIEW.TITLE'
title: 'APP.SIGN_IN' }
} }
]
}, },
{ {
path: 'view', path: 'view',
@ -487,7 +485,16 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
}, },
{ {
path: 'trashcan', path: 'trashcan',
loadChildren: () => import('./components/trashcan/trashcan.module').then((m) => m.AppTrashcanModule) children: [
{
path: '',
component: TrashcanComponent,
data: {
title: 'APP.BROWSE.TRASHCAN.TITLE',
sortingPreferenceKey: 'trashcan'
}
}
]
}, },
{ {
path: 'search', path: 'search',

View File

@ -27,28 +27,16 @@ import { NgModule } from '@angular/core';
import { SharedLinkViewComponent } from './shared-link-view.component'; import { SharedLinkViewComponent } from './shared-link-view.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreModule } from '@alfresco/adf-core';
import { RouterModule, Routes } from '@angular/router';
import { DirectivesModule } from '../../directives/directives.module'; import { DirectivesModule } from '../../directives/directives.module';
import { AppCommonModule } from '../common/common.module'; import { AppCommonModule } from '../common/common.module';
import { AppToolbarModule } from '../toolbar/toolbar.module'; import { AppToolbarModule } from '../toolbar/toolbar.module';
import { AppInfoDrawerModule } from '../info-drawer/info.drawer.module'; import { AppInfoDrawerModule } from '../info-drawer/info.drawer.module';
import { CoreExtensionsModule } from '../../extensions/core.extensions.module'; import { CoreExtensionsModule } from '../../extensions/core.extensions.module';
const routes: Routes = [
{
path: '',
component: SharedLinkViewComponent,
data: {
title: 'APP.PREVIEW.TITLE'
}
}
];
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
CoreModule.forChild(), CoreModule.forChild(),
RouterModule.forChild(routes),
DirectivesModule, DirectivesModule,
AppCommonModule, AppCommonModule,
AppToolbarModule, AppToolbarModule,

View File

@ -27,7 +27,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreModule } from '@alfresco/adf-core';
import { TrashcanComponent } from './trashcan.component'; import { TrashcanComponent } from './trashcan.component';
import { Routes, RouterModule } from '@angular/router';
import { ContentModule } from '@alfresco/adf-content-services'; import { ContentModule } from '@alfresco/adf-content-services';
import { AppCommonModule } from '../common/common.module'; import { AppCommonModule } from '../common/common.module';
import { AppToolbarModule } from '../toolbar/toolbar.module'; import { AppToolbarModule } from '../toolbar/toolbar.module';
@ -35,22 +34,10 @@ import { DirectivesModule } from '../../directives/directives.module';
import { ContextMenuModule } from '../context-menu/context-menu.module'; import { ContextMenuModule } from '../context-menu/context-menu.module';
import { AppLayoutModule } from '../layout/layout.module'; import { AppLayoutModule } from '../layout/layout.module';
const routes: Routes = [
{
path: '',
component: TrashcanComponent,
data: {
title: 'APP.BROWSE.TRASHCAN.TITLE',
sortingPreferenceKey: 'trashcan'
}
}
];
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
CoreModule.forChild(), CoreModule.forChild(),
RouterModule.forChild(routes),
ContentModule.forChild(), ContentModule.forChild(),
DirectivesModule, DirectivesModule,
AppCommonModule, AppCommonModule,

View File

@ -2,7 +2,15 @@
{ {
"extends": "./tsconfig.lib.json", "extends": "./tsconfig.lib.json",
"compilerOptions": { "compilerOptions": {
"declarationMap": false "declarationMap": false,
"paths": {
"@alfresco/aca-shared": ["dist/@alfresco/aca-shared"],
"@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"],
"@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"],
"@alfresco/aca-folder-rules": ["dist/@alfresco/aca-folder-rules"],
"@alfresco/aca-viewer": ["dist/@alfresco/aca-viewer"],
"@alfresco/aca-preview": ["dist/@alfresco/aca-preview"]
},
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"compilationMode": "partial" "compilationMode": "partial"

View File

@ -1,7 +1,10 @@
{ {
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json", "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/aca-folder-rules", "dest": "../../dist/@alfresco/aca-folder-rules",
"lib": { "lib": {
"entryFile": "src/public-api.ts" "entryFile": "src/public-api.ts"
} },
"assets": [
"assets"
]
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "aca-folder-rules", "name": "@alfresco/aca-folder-rules",
"version": "0.0.1", "version": "0.0.1",
"peerDependencies": { "peerDependencies": {
"@angular/common": "^14.1.0", "@angular/common": "^14.1.0",

View File

@ -4,9 +4,9 @@
"compilerOptions": { "compilerOptions": {
"declarationMap": false, "declarationMap": false,
"paths": { "paths": {
"@alfresco/aca-shared": ["dist/aca-shared"], "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"],
"@alfresco/aca-shared/store": ["dist/aca-shared/store"], "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"],
"@alfresco/aca-shared/rules": ["dist/aca-shared/rules"] "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"]
} }
}, },
"angularCompilerOptions": { "angularCompilerOptions": {

View File

@ -40,11 +40,13 @@ echo -e "Branch is '$TRAVIS_BRANCH', therefore publish with '$TAG_NPM' tag\n"
PROJECTS=( PROJECTS=(
'aca-shared' 'aca-shared'
'aca-folder-rules'
'adf-office-services-ext' 'adf-office-services-ext'
'aca-settings' 'aca-settings'
'aca-about' 'aca-about'
'aca-preview' 'aca-preview'
'aca-viewer' 'aca-viewer'
'aca-content'
); );
for PROJECT in "${PROJECTS[@]}" for PROJECT in "${PROJECTS[@]}"