mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
ACS-7408: version manager as standalone
This commit is contained in:
@@ -35,7 +35,6 @@ import { PermissionManagerModule } from './permission-manager/permission-manager
|
|||||||
import { TreeViewModule } from './tree-view/tree-view.module';
|
import { TreeViewModule } from './tree-view/tree-view.module';
|
||||||
import { ContentTypeModule } from './content-type/content-type.module';
|
import { ContentTypeModule } from './content-type/content-type.module';
|
||||||
import { AspectListModule } from './aspect-list/aspect-list.module';
|
import { AspectListModule } from './aspect-list/aspect-list.module';
|
||||||
import { VersionCompatibilityModule } from './version-compatibility/version-compatibility.module';
|
|
||||||
import { versionCompatibilityFactory } from './version-compatibility/version-compatibility-factory';
|
import { versionCompatibilityFactory } from './version-compatibility/version-compatibility-factory';
|
||||||
import { VersionCompatibilityService } from './version-compatibility/version-compatibility.service';
|
import { VersionCompatibilityService } from './version-compatibility/version-compatibility.service';
|
||||||
import { CONTENT_PIPES } from './pipes/content-pipe.module';
|
import { CONTENT_PIPES } from './pipes/content-pipe.module';
|
||||||
@@ -47,6 +46,7 @@ import { DropdownSitesComponent } from './content-node-selector/site-dropdown/si
|
|||||||
import { CategoriesManagementComponent } from './category';
|
import { CategoriesManagementComponent } from './category';
|
||||||
import { TreeComponent } from './tree';
|
import { TreeComponent } from './tree';
|
||||||
import { NewVersionUploaderDialogComponent } from './new-version-uploader';
|
import { NewVersionUploaderDialogComponent } from './new-version-uploader';
|
||||||
|
import { VersionCompatibilityDirective } from './version-compatibility';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -72,7 +72,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader';
|
|||||||
TreeViewModule,
|
TreeViewModule,
|
||||||
ContentTypeModule,
|
ContentTypeModule,
|
||||||
AspectListModule,
|
AspectListModule,
|
||||||
VersionCompatibilityModule,
|
VersionCompatibilityDirective,
|
||||||
NodeCommentsModule,
|
NodeCommentsModule,
|
||||||
TreeComponent,
|
TreeComponent,
|
||||||
SearchTextModule,
|
SearchTextModule,
|
||||||
@@ -99,7 +99,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader';
|
|||||||
TreeViewModule,
|
TreeViewModule,
|
||||||
AspectListModule,
|
AspectListModule,
|
||||||
ContentTypeModule,
|
ContentTypeModule,
|
||||||
VersionCompatibilityModule,
|
VersionCompatibilityDirective,
|
||||||
NodeCommentsModule,
|
NodeCommentsModule,
|
||||||
TreeComponent,
|
TreeComponent,
|
||||||
SearchTextModule,
|
SearchTextModule,
|
||||||
|
@@ -21,10 +21,10 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
|
|||||||
|
|
||||||
import { VersionCompatibilityService } from './version-compatibility.service';
|
import { VersionCompatibilityService } from './version-compatibility.service';
|
||||||
import { VersionInfo } from '@alfresco/js-api';
|
import { VersionInfo } from '@alfresco/js-api';
|
||||||
import { VersionCompatibilityModule } from './version-compatibility.module';
|
|
||||||
import { RedirectAuthService } from '@alfresco/adf-core';
|
import { RedirectAuthService } from '@alfresco/adf-core';
|
||||||
import { EMPTY, of } from 'rxjs';
|
import { EMPTY, of } from 'rxjs';
|
||||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||||
|
import { VersionCompatibilityDirective } from '@alfresco/adf-content-services';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: `
|
template: `
|
||||||
@@ -51,7 +51,7 @@ describe('VersionCompatibilityDirective', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [VersionCompatibilityModule, HttpClientTestingModule],
|
imports: [VersionCompatibilityDirective, HttpClientTestingModule],
|
||||||
declarations: [TestComponent],
|
declarations: [TestComponent],
|
||||||
providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }]
|
providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }]
|
||||||
});
|
});
|
||||||
|
@@ -20,10 +20,10 @@ import { VersionCompatibilityService } from './version-compatibility.service';
|
|||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[adf-acs-version]'
|
selector: '[adf-acs-version]',
|
||||||
|
standalone: true
|
||||||
})
|
})
|
||||||
export class VersionCompatibilityDirective {
|
export class VersionCompatibilityDirective {
|
||||||
|
|
||||||
/** Minimum version required for component to work correctly . */
|
/** Minimum version required for component to work correctly . */
|
||||||
@Input('adf-acs-version')
|
@Input('adf-acs-version')
|
||||||
set version(requiredVersion: string) {
|
set version(requiredVersion: string) {
|
||||||
@@ -34,8 +34,7 @@ export class VersionCompatibilityDirective {
|
|||||||
private templateRef: TemplateRef<any>,
|
private templateRef: TemplateRef<any>,
|
||||||
private viewContainer: ViewContainerRef,
|
private viewContainer: ViewContainerRef,
|
||||||
private versionCompatibilityService: VersionCompatibilityService
|
private versionCompatibilityService: VersionCompatibilityService
|
||||||
) {
|
) {}
|
||||||
}
|
|
||||||
|
|
||||||
private validateAcsVersion(requiredVersion: string) {
|
private validateAcsVersion(requiredVersion: string) {
|
||||||
this.versionCompatibilityService.acsVersionInitialized$.pipe(take(1)).subscribe(() => {
|
this.versionCompatibilityService.acsVersionInitialized$.pipe(take(1)).subscribe(() => {
|
||||||
|
@@ -15,13 +15,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { VersionCompatibilityDirective } from './version-compatibility.directive';
|
import { VersionCompatibilityDirective } from './version-compatibility.directive';
|
||||||
|
|
||||||
|
/** @deprecated use `VersionCompatibilityDirective` instead */
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [CommonModule],
|
imports: [VersionCompatibilityDirective],
|
||||||
exports: [VersionCompatibilityDirective],
|
exports: [VersionCompatibilityDirective]
|
||||||
declarations: [VersionCompatibilityDirective]
|
|
||||||
})
|
})
|
||||||
export class VersionCompatibilityModule {}
|
export class VersionCompatibilityModule {}
|
||||||
|
@@ -30,9 +30,9 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
|
|||||||
import { MatListModule } from '@angular/material/list';
|
import { MatListModule } from '@angular/material/list';
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
import { MatMenuModule } from '@angular/material/menu';
|
import { MatMenuModule } from '@angular/material/menu';
|
||||||
import { VersionCompatibilityModule } from '../version-compatibility';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { MatButtonModule } from '@angular/material/button';
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
|
import { VersionCompatibilityDirective } from '../version-compatibility';
|
||||||
|
|
||||||
export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry> {
|
export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry> {
|
||||||
constructor(private versionsApi: VersionsApi, private node: Node) {
|
constructor(private versionsApi: VersionsApi, private node: Node) {
|
||||||
@@ -59,9 +59,9 @@ export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry
|
|||||||
CdkVirtualForOf,
|
CdkVirtualForOf,
|
||||||
MatIconModule,
|
MatIconModule,
|
||||||
MatMenuModule,
|
MatMenuModule,
|
||||||
VersionCompatibilityModule,
|
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
MatButtonModule
|
MatButtonModule,
|
||||||
|
VersionCompatibilityDirective
|
||||||
],
|
],
|
||||||
templateUrl: './version-list.component.html',
|
templateUrl: './version-list.component.html',
|
||||||
styleUrls: ['./version-list.component.scss'],
|
styleUrls: ['./version-list.component.scss'],
|
||||||
|
Reference in New Issue
Block a user