feat: migrate everything to standalone and fix build errors

This commit is contained in:
Enea Jahollari
2023-09-25 12:43:29 +02:00
parent 4171ccc8f3
commit 54614c21f0
1311 changed files with 13140 additions and 8009 deletions

View File

@@ -1,15 +1,26 @@
import { ThemedComponent } from '../../shared/theme-support/themed.component';
import { Component } from '@angular/core';
import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
import {
ModifyItemOverviewComponent
} from '../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
import { TranslateModule } from '@ngx-translate/core';
import { CommonModule } from '@angular/common';
/**
* Themed wrapper for WorkspaceItemsDeletePageComponent
*/
@Component({
selector: 'ds-themed-workspace-items-delete',
styleUrls: [],
templateUrl: './../../shared/theme-support/themed.component.html'
selector: 'ds-themed-workspace-items-delete',
styleUrls: [],
templateUrl: './../../shared/theme-support/themed.component.html',
standalone: true,
imports: [
ModifyItemOverviewComponent,
TranslateModule,
CommonModule
]
})
export class ThemedWorkspaceItemsDeletePageComponent extends ThemedComponent<WorkspaceItemsDeletePageComponent> {
protected getComponentName(): string {

View File

@@ -1,6 +1,6 @@
<div class="container">
<h2>{{ 'workspace-item.delete.header' | translate }}</h2>
<ds-modify-item-overview *ngIf="(dso$ | async)" [item]="(dso$ | async)"></ds-modify-item-overview>
<ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
<button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
<button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
</div>

View File

@@ -42,37 +42,34 @@ describe('WorkspaceitemsDeletePageComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [
imports: [
NgbModalModule,
TranslateModule.forRoot()
],
declarations: [WorkspaceItemsDeletePageComponent],
providers: [
TranslateModule.forRoot(),
WorkspaceItemsDeletePageComponent
],
providers: [
{
provide: ActivatedRoute,
useValue: new ActivatedRouteStub(
{},
{
wsi: createSuccessfulRemoteDataObject(wsi),
dso: createSuccessfulRemoteDataObject(dso),
}
),
provide: ActivatedRoute,
useValue: new ActivatedRouteStub({}, {
wsi: createSuccessfulRemoteDataObject(wsi),
dso: createSuccessfulRemoteDataObject(dso),
}),
},
{ provide: Router, useValue: new RouterMock() },
{
provide: WorkspaceitemDataService,
useValue: workspaceitemDataServiceSpy,
provide: WorkspaceitemDataService,
useValue: workspaceitemDataServiceSpy,
},
{ provide: Location, useValue: new LocationStub() },
{
provide: NotificationsService,
useValue: new NotificationsServiceStub(),
provide: NotificationsService,
useValue: new NotificationsServiceStub(),
},
{ provide: TranslateService, useValue: translateServiceStub },
{ provide: RouteService, useValue: routeServiceStub },
],
schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
],
schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
});
beforeEach(() => {

View File

@@ -7,16 +7,25 @@ import { Component, OnInit } from '@angular/core';
import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
import { map, Observable, switchMap, take } from 'rxjs';
import { ActivatedRoute, Data, Params, Router } from '@angular/router';
import { Location } from '@angular/common';
import { CommonModule, Location } from '@angular/common';
import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
import { TranslateService } from '@ngx-translate/core';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import {
ModifyItemOverviewComponent
} from "../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component";
@Component({
selector: 'ds-workspaceitems-delete-page',
templateUrl: './workspaceitems-delete-page.component.html',
styleUrls: ['./workspaceitems-delete-page.component.scss']
styleUrls: ['./workspaceitems-delete-page.component.scss'],
imports: [
ModifyItemOverviewComponent,
TranslateModule,
CommonModule
],
standalone: true
})
export class WorkspaceItemsDeletePageComponent implements OnInit {

View File

@@ -7,16 +7,14 @@ import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/
import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
@NgModule({
imports: [
WorkspaceitemsEditPageRoutingModule,
CommonModule,
SharedModule,
SubmissionModule,
],
declarations: [
WorkspaceItemsDeletePageComponent,
ThemedWorkspaceItemsDeletePageComponent,
]
imports: [
WorkspaceitemsEditPageRoutingModule,
CommonModule,
SharedModule,
SubmissionModule,
WorkspaceItemsDeletePageComponent,
ThemedWorkspaceItemsDeletePageComponent
]
})
/**
* This module handles all modules that need to access the workspaceitems edit page.