Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/crm/contacts/components/contact_form_wrapper.vue b/app/assets/javascripts/crm/contacts/components/contact_form_wrapper.vue
index a851c7a9e85..57931121629 100644
--- a/app/assets/javascripts/crm/contacts/components/contact_form_wrapper.vue
+++ b/app/assets/javascripts/crm/contacts/components/contact_form_wrapper.vue
@@ -1,7 +1,7 @@
 <script>
 import { s__, __ } from '~/locale';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
-import { TYPE_CRM_CONTACT, TYPE_GROUP } from '~/graphql_shared/constants';
+import { TYPENAME_CRM_CONTACT, TYPENAME_GROUP } from '~/graphql_shared/constants';
 import CrmForm from '../../components/crm_form.vue';
 import getGroupOrganizationsQuery from '../../organizations/components/graphql/get_group_organizations.query.graphql';
 import getGroupContactsQuery from './graphql/get_group_contacts.query.graphql';
@@ -44,10 +44,10 @@ export default {
     contactGraphQLId() {
       if (!this.isEditMode) return null;
 
-      return convertToGraphQLId(TYPE_CRM_CONTACT, this.$route.params.id);
+      return convertToGraphQLId(TYPENAME_CRM_CONTACT, this.$route.params.id);
     },
     groupGraphQLId() {
-      return convertToGraphQLId(TYPE_GROUP, this.groupId);
+      return convertToGraphQLId(TYPENAME_GROUP, this.groupId);
     },
     mutation() {
       if (this.isEditMode) return updateContactMutation;
diff --git a/app/assets/javascripts/crm/organizations/components/organization_form_wrapper.vue b/app/assets/javascripts/crm/organizations/components/organization_form_wrapper.vue
index 01bff4b69d6..4d2a038458d 100644
--- a/app/assets/javascripts/crm/organizations/components/organization_form_wrapper.vue
+++ b/app/assets/javascripts/crm/organizations/components/organization_form_wrapper.vue
@@ -1,7 +1,7 @@
 <script>
 import { s__, __ } from '~/locale';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
-import { TYPE_CRM_ORGANIZATION, TYPE_GROUP } from '~/graphql_shared/constants';
+import { TYPENAME_CRM_ORGANIZATION, TYPENAME_GROUP } from '~/graphql_shared/constants';
 import CrmForm from '../../components/crm_form.vue';
 import getGroupOrganizationsQuery from './graphql/get_group_organizations.query.graphql';
 import createOrganizationMutation from './graphql/create_organization.mutation.graphql';
@@ -23,10 +23,10 @@ export default {
     organizationGraphQLId() {
       if (!this.isEditMode) return null;
 
-      return convertToGraphQLId(TYPE_CRM_ORGANIZATION, this.$route.params.id);
+      return convertToGraphQLId(TYPENAME_CRM_ORGANIZATION, this.$route.params.id);
     },
     groupGraphQLId() {
-      return convertToGraphQLId(TYPE_GROUP, this.groupId);
+      return convertToGraphQLId(TYPENAME_GROUP, this.groupId);
     },
     mutation() {
       if (this.isEditMode) return updateOrganizationMutation;