Merge pull request ppy#10907 from notbakaneko/fix-nominated-button-un…

…resolved-issue-count

Fix nomination button disabled state with unresolved issues and discussion post editing

resources/js/beatmap-discussions/discussion.tsx

@@ -91,7 +91,7 @@ export class Discussion extends React.Component<Props> {
   }
 
   @computed
-  private get resolvedSystemPostId() {
+  private get resolvedStateChangedPostId() {
     // TODO: handling resolved status in bundles....?
     if (this.props.discussionsState == null) return -1;
 
@@ -236,7 +236,7 @@ export class Discussion extends React.Component<Props> {
         post={post}
         read={this.isRead(post)}
         readonly={this.readonly}
-        resolved={post.id > this.resolvedSystemPostId}
+        resolvedStateChangedPostId={this.resolvedStateChangedPostId}
         store={this.props.store}
         type={type}
         user={user}

resources/js/beatmap-discussions/discussions-state.ts

@@ -257,10 +257,10 @@ export default class DiscussionsState {
     return this.nonDeletedDiscussions
       .reduce((sum, discussion) => {
         if (discussion.can_be_resolved && !discussion.resolved) {
-          if (discussion.beatmap_id == null) return sum++;
+          if (discussion.beatmap_id == null) return sum + 1;
 
           const beatmap = this.store.beatmaps.get(discussion.beatmap_id);
-          if (beatmap != null && beatmap.deleted_at == null) return sum++;
+          if (beatmap != null && beatmap.deleted_at == null) return sum + 1;
         }
 
         return sum;

resources/js/beatmap-discussions/post.tsx

@@ -41,7 +41,7 @@ interface Props {
   post: BeatmapsetDiscussionMessagePostJson;
   read: boolean;
   readonly: boolean;
-  resolved: boolean;
+  resolvedStateChangedPostId: number;
   store: BeatmapsetDiscussionsStore;
   type: string;
   user: UserJson;
@@ -50,7 +50,7 @@ interface Props {
 @observer
 export default class Post extends React.Component<Props> {
   static defaultProps = {
-    resolved: false,
+    resolvedStateChangedPostId: -1,
   };
 
   @observable private canSave = true; // this isn't computed because Editor's onChange doesn't provide anything to react to.
@@ -85,7 +85,7 @@ export default class Post extends React.Component<Props> {
     return this.isAdmin
       || (!downloadLimited(this.beatmapset)
         && this.isOwn
-        && !this.props.resolved
+        && this.props.post.id > this.props.resolvedStateChangedPostId
         && !this.beatmapset.discussion_locked
       );
   }