Fix illogical templateUrl paths. Add missed DenyRequestCopyComponent.

This commit is contained in:
Mark H. Wood
2023-06-16 16:08:18 -04:00
parent 50acff1b59
commit c63001c205
8 changed files with 38 additions and 6 deletions

View File

@@ -0,0 +1,26 @@
import { Component } from '@angular/core';
import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component';
/**
* Themed wrapper for deny-request-copy.component
*/
@Component({
selector: 'ds-themed-deny-request-copy',
styleUrls: [],
templateUrl: './../../shared/theme-support/themed.component.html',
})
export class ThemedDenyRequestCopyComponent extends ThemedComponent<DenyRequestCopyComponent> {
protected getComponentName(): string {
return 'DenyRequestCopyComponent';
}
protected importThemedComponent(themeName: string): Promise<any> {
return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
}
protected importUnthemedComponent(): Promise<any> {
return import('./deny-request-copy.component');
}
}

View File

@@ -12,7 +12,6 @@ import { RequestCopyEmail } from './request-copy-email.model';
styleUrls: [],
templateUrl: './../../shared/theme-support/themed.component.html',
})
export class ThemedEmailRequestCopyComponent extends ThemedComponent<EmailRequestCopyComponent> {
/**
* Event emitter for sending the email

View File

@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
import { RequestCopyResolver } from './request-copy.resolver';
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
@NgModule({
@@ -21,7 +21,7 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
},
{
path: REQUEST_COPY_DENY_PATH,
component: DenyRequestCopyComponent,
component: ThemedDenyRequestCopyComponent,
},
{
path: REQUEST_COPY_GRANT_PATH,

View File

@@ -4,6 +4,7 @@ import { SharedModule } from '../shared/shared.module';
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
import { RequestCopyRoutingModule } from './request-copy-routing.module';
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
@@ -18,11 +19,15 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
declarations: [
GrantDenyRequestCopyComponent,
DenyRequestCopyComponent,
ThemedDenyRequestCopyComponent,
EmailRequestCopyComponent,
ThemedEmailRequestCopyComponent,
GrantRequestCopyComponent,
ThemedGrantRequestCopyComponent,
],
exports: [
ThemedEmailRequestCopyComponent,
],
providers: []
})

View File

@@ -8,7 +8,7 @@ import {
// styleUrls: ['./deny-request-copy.component.scss'],
styleUrls: [],
// templateUrl: './deny-request-copy.component.html',
templateUrl: './../../request-copy/deny-request-copy/deny-request-copy.component.html',
templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
})
export class DenyRequestCopyComponent
extends BaseComponent {

View File

@@ -8,7 +8,7 @@ import {
// styleUrls: ['./email-request-copy.component.scss'],
styleUrls: [],
// templateUrl: './email-request-copy.component.html',
templateUrl: './../../request-copy/email-request-copy/email-request-copy.component.html',
templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
})
export class EmailRequestCopyComponent
extends BaseComponent {

View File

@@ -8,7 +8,7 @@ import {
// styleUrls: ['./grant-request-copy.component.scss'],
styleUrls: [],
// templateUrl: './grant-request-copy.component.html',
templateUrl: './../../request-copy/grant-request-copy/grant-request-copy.component.html',
templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
})
export class GrantRequestCopyComponent
extends BaseComponent {

View File

@@ -153,6 +153,7 @@ import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
import { FormModule } from '../../app/shared/form/form.module';
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
const DECLARATIONS = [
FileSectionComponent,
@@ -293,6 +294,7 @@ const DECLARATIONS = [
SystemWideAlertModule,
NgxGalleryModule,
FormModule,
RequestCopyModule,
],
declarations: DECLARATIONS,
exports: [