Skip to content

Commit 701a86e

Browse files
author
Ali Jaber
committed
124786: small code changes.
1 parent d37976e commit 701a86e

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

src/app/my-dspace-page/my-dspace-new-submission/themed-my-dspace-new-submission.component.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
/*
2-
* The contents of this file are subject to the license and copyright
3-
* detailed in the LICENSE and NOTICE files at the root of the source
4-
* tree and available online at
5-
*
6-
* http://www.dspace.org/license/
7-
*/
8-
9-
import {Component, EventEmitter, Input, Output} from '@angular/core';
1+
import {Component, EventEmitter, Output} from '@angular/core';
102
import {ThemedComponent} from '../../shared/theme-support/themed.component';
113
import {MyDSpaceNewSubmissionComponent} from './my-dspace-new-submission.component';
124
import {SearchResult} from '../../shared/search/models/search-result.model';
@@ -27,15 +19,10 @@ export class ThemedMyDSpaceNewSubmissionComponent extends ThemedComponent<MyDSpa
2719
*/
2820
@Output() uploadEnd = new EventEmitter<SearchResult<DSpaceObject>[]>();
2921

30-
/**
31-
* Input properties to be passed to the unthemed component
32-
*/
33-
@Input() uploadFilesOptions: any;
34-
3522
/**
3623
* Properties to bind between the themed and unthemed components
3724
*/
38-
protected inAndOutputNames: (keyof MyDSpaceNewSubmissionComponent & keyof this)[] = ['uploadEnd', 'uploadFilesOptions'];
25+
protected inAndOutputNames: (keyof MyDSpaceNewSubmissionComponent & keyof this)[] = ['uploadEnd'];
3926

4027
/**
4128
* The name of the unthemed component

src/app/shared/mydspace-actions/workspaceitem/themed-workspaceitem-actions.component.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { Component, Input } from '@angular/core';
1+
import {Component, EventEmitter, Input, Output} from '@angular/core';
22
import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
33
import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
44
import {ThemedComponent} from '../../theme-support/themed.component';
5+
import {MyDSpaceActionsResult} from '../mydspace-actions';
56

67
/**
78
* Themed version of WorkspaceitemActionsComponent
@@ -18,12 +19,16 @@ export class ThemedWorkspaceitemActionsComponent extends ThemedComponent<Workspa
1819
*/
1920
@Input() object: WorkspaceItem;
2021

22+
23+
@Output() processCompleted = new EventEmitter<MyDSpaceActionsResult>();
24+
2125
/**
2226
* Indicate which class members are recognized as in/outputs
2327
* and which property names we want forwarded to the unthemed component.
2428
*/
2529
protected inAndOutputNames: (keyof WorkspaceitemActionsComponent & keyof this)[] = [
26-
'object'
30+
'object',
31+
'processCompleted',
2732
];
2833

2934
/**

src/themes/custom/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
@Component({
88
selector: 'ds-my-dspace-new-submission-dropdown',
99
styleUrls: ['../../../../../../app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.scss'],
10-
// templateUrl: './my-dspace-new-external-dropdown.component.html'
10+
// templateUrl: './my-dspace-new-submission-dropdown.component.html'
1111
templateUrl: '../../../../../../app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html'
1212
})
1313
export class MyDSpaceNewSubmissionDropdownComponent extends BaseComponent{

src/themes/custom/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
selector: 'ds-workspaceitem-actions',
99
styleUrls: ['./workspaceitem-actions.component.scss'],
1010
templateUrl: '../../../../../../app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html',
11+
//templateUrl : './workspaceitem-actions.component.html'
1112
})
1213
export class WorkspaceitemActionsComponent extends BaseComponent {
1314

src/themes/custom/eager-theme.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import {
5656
import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
5757

5858

59-
6059
/**
6160
* Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
6261
* This will ensure that decorator gets picked up when the app loads

0 commit comments

Comments
 (0)