Issue #276: Remove UI changes

Author: madisparntopia

bitbucket-slack-server-integration-plugin/src/main/java/com/atlassian/bitbucket/plugins/slack/notification/NotificationUtil.java

@@ -1,5 +1,7 @@
 package com.atlassian.bitbucket.plugins.slack.notification;
 
+import static com.atlassian.bitbucket.plugins.slack.notification.PullRequestNotificationTypes.RESCOPED;
+
 import lombok.experimental.UtilityClass;
 
 import java.util.Collections;
@@ -12,7 +14,9 @@
 public class NotificationUtil {
     public static Set<String> ALL_NOTIFICATION_TYPE_KEYS = Collections.unmodifiableSet(Stream
             .of(
-                    Stream.of(PullRequestNotificationTypes.values()).map(PullRequestNotificationTypes::getKey),
+                    Stream.of(PullRequestNotificationTypes.values())
+                        .filter(type -> RESCOPED != type)
+                        .map(PullRequestNotificationTypes::getKey),
                     Stream.of(RepositoryNotificationTypes.values()).map(RepositoryNotificationTypes::getKey),
                     Stream.of(TaskNotificationTypes.values()).map(TaskNotificationTypes::getKey)
             )

bitbucket-slack-server-integration-plugin/src/main/resources/analytics/whitelist.json

@@ -18,7 +18,7 @@
   "notifications.slack.repotochannel.notification.enabled": ["userKeyHash", "teamIdHash", "slackUserIdHash", "repositoryId",
     "channelIdHash", {
       "notificationKey": ["PRCreated", "PRParticipantUpdated", "PRReviewersUpdated", "PRMerged", "PRDeclined",
-        "PRReopened", "PRDeleted", "PRReScoped", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
+        "PRReopened", "PRDeleted", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
         "PRComment", "PRCommentEdited", "PRCommentReplied", "PRCommentDeleted", "TaskCreated", "TaskUpdated",
         "TaskResolved", "TaskReopened", "TaskDeleted", "PRAutoMergeFailed", "PRAutoMergeResolved", "CommitPushed", "FileEdited",
         "CommitComment", "CommitCommentEdited", "CommitCommentReplied", "CommitCommentDeleted", "Forked", "TagCreated",
@@ -28,7 +28,7 @@
   "notifications.slack.repotochannel.notification.disabled": ["userKeyHash", "teamIdHash", "slackUserIdHash", "repositoryId",
     "channelIdHash", {
       "notificationKey": ["PRCreated", "PRParticipantUpdated", "PRReviewersUpdated", "PRMerged", "PRDeclined",
-        "PRReopened", "PRDeleted", "PRReScoped", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
+        "PRReopened", "PRDeleted", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
         "PRComment", "PRCommentEdited", "PRCommentReplied", "PRCommentDeleted", "TaskCreated", "TaskUpdated",
         "TaskResolved", "TaskReopened", "TaskDeleted", "PRAutoMergeFailed", "PRAutoMergeResolved", "CommitPushed", "FileEdited",
         "CommitComment", "CommitCommentEdited", "CommitCommentReplied", "CommitCommentDeleted", "Forked", "TagCreated",
@@ -40,7 +40,7 @@
 
   "notifications.slack.notification.regular.sent": ["userKeyHash", "teamIdHash", "slackUserIdHash", {
     "notificationKey": ["PRCreated", "PRParticipantUpdated", "PRReviewersUpdated", "PRMerged", "PRDeclined",
-      "PRReopened", "PRDeleted", "PRReScoped", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
+      "PRReopened", "PRDeleted", "PRParticipantApproved", "PRParticipantUnapproved", "PRParticipantReviewed",
       "PRComment", "PRCommentEdited", "PRCommentReplied", "PRCommentDeleted", "TaskCreated", "TaskUpdated",
       "TaskResolved", "TaskReopened", "TaskDeleted", "PRAutoMergeFailed", "PRAutoMergeResolved", "CommitPushed", "FileEdited",
       "CommitComment", "CommitCommentEdited", "CommitCommentReplied", "CommitCommentDeleted", "Forked", "TagCreated",

bitbucket-slack-server-integration-plugin/src/main/resources/com/atlassian/bitbucket/plugins/slack/bitbucket-slack.properties

@@ -103,7 +103,6 @@ bitbucket.plugins.slack.notification.PRReopened=Reopened
 bitbucket.plugins.slack.notification.PRDeleted=Deleted
 bitbucket.plugins.slack.notification.PRMerged=Merged
 bitbucket.plugins.slack.notification.PRUpdated=Updated
-bitbucket.plugins.slack.notification.PRReScoped=Updated
 bitbucket.plugins.slack.notification.PRReviewersUpdated=Reviewers updated
 bitbucket.plugins.slack.notification.PRComment=Comment created
 bitbucket.plugins.slack.notification.PRCommentEdited=Comment edited
@@ -228,7 +227,7 @@ slack.activity.pr.reviewed.short=:warning: {0} *reviewed* pull request {1} in {2
 slack.activity.pr.unapproved.needswork.short={0} *removed needs work review* from pull request {1} in {2}
 slack.activity.pr.merged.short=:tada: {0} *merged* pull request {1} in {2}
 slack.activity.pr.updated.short={0} *updated* pull request {1} in {2}
-slack.activity.pr.rescoped.short={0} *updated* pull request {1} in {2}
+slack.activity.pr.rescoped.short={0} *re-scoped* pull request {1} in {2}
 slack.activity.pr.comment.added.short=:speech_balloon: {0} *commented* on pull request {1} in {2}
 slack.activity.pr.comment.deleted.short=:speech_balloon: {0} *deleted a comment* on pull request {1} in {2}
 slack.activity.pr.comment.edited.short=:speech_balloon: {0} *edited a comment* on pull request {1} in {2}
@@ -251,7 +250,7 @@ slack.activity.pr.reviewed.long=:warning: {0} *reviewed* pull request {1} {3} \u
 slack.activity.pr.unapproved.needswork.long={0} *removed needs work review* from pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.merged.long=:tada: {0} *merged* pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.updated.long={0} *updated* pull request {1} {3} \u2192 {4} in {2}
-slack.activity.pr.rescoped.long={0} *updated* pull request {1} {3} \u2192 {4} in {2}
+slack.activity.pr.rescoped.long={0} *re-scoped* pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.added.long=:speech_balloon: {0} *commented* on pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.deleted.long=:speech_balloon: {0} *deleted a comment* on pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.edited.long=:speech_balloon: {0} *edited a comment* on pull request {1} {3} \u2192 {4} in {2}

bitbucket-slack-server-integration-plugin/src/main/resources/slack-static/feature/repo-channel-table/repo-channel-table.soy

@@ -116,12 +116,6 @@
                 {param channelConfig: $channelConfig /}
                 {param repository: $repository/}
             {/call}
-            {call .renderItem}
-                {param notificationKey: 'PRReScoped'/}
-                {param label: getText('bitbucket.plugins.slack.notification.PRReScoped')/}
-                {param channelConfig: $channelConfig /}
-                {param repository: $repository/}
-            {/call}
             {call .renderItem}
                 {param notificationKey: 'PRReviewersUpdated'/}
                 {param label: getText('bitbucket.plugins.slack.notification.PRReviewersUpdated')/}

bitbucket-slack-server-integration-plugin/src/test/java/com/atlassian/bitbucket/plugins/slack/notification/configuration/DefaultNotificationConfigurationServiceTest.java

@@ -50,7 +50,7 @@ public void disable_shouldPerformExpectedAction() {
 
         verify(permissionService).validateForRepository(repository, Permission.REPO_ADMIN);
         verify(dao).delete(request);
-        verify(eventPublisher, times(33)).publish(any(RepositoryNotificationDisabledAnalyticEvent.class));
+        verify(eventPublisher, times(32)).publish(any(RepositoryNotificationDisabledAnalyticEvent.class));
     }
 
     @Test