[ACS-5523] move viewer and preview to aca-content (#3303)

* move aca-viewer to secondary entry * move aca-preview to aca-content
Alfresco · Jun 28, 2023 · caff4a3 · caff4a3
1 parent 29c0083
commit caff4a3
Show file tree

Hide file tree

Showing 42 changed files with 42 additions and 430 deletions.
diff --git a/.github/actions/publish-libs/npm-publish.sh b/.github/actions/publish-libs/npm-publish.sh
@@ -12,9 +12,7 @@ fi
 
 export PROJECTS=(
   'aca-content'
-  'aca-preview'
   'aca-shared'
-  'aca-viewer'
 );
 
 for PROJECT in ${PROJECTS[@]}

diff --git a/.github/actions/update-library-versions/update-lib-versions.sh b/.github/actions/update-library-versions/update-lib-versions.sh
@@ -11,9 +11,7 @@ fi
 
 export PROJECTS=(
   'aca-content'
-  'aca-preview'
   'aca-shared'
-  'aca-viewer'
 );
 
 for PROJECT in ${PROJECTS[@]}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -106,7 +106,6 @@ jobs:
         unit-tests:
           - name: "aca-content"
           - name: "aca-shared"
-          - name: "aca-preview"
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/projects/aca-content/preview/ng-package.json b/projects/aca-content/preview/ng-package.json
@@ -0,0 +1,5 @@
+{
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
diff --git a/...src/lib/components/preview.component.html → ...src/lib/components/preview.component.html b/...src/lib/components/preview.component.html → ...src/lib/components/preview.component.html
diff --git a/...src/lib/components/preview.component.scss → ...src/lib/components/preview.component.scss b/...src/lib/components/preview.component.scss → ...src/lib/components/preview.component.scss
diff --git a/.../lib/components/preview.component.spec.ts → .../lib/components/preview.component.spec.ts b/.../lib/components/preview.component.spec.ts → .../lib/components/preview.component.spec.ts
diff --git a/...w/src/lib/components/preview.component.ts → ...w/src/lib/components/preview.component.ts b/...w/src/lib/components/preview.component.ts → ...w/src/lib/components/preview.component.ts
diff --git a/...cts/aca-preview/src/lib/preview.module.ts → ...content/preview/src/lib/preview.module.ts b/...cts/aca-preview/src/lib/preview.module.ts → ...content/preview/src/lib/preview.module.ts
diff --git a/projects/aca-preview/src/public-api.ts → ...cts/aca-content/preview/src/public-api.ts b/projects/aca-preview/src/public-api.ts → ...cts/aca-content/preview/src/public-api.ts
diff --git a/projects/aca-preview/src/test.ts → projects/aca-content/preview/src/test.ts b/projects/aca-preview/src/test.ts → projects/aca-content/preview/src/test.ts
diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts
@@ -77,7 +77,7 @@ import { CommentsTabComponent } from './components/info-drawer/comments-tab/comm
 import { LibraryMetadataTabComponent } from './components/info-drawer/library-metadata-tab/library-metadata-tab.component';
 import { MetadataTabComponent } from './components/info-drawer/metadata-tab/metadata-tab.component';
 import { VersionsTabComponent } from './components/info-drawer/versions-tab/versions-tab.component';
-import { PreviewComponent } from '@alfresco/aca-preview';
+import { PreviewComponent } from '@alfresco/aca-content/preview';
 import { ToggleEditOfflineComponent } from './components/toolbar/toggle-edit-offline/toggle-edit-offline.component';
 import { ToggleFavoriteLibraryComponent } from './components/toolbar/toggle-favorite-library/toggle-favorite-library.component';
 import { ToggleFavoriteComponent } from './components/toolbar/toggle-favorite/toggle-favorite.component';

diff --git a/projects/aca-content/src/lib/aca-content.routes.ts b/projects/aca-content/src/lib/aca-content.routes.ts
@@ -64,7 +64,7 @@ export const CONTENT_ROUTES: ExtensionRoute[] = [
         children: [
           {
             path: '',
-            loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+            loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
           }
         ]
       }
@@ -120,7 +120,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'personal-files'
           }
@@ -134,7 +134,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'personal-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -147,7 +147,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'personal-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -173,22 +173,22 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'personal-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'personal-files'
           }
         },
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: ':folderId/preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'personal-files'
           }
@@ -202,7 +202,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'personal-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -235,7 +235,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'libraries'
           }
@@ -249,7 +249,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'libraries'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ],
           data: {
@@ -265,7 +265,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'libraries'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -309,7 +309,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'libraries'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -322,7 +322,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'libraries'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -347,7 +347,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'favorites'
           }
@@ -361,7 +361,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'favorites'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -374,7 +374,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'favorites'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -398,7 +398,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'recent-files'
           }
@@ -412,7 +412,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'recent-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -425,7 +425,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'recent-files'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -447,7 +447,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'shared'
           }
@@ -461,7 +461,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'shared'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -474,7 +474,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'shared'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -508,7 +508,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
         // deprecated, backwards compatibility with ACA 1.8
         {
           path: 'preview/:nodeId',
-          loadChildren: () => import('@alfresco/aca-preview').then((m) => m.PreviewModule),
+          loadChildren: () => import('@alfresco/aca-content/preview').then((m) => m.PreviewModule),
           data: {
             navigateSource: 'search'
           }
@@ -522,7 +522,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'search'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         },
@@ -535,7 +535,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'search'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }
@@ -560,7 +560,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
               data: {
                 navigateSource: 'search'
               },
-              loadChildren: () => import('@alfresco/aca-viewer').then((m) => m.AcaViewerModule)
+              loadChildren: () => import('@alfresco/aca-content/viewer').then((m) => m.AcaViewerModule)
             }
           ]
         }

diff --git a/projects/aca-content/tsconfig.lib.prod.json b/projects/aca-content/tsconfig.lib.prod.json
@@ -6,9 +6,7 @@
     "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-viewer": ["dist/@alfresco/aca-viewer"],
-      "@alfresco/aca-preview": ["dist/@alfresco/aca-preview"]
+      "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"]
     },
   },
   "angularCompilerOptions": {

diff --git a/projects/aca-content/viewer/ng-package.json b/projects/aca-content/viewer/ng-package.json
@@ -0,0 +1,5 @@
+{
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
diff --git a/...b/components/viewer/viewer.component.html → ...b/components/viewer/viewer.component.html b/...b/components/viewer/viewer.component.html → ...b/components/viewer/viewer.component.html
diff --git a/...b/components/viewer/viewer.component.scss → ...b/components/viewer/viewer.component.scss b/...b/components/viewer/viewer.component.scss → ...b/components/viewer/viewer.component.scss
diff --git a/...lib/components/viewer/viewer.component.ts → ...lib/components/viewer/viewer.component.ts b/...lib/components/viewer/viewer.component.ts → ...lib/components/viewer/viewer.component.ts
diff --git a/projects/aca-viewer/src/lib/viewer.module.ts → ...a-content/viewer/src/lib/viewer.module.ts b/projects/aca-viewer/src/lib/viewer.module.ts → ...a-content/viewer/src/lib/viewer.module.ts
diff --git a/projects/aca-viewer/src/public-api.ts → ...ects/aca-content/viewer/src/public-api.ts b/projects/aca-viewer/src/public-api.ts → ...ects/aca-content/viewer/src/public-api.ts
diff --git a/projects/aca-viewer/src/test.ts → projects/aca-content/viewer/src/test.ts b/projects/aca-viewer/src/test.ts → projects/aca-content/viewer/src/test.ts
diff --git a/projects/aca-preview/.eslintrc.js b/projects/aca-preview/.eslintrc.js
diff --git a/projects/aca-preview/README.md b/projects/aca-preview/README.md
diff --git a/projects/aca-preview/karma.conf.js b/projects/aca-preview/karma.conf.js
diff --git a/projects/aca-preview/ng-package.json b/projects/aca-preview/ng-package.json
diff --git a/projects/aca-preview/package.json b/projects/aca-preview/package.json