chore(client): rename targetType to type

camunda · May 6, 2024 · aa5f4d3 · aa5f4d3
1 parent eab01d9
commit aa5f4d3
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 83 deletions.
diff --git a/client/src/plugins/camunda-plugin/deployment-tool/DeploymentTool.js b/client/src/plugins/camunda-plugin/deployment-tool/DeploymentTool.js
@@ -201,7 +201,7 @@ export default class DeploymentTool extends PureComponent {
       type: 'deployment.done',
       payload: {
         deployment,
-        targetType: SELF_HOSTED,
+        type: SELF_HOSTED,
         deployedTo: {
           executionPlatformVersion: version,
           executionPlatform: ENGINES.PLATFORM
@@ -264,7 +264,7 @@ export default class DeploymentTool extends PureComponent {
       type: 'deployment.error',
       payload: {
         error,
-        targetType: SELF_HOSTED,
+        type: SELF_HOSTED,
         context: 'deploymentTool',
         ...(deployedTo && { deployedTo: deployedTo })
       }

diff --git a/client/src/plugins/camunda-plugin/deployment-tool/__tests__/DeploymentToolSpec.js b/client/src/plugins/camunda-plugin/deployment-tool/__tests__/DeploymentToolSpec.js
@@ -630,11 +630,12 @@ describe('<DeploymentTool>', () => {
           onClose: () => { }
         }));
 
-        const targetType = actionSpy.getCall(0).args[0].payload.targetType;
-
         // then
         expect(actionSpy).to.have.been.calledOnce;
-        expect(targetType).to.eql('selfHosted');
+
+        const { type } = actionSpy.getCall(0).args[0].payload;
+
+        expect(type).to.eql('selfHosted');
       });
 
 

diff --git a/client/src/plugins/user-journey-statistics/event-handlers/DeploymentEventHandler.js b/client/src/plugins/user-journey-statistics/event-handlers/DeploymentEventHandler.js
@@ -62,7 +62,7 @@ export default class DeploymentEventHandler {
     const {
       context,
       deployedTo,
-      targetType,
+      type,
       error,
       tab
     } = event;
@@ -91,10 +91,11 @@ export default class DeploymentEventHandler {
       ...engineProfile
     };
 
-    if (targetType) {
+    if (type) {
       payload = {
         ...payload,
-        targetType
+        targetType: type, // legacy
+        type
       };
     }
 

diff --git a/...rc/plugins/user-journey-statistics/event-handlers/__tests__/DeploymentEventHandlerSpec.js b/...rc/plugins/user-journey-statistics/event-handlers/__tests__/DeploymentEventHandlerSpec.js
@@ -575,17 +575,21 @@ describe('<DeploymentEventHandler>', () => {
       type: 'cloud-bpmn'
     });
 
-    const cloudTargetType = 'camundaCloud';
+    const CAMUNDA_CLOUD = 'camundaCloud';
 
     const handleDeploymentDone = subscribe.getCall(0).args[1];
 
     // when
-    await handleDeploymentDone({ tab, targetType: cloudTargetType });
+    await handleDeploymentDone({ tab, type: CAMUNDA_CLOUD });
 
-    const { targetType } = track.getCall(0).args[1];
+    const {
+      targetType, // legacy
+      type
+    } = track.getCall(0).args[1];
 
     // then
-    expect(targetType).to.eql(cloudTargetType);
+    expect(targetType).to.eql(CAMUNDA_CLOUD);
+    expect(type).to.eql(CAMUNDA_CLOUD);
   });
 
 
@@ -618,7 +622,6 @@ describe('<DeploymentEventHandler>', () => {
     expect(templateIds).to.have.length(2);
   });
 
-
 });
 
 

diff --git a/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPlugin.js b/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPlugin.js
@@ -28,7 +28,7 @@ import {
 
 import { AUTH_TYPES } from './../shared/ZeebeAuthTypes';
 
-import { CAMUNDA_CLOUD, SELF_HOSTED } from '../shared/ZeebeTargetTypes';
+import { CAMUNDA_CLOUD, SELF_HOSTED } from '../shared/ZeebeEndpointTypes';
 
 import DeploymentPluginOverlay from './DeploymentPluginOverlay';
 
@@ -382,7 +382,7 @@ export default class DeploymentPlugin extends PureComponent {
 
     let endpoint = {
       id: generateId(),
-      targetType: CAMUNDA_CLOUD,
+      type: CAMUNDA_CLOUD,
       authType: AUTH_TYPES.NONE,
       contactPoint: '',
       oauthURL: '',
@@ -473,7 +473,7 @@ export default class DeploymentPlugin extends PureComponent {
       gatewayVersion
     } = options;
 
-    const content = endpoint.targetType === CAMUNDA_CLOUD ?
+    const content = endpoint.type === CAMUNDA_CLOUD ?
       <CloudLink endpoint={ endpoint } response={ response } />
       : null;
 
@@ -492,7 +492,7 @@ export default class DeploymentPlugin extends PureComponent {
       payload: {
         deployment: response,
         context: isStart ? 'startInstanceTool' : 'deploymentTool',
-        targetType: endpoint && endpoint.targetType,
+        type: endpoint && endpoint.type,
         deployedTo: {
           executionPlatformVersion: gatewayVersion,
           executionPlatform: ENGINES.CLOUD
@@ -570,7 +570,7 @@ export default class DeploymentPlugin extends PureComponent {
         },
         context: isStart ? 'startInstanceTool' : 'deploymentTool',
         ...(deployedTo && { deployedTo: deployedTo }),
-        targetType: endpoint && endpoint.targetType
+        type: endpoint && endpoint.type
       }
     });
   }
@@ -724,7 +724,7 @@ function patchWithProtocol(config = {}) {
     return config;
   }
 
-  if (endpoint.targetType !== SELF_HOSTED) {
+  if (endpoint.type !== SELF_HOSTED) {
     return config;
   }
 

diff --git a/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPluginOverlay.js b/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPluginOverlay.js
@@ -43,7 +43,7 @@ import { AUTH_TYPES } from './../shared/ZeebeAuthTypes';
 import {
   SELF_HOSTED,
   CAMUNDA_CLOUD
-} from '../shared/ZeebeTargetTypes';
+} from '../shared/ZeebeEndpointTypes';
 
 import {
   Formik,
@@ -175,7 +175,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
     }
 
     // Extract clusterId and clusterRegion as required by zeebeAPI for camundaCloud
-    if (endpoint.targetType === CAMUNDA_CLOUD && endpoint.camundaCloudClusterUrl) {
+    if (endpoint.type === CAMUNDA_CLOUD && endpoint.camundaCloudClusterUrl) {
       endpoint.camundaCloudClusterId = extractClusterId(endpoint.camundaCloudClusterUrl);
       endpoint.camundaCloudClusterRegion = extractClusterRegion(endpoint.camundaCloudClusterUrl);
     }
@@ -213,7 +213,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
     } = values;
 
     // Extract clusterId and clusterRegion as required by zeebeAPI for camundaCloud
-    if (endpoint.targetType === CAMUNDA_CLOUD && endpoint.camundaCloudClusterUrl) {
+    if (endpoint.type === CAMUNDA_CLOUD && endpoint.camundaCloudClusterUrl) {
       endpoint.camundaCloudClusterId = extractClusterId(endpoint.camundaCloudClusterUrl);
       endpoint.camundaCloudClusterRegion = extractClusterRegion(endpoint.camundaCloudClusterUrl);
     }
@@ -275,7 +275,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                           autoFocus
                         />
                         <Field
-                          name="endpoint.targetType"
+                          name="endpoint.type"
                           component={ Radio }
                           label={ 'Target' }
                           className="target_radio"
@@ -287,7 +287,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                           }
                         />
                         {
-                          form.values.endpoint.targetType === SELF_HOSTED && (
+                          form.values.endpoint.type === SELF_HOSTED && (
                             <React.Fragment>
                               <Field
                                 name="endpoint.contactPoint"
@@ -299,7 +299,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                                 autoFocus
                               />
                               {
-                                form.values.endpoint.targetType === SELF_HOSTED &&
+                                form.values.endpoint.type === SELF_HOSTED &&
                                   form.values.endpoint.authType === AUTH_TYPES.OAUTH && (
                                   <Field
                                     name="deployment.tenantId"
@@ -325,7 +325,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                           )
                         }
                         {
-                          form.values.endpoint.targetType === SELF_HOSTED &&
+                          form.values.endpoint.type === SELF_HOSTED &&
                             form.values.endpoint.authType === AUTH_TYPES.BASIC && (
                             <React.Fragment>
                               <Field
@@ -347,7 +347,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                           )
                         }
                         {
-                          form.values.endpoint.targetType === SELF_HOSTED &&
+                          form.values.endpoint.type === SELF_HOSTED &&
                             form.values.endpoint.authType === AUTH_TYPES.OAUTH && (
                             <React.Fragment>
                               <Field
@@ -390,7 +390,7 @@ export default class DeploymentPluginOverlay extends React.PureComponent {
                           )
                         }
                         {
-                          form.values.endpoint.targetType === CAMUNDA_CLOUD && (
+                          form.values.endpoint.type === CAMUNDA_CLOUD && (
                             <React.Fragment>
                               <Field
                                 name="endpoint.camundaCloudClusterUrl"

diff --git a/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPluginValidator.js b/client/src/plugins/zeebe-plugin/deployment-plugin/DeploymentPluginValidator.js
@@ -24,7 +24,7 @@ import {
 
 import { AUTH_TYPES } from '../shared/ZeebeAuthTypes';
 
-import { CAMUNDA_CLOUD, SELF_HOSTED } from '../shared/ZeebeTargetTypes';
+import { CAMUNDA_CLOUD, SELF_HOSTED } from '../shared/ZeebeEndpointTypes';
 
 import pDefer from 'p-defer';
 
@@ -96,17 +96,17 @@ export default class DeploymentPluginValidator {
   };
 
   validateEndpoint = endpoint => {
-    const { authType, targetType } = endpoint;
+    const { authType, type } = endpoint;
 
     let validators = {};
 
-    if (targetType === CAMUNDA_CLOUD) {
+    if (type === CAMUNDA_CLOUD) {
       validators = {
         camundaCloudClientId: this.validateClientId,
         camundaCloudClientSecret: this.validateClientSecret,
         camundaCloudClusterUrl: this.validateClusterUrl
       };
-    } else if (targetType === SELF_HOSTED) {
+    } else if (type === SELF_HOSTED) {
       if (endpoint.authType === AUTH_TYPES.NONE) {
         validators = {
           contactPoint: this.validateZeebeContactPoint

diff --git a/client/src/plugins/zeebe-plugin/deployment-plugin/__tests__/DeploymentPluginOverlaySpec.js b/client/src/plugins/zeebe-plugin/deployment-plugin/__tests__/DeploymentPluginOverlaySpec.js
@@ -21,7 +21,7 @@ import { AUTH_TYPES } from '../../shared/ZeebeAuthTypes';
 import {
   SELF_HOSTED,
   CAMUNDA_CLOUD
-} from '../../shared/ZeebeTargetTypes';
+} from '../../shared/ZeebeEndpointTypes';
 
 describe('<DeploymentPluginModal> (Zeebe)', () => {
 
@@ -82,7 +82,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
       validator,
       config: {
         endpoint: {
-          targetType: CAMUNDA_CLOUD,
+          type: CAMUNDA_CLOUD,
           camundaCloudClusterUrl: '7edda473-891c-4978-aa27-2e727d8560ff.ber-5.zeebe.camunda.io:443'
         }
       }
@@ -116,7 +116,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         anchor,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.NONE,
             contactPoint: 'https://google.com'
           },
@@ -141,7 +141,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         anchor,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.OAUTH,
             contactPoint: 'https://google.com'
           },
@@ -168,7 +168,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         onDeploy,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.NONE,
             contactPoint: 'https://google.com',
           },
@@ -200,7 +200,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         onDeploy,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.OAUTH,
             contactPoint: 'https://google.com'
           },
@@ -231,7 +231,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         anchor,
         config: {
           endpoint: {
-            targetType: CAMUNDA_CLOUD,
+            type: CAMUNDA_CLOUD,
             camundaCloudClusterUrl: '7edda473-891c-4978-aa27-2e727d8560ff.ber-5.zeebe.camunda.io:443'
           }
         }
@@ -257,7 +257,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         onDeploy,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.BASIC,
             basicAuthUsername: 'username',
             basicAuthPassword: 'password'
@@ -293,7 +293,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         onDeploy,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.OAUTH,
             contactPoint: 'https://google.com',
             audience: 'audience'
@@ -325,7 +325,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
         onDeploy,
         config: {
           endpoint: {
-            targetType: SELF_HOSTED,
+            type: SELF_HOSTED,
             authType: AUTH_TYPES.OAUTH,
             contactPoint: 'https://google.com',
             audience: 'audience',
@@ -360,7 +360,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
       onDeploy,
       config: {
         endpoint: {
-          targetType: CAMUNDA_CLOUD,
+          type: CAMUNDA_CLOUD,
           camundaCloudClusterUrl: '7edda473-891c-4978-aa27-2e727d8560ff.ber-5.zeebe.camunda.io:443'
         }
       } });
@@ -387,7 +387,7 @@ describe('<DeploymentPluginModal> (Zeebe)', () => {
       onDeploy,
       config: {
         endpoint: {
-          targetType: CAMUNDA_CLOUD,
+          type: CAMUNDA_CLOUD,
           camundaCloudClusterUrl: 'https://7edda473-891c-4978-aa27-2e727d8560ff.ber-5.zeebe.camunda.io:443'
         }
       } });
@@ -438,7 +438,7 @@ function createConfig({ endpoint = {}, deployment = {} } = {}) {
       ...deployment
     },
     endpoint: {
-      targetType: SELF_HOSTED,
+      type: SELF_HOSTED,
       authType: AUTH_TYPES.NONE,
       contactPoint: 'https://google.com',
       ...endpoint