[MM-62634] Change the fix for LinkTooltip to be backward compatible f…

…or jira plugin (#1149)
mattermost · Jan 26, 2025 · d9214df · d9214df
1 parent 2932c16
commit d9214df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/plugin.json b/plugin.json
@@ -5,7 +5,7 @@
     "homepage_url": "https://github.com/mattermost/mattermost-plugin-jira",
     "support_url": "https://github.com/mattermost/mattermost-plugin-jira/issues",
     "icon_path": "assets/icon.svg",
-    "min_server_version": "10.5.0",
+    "min_server_version": "7.8.0",
     "server": {
         "executables": {
             "darwin-amd64": "server/dist/plugin-darwin-amd64",

diff --git a/webapp/src/components/jira_ticket_tooltip/jira_ticket_tooltip.tsx b/webapp/src/components/jira_ticket_tooltip/jira_ticket_tooltip.tsx
@@ -81,31 +81,43 @@ export default class TicketPopover extends React.PureComponent<Props, State> {
         return null;
     };
 
-    componentDidMount() {
+    fetchIssue = (show: boolean, connected: boolean, ticketId?: string, ticketDetails?: TicketDetails | null): void => {
         const issueKey = this.getIssueKey();
         if (!issueKey) {
             return;
         }
 
-        const {instanceID} = issueKey;
-        if (this.props.show && this.state.ticketId && !this.state.ticketDetails) {
-            this.props.fetchIssueByKey(this.state.ticketId, instanceID).then((res: {data?: TicketData, error?: any}) => {
+        if (!show) {
+            return;
+        }
+
+        if (ticketId && !ticketDetails) {
+            this.props.fetchIssueByKey(ticketId, issueKey.instanceID).then((res: {data?: TicketData, error?: any}) => {
                 if (res.error) {
                     this.setState({error: 'There was a problem loading the details for this Jira link'});
                     return;
                 }
+
                 const updatedTicketDetails = getJiraTicketDetails(res.data);
-                if (this.props.connected && updatedTicketDetails && updatedTicketDetails.ticketId === this.state.ticketId) {
+                if (connected && updatedTicketDetails && updatedTicketDetails.ticketId === ticketId) {
                     this.setState({
                         ticketDetails: updatedTicketDetails,
                         error: null,
                     });
                 }
             });
         }
+    };
+
+    componentDidMount(): void {
+        this.fetchIssue(this.props.show, this.props.connected, this.state.ticketId, this.state.ticketDetails);
+    }
+
+    componentDidUpdate(): void {
+        this.fetchIssue(this.props.show, this.props.connected, this.state.ticketId, this.state.ticketDetails);
     }
 
-    fixVersionLabel(fixVersion: string) {
+    fixVersionLabel(fixVersion: string): ReactNode {
         if (fixVersion) {
             const fixVersionString = 'Fix Version :';
             return (
@@ -121,7 +133,7 @@ export default class TicketPopover extends React.PureComponent<Props, State> {
         return null;
     }
 
-    tagTicketStatus(ticketStatus: string) {
+    tagTicketStatus(ticketStatus: string): ReactNode {
         let ticketStatusClass = 'default-style ticket-status--default';
 
         const myStatusClass = myStatusClasses[ticketStatus && ticketStatus.toLowerCase()];