130715: Made generate:decorator:registries compatible with new @DSpace imports

Author: alexandrevryghem

scripts/generate-decorator-registries.ts

@@ -5,15 +5,16 @@ import {
   readFileSync,
   rmSync,
   writeFileSync,
-} from 'fs';
-import { sync } from 'glob';
+} from 'node:fs';
 import {
   basename,
   dirname,
   join,
   relative,
   resolve,
-} from 'path';
+} from 'node:path';
+
+import { sync } from 'glob';
 import {
   createSourceFile,
   forEachChild,
@@ -28,6 +29,7 @@ import {
   isNumericLiteral,
   isPropertyAccessExpression,
   isStringLiteral,
+  Node,
   ScriptTarget,
   SourceFile,
   StringLiteral,
@@ -203,7 +205,7 @@ const writeRegistryFile = (
   const mapName = getDecoratorConstName(decoratorConfig.name) + '_MAP';
   const functionName = `${decoratorConfig.name}CreateMap`;
   const mapVarName = `${decoratorConfig.name}Map`;
-  let content = '';
+  let content: string;
 
   // Start the registry file with the import statements, if any.
   content = generateImportStatements(components);
@@ -250,11 +252,14 @@ const generateImportsMap = (file: SourceFile): Map<string, string> => {
  * Then resolve that to a relative path, relative to the decorator registries directory.
  */
 const parseImportPath = (allImports: Map<string, string>, arg: any, filePath: string): string => {
-  let absoluteImportPath = allImports.get(arg.text);
-  if (!absoluteImportPath.includes('src/app')) {
-    absoluteImportPath = resolve(dirname(filePath), allImports.get(arg.text));
+  const absoluteImportPath = allImports.get(arg.text);
+  if (absoluteImportPath.startsWith('.')) {
+    return relative(REGISTRY_OUTPUT_DIR, resolve(dirname(filePath), allImports.get(arg.text)));
+  }
+  if (absoluteImportPath.startsWith('src/app')) {
+    return relative(REGISTRY_OUTPUT_DIR, absoluteImportPath);
   }
-  return relative(REGISTRY_OUTPUT_DIR, absoluteImportPath);
+  return absoluteImportPath;
 };
 
 /**
@@ -266,7 +271,7 @@ const parseDecoratorArguments = (
 ) => {
   const args: any[] = [];
   const argImports: Map<string, string> = new Map();
-  decorator.expression.arguments.forEach((arg) => {
+  decorator.expression.arguments.forEach((arg: Node) => {
     // e.g. @decorator('range')
     if (isStringLiteral(arg)) {
       args.push(arg.text);

src/app/external-log-in/external-log-in/external-log-in.component.spec.ts

@@ -26,7 +26,7 @@ import { of } from 'rxjs';
 
 import { storeModuleConfig } from '../../app.reducer';
 import { AlertComponent } from '../../shared/alert/alert.component';
-import { AuthMethodsService } from '../../shared/log-in/services/auth-methods.service';
+import { ThemedLogInComponent } from '../../shared/log-in/themed-log-in.component';
 import { getMockThemeService } from '../../shared/theme-support/test/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { ConfirmEmailComponent } from '../email-confirmation/confirm-email/confirm-email.component';
@@ -36,9 +36,13 @@ import { ExternalLogInComponent } from './external-log-in.component';
 describe('ExternalLogInComponent', () => {
   let component: ExternalLogInComponent;
   let fixture: ComponentFixture<ExternalLogInComponent>;
-  let modalService: NgbModal = jasmine.createSpyObj('modalService', ['open']);
-  let authServiceStub: jasmine.SpyObj<AuthService>;
-  let authMethodsServiceStub: jasmine.SpyObj<AuthMethodsService>;
+  let modalRef = Object.defineProperty({
+    close: jasmine.createSpy('close'),
+  },
+  'dismissed', {
+    get: () => of(),
+  });
+  let modalService = jasmine.createSpyObj('modalService', ['open']);
   let mockAuthMethodsArray: AuthMethod[] = [
     { id: 'password', authMethodType: AuthMethodType.Password, position: 2 } as AuthMethod,
     { id: 'shibboleth', authMethodType: AuthMethodType.Shibboleth, position: 1 } as AuthMethod,
@@ -81,6 +85,8 @@ describe('ExternalLogInComponent', () => {
   };
 
   beforeEach(async () => {
+    modalService.open.and.returnValue(modalRef);
+
     await TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
@@ -103,14 +109,15 @@ describe('ExternalLogInComponent', () => {
           ConfirmEmailComponent,
           ProvideEmailComponent,
           AlertComponent,
+          ThemedLogInComponent,
         ],
       },
     }).compileComponents();
   });
   beforeEach(() => {
     fixture = TestBed.createComponent(ExternalLogInComponent);
     component = fixture.componentInstance;
-    component.registrationData = Object.assign(new Registration(), registrationDataMock);
+    component.registrationData = Object.assign(new Registration(), registrationDataMock, { email: 'user@institution.edu' });
     component.registrationType = registrationDataMock.registrationType;
     fixture.detectChanges();
   });
@@ -120,12 +127,6 @@ describe('ExternalLogInComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  beforeEach(() => {
-    component.registrationData = Object.assign(new Registration(), registrationDataMock, { email: 'user@institution.edu' });
-
-    fixture.detectChanges();
-  });
-
   it('should set registrationType and informationText correctly when email is present', () => {
     expect(component.registrationType).toBe(registrationDataMock.registrationType);
     expect(component.informationText).toBeDefined();

src/app/external-log-in/external-log-in/external-log-in.component.ts

@@ -30,6 +30,7 @@ import {
 import {
   from,
   Observable,
+  Subscription,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -111,6 +112,8 @@ export class ExternalLogInComponent implements OnInit, OnDestroy {
    */
   externalLoginConfirmationComponent$: Observable<GenericConstructor<Component>>;
 
+  sub: Subscription;
+
   constructor(
     protected injector: Injector,
     protected translate: TranslateService,
@@ -161,9 +164,12 @@ export class ExternalLogInComponent implements OnInit, OnDestroy {
    * @param content - The content to be displayed in the modal.
    */
   openLoginModal(content: any) {
+    if (hasValue(this.sub)) {
+      this.sub.unsubscribe();
+    }
     this.modalRef = this.modalService.open(content);
     this.authService.setRedirectUrl(`/review-account/${this.token}`);
-    this.modalRef.dismissed.subscribe(() => {
+    this.sub = this.modalRef.dismissed.subscribe(() => {
       this.clearRedirectUrl();
     });
   }
@@ -176,6 +182,7 @@ export class ExternalLogInComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.sub?.unsubscribe();
     this.modalRef?.close();
   }