Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1444589
move aca-viewer to secondary entry
DenysVuika Jun 27, 2023
fd86c9f
move aca-preview to aca-content
DenysVuika Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/actions/publish-libs/npm-publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ fi

export PROJECTS=(
'aca-content'
'aca-preview'
'aca-shared'
'aca-viewer'
);

for PROJECT in ${PROJECTS[@]}
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/update-library-versions/update-lib-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ fi

export PROJECTS=(
'aca-content'
'aca-preview'
'aca-shared'
'aca-viewer'
);

for PROJECT in ${PROJECTS[@]}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ jobs:
unit-tests:
- name: "aca-content"
- name: "aca-shared"
- name: "aca-preview"
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions projects/aca-content/preview/ng-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"lib": {
"entryFile": "src/public-api.ts"
}
}
0 ...src/lib/components/preview.component.html → ...src/lib/components/preview.component.html
View file
Open in desktop
File renamed without changes.
0 ...src/lib/components/preview.component.scss → ...src/lib/components/preview.component.scss
View file
Open in desktop
File renamed without changes.
0 .../lib/components/preview.component.spec.ts → .../lib/components/preview.component.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...w/src/lib/components/preview.component.ts → ...w/src/lib/components/preview.component.ts
View file
Open in desktop
File renamed without changes.
0 ...cts/aca-preview/src/lib/preview.module.ts → ...content/preview/src/lib/preview.module.ts
View file
Open in desktop
File renamed without changes.
0 projects/aca-preview/src/public-api.ts → ...cts/aca-content/preview/src/public-api.ts
View file
Open in desktop
File renamed without changes.
0 projects/aca-preview/src/test.ts → projects/aca-content/preview/src/test.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion projects/aca-content/src/lib/aca-content.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
52 changes: 26 additions & 26 deletions projects/aca-content/src/lib/aca-content.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
]
}
Expand Down Expand Up @@ -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'
}
Expand All @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand All @@ -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'
}
Expand All @@ -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)
}
]
}
Expand Down Expand Up @@ -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'
}
Expand All @@ -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: {
Expand All @@ -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)
}
]
}
Expand Down Expand Up @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand All @@ -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'
}
Expand All @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand All @@ -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'
}
Expand All @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand All @@ -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'
}
Expand All @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand Down Expand Up @@ -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'
}
Expand All @@ -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)
}
]
},
Expand All @@ -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)
}
]
}
Expand All @@ -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)
}
]
}
Expand Down
4 changes: 1 addition & 3 deletions projects/aca-content/tsconfig.lib.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 5 additions & 0 deletions projects/aca-content/viewer/ng-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"lib": {
"entryFile": "src/public-api.ts"
}
}
0 ...b/components/viewer/viewer.component.html → ...b/components/viewer/viewer.component.html
View file
Open in desktop
File renamed without changes.
0 ...b/components/viewer/viewer.component.scss → ...b/components/viewer/viewer.component.scss
View file
Open in desktop
File renamed without changes.
0 ...lib/components/viewer/viewer.component.ts → ...lib/components/viewer/viewer.component.ts
View file
Open in desktop
File renamed without changes.
0 projects/aca-viewer/src/lib/viewer.module.ts → ...a-content/viewer/src/lib/viewer.module.ts
View file
Open in desktop
File renamed without changes.
0 projects/aca-viewer/src/public-api.ts → ...ects/aca-content/viewer/src/public-api.ts
View file
Open in desktop
File renamed without changes.
0 projects/aca-viewer/src/test.ts → projects/aca-content/viewer/src/test.ts
View file
Open in desktop
File renamed without changes.
23 changes: 0 additions & 23 deletions projects/aca-preview/.eslintrc.js
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions projects/aca-preview/README.md
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions projects/aca-preview/karma.conf.js
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions projects/aca-preview/ng-package.json
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions projects/aca-preview/package.json
View file
Open in desktop

This file was deleted.

Loading