Skip to content

Commit cf70525

Browse files
Uditi MehtaUditi Mehta
authored andcommitted
fix preprint resubmission workflow
1 parent 5dfcee5 commit cf70525

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

app/models/abstract-node.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { hasMany, AsyncHasMany, attr } from '@ember-data/model';
2-
2+
import { PromiseManyArray } from '@ember-data/store/-private';
33
import BaseFileItem from 'ember-osf-web/models/base-file-item';
44
import DraftRegistrationModel from 'ember-osf-web/models/draft-registration';
55
import FileProviderModel from 'ember-osf-web/models/file-provider';
6-
6+
import ReviewActionModel from 'ember-osf-web/models/review-action';
77
import { Permission } from './osf-model';
88

99
export default class AbstractNodeModel extends BaseFileItem {
@@ -15,6 +15,9 @@ export default class AbstractNodeModel extends BaseFileItem {
1515

1616
@attr('array') currentUserPermissions!: Permission[];
1717

18+
@hasMany('review-action', { inverse: 'target' })
19+
reviewActions!: PromiseManyArray<ReviewActionModel>;
20+
1821
}
1922

2023
declare module 'ember-data/types/registries/model' {

app/models/review-action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default class ReviewActionModel extends Action {
6363
@attr('string') fromState!: RegistrationReviewStates;
6464
@attr('string') toState!: RegistrationReviewStates;
6565

66-
@belongsTo('registration', { inverse: 'reviewActions', polymorphic: true })
66+
@belongsTo('abstract-node', { inverse: 'reviewActions', polymorphic: true })
6767
target!: (AsyncBelongsTo<RegistrationModel> & RegistrationModel
6868
) | (AsyncBelongsTo<PreprintModel> & PreprintModel);
6969

app/preprints/-components/submit/preprint-state-machine/component.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,19 +201,19 @@ export default class PreprintStateMachine extends Component<StateMachineArgs>{
201201
@waitFor
202202
public async onSubmit(): Promise<void> {
203203
this.args.resetPageDirty();
204-
if (!this.isEditFlow) {
205-
if (this.provider.reviewsWorkflow) {
206-
const reviewAction = this.store.createRecord('review-action', {
207-
actionTrigger: 'submit',
208-
target: this.preprint,
209-
});
210-
await reviewAction.save();
211-
} else {
212-
this.preprint.isPublished = true;
213-
await this.preprint.save();
214-
}
204+
if (this.provider.reviewsWorkflow) {
205+
const reviewAction = this.store.createRecord('review-action', {
206+
actionTrigger: 'submit',
207+
target: this.preprint,
208+
});
209+
await reviewAction.save();
210+
} else {
211+
this.preprint.isPublished = true;
212+
await this.preprint.save();
215213
}
216214

215+
await this.preprint.reload();
216+
217217
await this.router.transitionTo('preprints.detail', this.provider.id, this.preprint.id);
218218
}
219219

0 commit comments

Comments
 (0)