ParabolInc · Dschoordsch · Nov 26, 2024 · Nov 25, 2024 · Nov 25, 2024
diff --git a/packages/client/components/JiraScopingSearchFilterMenu.tsx b/packages/client/components/JiraScopingSearchFilterMenu.tsx
@@ -66,7 +66,7 @@ const getValue = (item: {name: string}) => item.name
 
 const MAX_PROJECTS = 10
 
-// Reusable for both Jira and Jira Server.
+// Reusable for both Jira and Jira Server/Data Center.
 const JiraScopingSearchFilterMenu = (props: Props) => {
   const {menuProps, projects, meetingId, jiraSearchQuery, service} = props
   const isLoading = meetingId === null

diff --git a/packages/client/components/JiraServerConfigMenu.tsx b/packages/client/components/JiraServerConfigMenu.tsx
@@ -35,9 +35,9 @@ const JiraServerConfigMenu = (props: Props) => {
     }, Duration.PORTAL_CLOSE)
   }
   return (
-    <Menu ariaLabel={'Configure your Jira Serverintegration'} {...menuProps}>
+    <Menu ariaLabel={'Configure your Jira Data Center integration'} {...menuProps}>
       <MenuItem label='Refresh token' onClick={openOAuth} />
-      <MenuItem label='Remove Jira Server' onClick={removeJiraServer} />
+      <MenuItem label='Remove Jira Data Center' onClick={removeJiraServer} />
     </Menu>
   )
 }

diff --git a/packages/client/components/JiraServerScopingSearchBar.tsx b/packages/client/components/JiraServerScopingSearchBar.tsx
@@ -53,7 +53,7 @@ const JiraServerScopingSearchBar = (props: Props) => {
   })
   const currentFilters = selectedProjectsPaths.length ? selectedProjectsPaths.join(', ') : 'None'
 
-  const placeholder = isJQL ? `SPRINT = fun AND PROJECT = dev` : 'Search issues on Jira Server'
+  const placeholder = isJQL ? `SPRINT = fun AND PROJECT = dev` : 'Search issues on Jira Data Center'
 
   return (
     <ScopingSearchBar currentFilters={currentFilters}>

diff --git a/packages/client/components/JiraServerScopingSearchResults.tsx b/packages/client/components/JiraServerScopingSearchResults.tsx
@@ -195,7 +195,7 @@ const JiraServerScopingSearchResults = (props: Props) => {
             summary={node.summary}
             url={node.url}
             linkText={node.issueKey}
-            linkTitle={`Jira Server Issue #${node.issueKey}`}
+            linkTitle={`Jira Data Center Issue #${node.issueKey}`}
           />
         )
       })}

diff --git a/packages/client/components/PokerDimensionFinalScorePicker.tsx b/packages/client/components/PokerDimensionFinalScorePicker.tsx
@@ -102,7 +102,7 @@ const PokerDimensionFinalScorePicker = (props: Props) => {
   const titleByType = {
     _xGitHubIssue: 'GitHub',
     JiraIssue: 'Jira',
-    JiraServerIssue: 'Jira Server',
+    JiraServerIssue: 'Jira Data Center',
     _xGitLabIssue: 'GitLab',
     AzureDevOpsWorkItem: 'Azure DevOps'
   } as const

diff --git a/packages/client/components/PokerEstimateHeaderCard.tsx b/packages/client/components/PokerEstimateHeaderCard.tsx
@@ -24,7 +24,7 @@ const getHeaderFields = (
   switch (__typename) {
     case 'JiraServerIssue':
     case 'JiraIssue':
-      const name = __typename === 'JiraIssue' ? 'Jira' : 'Jira Server'
+      const name = __typename === 'JiraIssue' ? 'Jira' : 'Jira Data Center'
       const {summary, descriptionHTML, jiraUrl, issueKey} = integration
       return {
         cardTitle: summary,

diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx
@@ -170,7 +170,7 @@ const ScopePhaseArea = (props: Props) => {
     },
     {
       icon: <JiraServerSVG />,
-      label: 'Jira Server',
+      label: 'Jira Data Center',
       allow: allowJiraServer,
       Component: ScopePhaseAreaJiraServer
     },

diff --git a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
@@ -77,7 +77,7 @@ const ScopePhaseAreaAddJiraServer = (props: Props) => {
     <AddJiraServerArea>
       <AddJiraServerButton onClick={openOAuth} size={'medium'}>
         <JiraServerSVG />
-        Import issues from Jira Server
+        Import issues from Jira Data Center
       </AddJiraServerButton>
       <StyledLink onClick={gotoParabol}>Or add new tasks in Parabol</StyledLink>
     </AddJiraServerArea>

diff --git a/packages/client/components/TaskIntegrationLink.tsx b/packages/client/components/TaskIntegrationLink.tsx
@@ -65,7 +65,7 @@ const TaskIntegrationLink = (props: Props) => {
         href={url}
         rel='noopener noreferrer'
         target='_blank'
-        title={`Jira Server Issue #${issueKey} on ${projectKey}`}
+        title={`Jira Data Center Issue #${issueKey} on ${projectKey}`}
         className={className}
       >
         {`Issue #${issueKey}`}

diff --git a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
@@ -84,7 +84,7 @@ const TeamPromptWorkDrawer = (props: Props) => {
           {
             icon: <JiraServerSVG />,
             service: 'jiraServer',
-            label: 'Jira Server',
+            label: 'Jira Data Center',
             Component: JiraServerIntegrationPanel
           }
         ]

diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx
@@ -74,9 +74,9 @@ const JiraServerIntegrationPanel = (props: Props) => {
           <div className='h-10 w-10'>
             <img className='h-10 w-10' src={jiraServerSVG} />
           </div>
-          <b>Connect to Jira Server</b>
+          <b>Connect to Jira Data Center</b>
           <div className='w-1/2 text-center text-sm'>
-            Connect to Jira Server to view your issues.
+            Connect to Jira Data Center to view your issues.
           </div>
           <button
             className='mt-4 cursor-pointer rounded-full bg-sky-500 px-8 py-2 font-semibold text-white hover:bg-sky-600'

diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx
@@ -96,7 +96,7 @@ const JiraServerIntegrationResults = (props: Props) => {
               to={`/team/${teamId}/integrations`}
               className='mt-4 font-semibold text-sky-500 hover:text-sky-400'
             >
-              Review your Jira Server configuration
+              Review your Jira Data Center configuration
             </Link>
           </div>
         )}

diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
@@ -125,7 +125,7 @@ const ProviderList = (props: Props) => {
       )
     },
     {
-      name: 'Jira Server',
+      name: 'Jira Data Center',
       connected:
         !!integrations?.jiraServer?.auth?.isActive && integrations.jiraServer?.sharedProviders[0],
       component: <JiraServerProviderRow key='jira' teamId={teamId} viewerRef={viewer} />

diff --git a/packages/client/types/constEnums.ts b/packages/client/types/constEnums.ts
@@ -295,8 +295,8 @@ export const enum Pricing {
 export const enum Providers {
   ATLASSIAN_NAME = 'Atlassian',
   ATLASSIAN_DESC = 'Use Jira Cloud Issues from within Parabol.',
-  JIRA_SERVER_NAME = 'Jira Server',
-  JIRA_SERVER_DESC = 'Use Jira Server Issues from within Parabol.',
+  JIRA_SERVER_NAME = 'Jira Data Center',
+  JIRA_SERVER_DESC = 'Use Jira Data Center Issues from within Parabol.',
   GITHUB_NAME = 'GitHub',
   GCAL_NAME = 'Google Calendar',
   GCAL_DESC = 'Create Google Calendar events from within Parabol.',

diff --git a/packages/client/utils/constants.ts b/packages/client/utils/constants.ts
@@ -185,7 +185,7 @@ export const EnterpriseBenefits = [
   'Domain Whitelisting',
   'Uptime Service Level Agreement (SLA)',
   'On-Premises Hosting Option',
-  'Jira Server Integration'
+  'Jira Data Center Integration'
 ]
 
 export const readableReasonsToDowngrade: ReadableReasonToDowngradeEnum[] = [

diff --git a/packages/server/graphql/mutations/setTaskEstimate.ts b/packages/server/graphql/mutations/setTaskEstimate.ts
@@ -217,7 +217,7 @@ const setTaskEstimate = {
         ])
 
         if (!auth) {
-          errorMessage = 'User no longer has access to Jira Server'
+          errorMessage = 'User no longer has access to Jira Data Center'
           break
         }
 

diff --git a/packages/server/graphql/public/typeDefs/JiraServerIntegration.graphql b/packages/server/graphql/public/typeDefs/JiraServerIntegration.graphql
@@ -1,5 +1,5 @@
 """
-Jira Server integration data for a given team member
+Jira Data Center integration data for a given team member
 """
 type JiraServerIntegration {
   """

diff --git a/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql b/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql
@@ -1,5 +1,5 @@
 """
-The Jira Issue that comes direct from Jira Server
+The Jira Issue that comes direct from Jira Data Center
 """
 type JiraServerIssue implements TaskIntegration {
   """

diff --git a/packages/server/graphql/public/typeDefs/Mutation.graphql b/packages/server/graphql/public/typeDefs/Mutation.graphql
@@ -1833,12 +1833,12 @@ type Mutation {
     dimensionName: String!
 
     """
-    The Jira Server field name that we should push estimates to
+    The Jira Data Center field name that we should push estimates to
     """
     fieldName: ID!
 
     """
-    The Jira Server issue type for which to set the dimension
+    The Jira Data Center issue type for which to set the dimension
     """
     issueType: ID!
 

diff --git a/packages/server/graphql/public/typeDefs/TeamMemberIntegrations.graphql b/packages/server/graphql/public/typeDefs/TeamMemberIntegrations.graphql
@@ -13,7 +13,7 @@ type TeamMemberIntegrations {
   atlassian: AtlassianIntegration
 
   """
-  All things associated with a Jira Server integration for a team member
+  All things associated with a Jira Data Center integration for a team member
   """
   jiraServer: JiraServerIntegration!
 

diff --git a/packages/server/integrations/jiraServer/JiraServerRestManager.ts b/packages/server/integrations/jiraServer/JiraServerRestManager.ts
@@ -96,7 +96,7 @@ interface JiraServerIssuesResponse {
 }
 
 export default class JiraServerRestManager implements TaskIntegrationManager {
-  public title = 'Jira Server'
+  public title = 'Jira Data Center'
   private readonly auth: TeamMemberIntegrationAuth
   private readonly provider: IntegrationProviderJiraServer
   private readonly serverBaseUrl: string
@@ -136,7 +136,7 @@ export default class JiraServerRestManager implements TaskIntegrationManager {
   async parseJsonResponse<T>(response: Response): Promise<T | Error> {
     const contentType = response.headers.get('content-type') || ''
     if (!contentType.includes('application/json')) {
-      return new Error('Received non-JSON Jira Server Response')
+      return new Error('Received non-JSON Jira Data Center Response')
     }
     const json = await response.json()
 

diff --git a/scripts/create-jira-keys.sh b/scripts/create-jira-keys.sh
@@ -15,7 +15,7 @@ echo Parabol integration
 echo Public Key:
 cat jira_publickey.pem
 echo
-echo "Ask for their Jira Server URL, (ours is 'jira.parabol.co' for example)"
+echo "Ask for their Jira Data Center URL, (ours is 'jira.parabol.co' for example)"
 echo END SEND TO CLIENT
 echo -----------------------------------
 echo