From f708a357883cb8cc0ab1f541e71225c68115294d Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Tue, 3 May 2022 13:41:18 +0800
Subject: [PATCH] Revert "Merge branch '2256-fix-crm-issue-search' into
'master'"
This reverts commit f5aead2b7279336b818fdb09e53c11f59d27ba60, reversing
changes made to 9cffd9e305939d2970354139a140a0ed4ed7c84f.
---
.../javascripts/issues/list/constants.js | 22 ---------------
.../list/queries/get_issues.query.graphql | 6 ----
.../queries/get_issues_counts.query.graphql | 14 ----------
.../concerns/issue_resolver_arguments.rb | 6 ----
doc/api/graphql/reference/index.md | 8 ------
.../list/queries/get_issues.query.graphql | 6 ----
.../queries/get_issues_counts.query.graphql | 14 ----------
spec/frontend/issues/list/mock_data.js | 8 ------
.../graphql/resolvers/issues_resolver_spec.rb | 28 -------------------
9 files changed, 112 deletions(-)
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 4541191730ad5..d4e2cdcfb1d00 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -132,8 +132,6 @@ export const TOKEN_TYPE_CONFIDENTIAL = 'confidential';
export const TOKEN_TYPE_ITERATION = 'iteration';
export const TOKEN_TYPE_EPIC = 'epic_id';
export const TOKEN_TYPE_WEIGHT = 'weight';
-export const TOKEN_TYPE_CONTACT = 'crm_contact';
-export const TOKEN_TYPE_ORGANIZATION = 'crm_organization';
export const filters = {
[TOKEN_TYPE_AUTHOR]: {
@@ -296,24 +294,4 @@ export const filters = {
},
},
},
- [TOKEN_TYPE_CONTACT]: {
- [API_PARAM]: {
- [NORMAL_FILTER]: 'crmContactId',
- },
- [URL_PARAM]: {
- [OPERATOR_IS]: {
- [NORMAL_FILTER]: 'crm_contact_id',
- },
- },
- },
- [TOKEN_TYPE_ORGANIZATION]: {
- [API_PARAM]: {
- [NORMAL_FILTER]: 'crmOrganizationId',
- },
- [URL_PARAM]: {
- [OPERATOR_IS]: {
- [NORMAL_FILTER]: 'crm_organization_id',
- },
- },
- },
};
diff --git a/app/assets/javascripts/issues/list/queries/get_issues.query.graphql b/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
index dcc0db786b759..ec24ea7c56ae0 100644
--- a/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
+++ b/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
@@ -20,8 +20,6 @@ query getIssues(
$releaseTag: [String!]
$releaseTagWildcardId: ReleaseTagWildcardId
$types: [IssueType!]
- $crmContactId: String
- $crmOrganizationId: String
$not: NegatedIssueFilterInput
$beforeCursor: String
$afterCursor: String
@@ -45,8 +43,6 @@ query getIssues(
milestoneWildcardId: $milestoneWildcardId
myReactionEmoji: $myReactionEmoji
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
before: $beforeCursor
after: $afterCursor
@@ -80,8 +76,6 @@ query getIssues(
releaseTag: $releaseTag
releaseTagWildcardId: $releaseTagWildcardId
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
before: $beforeCursor
after: $afterCursor
diff --git a/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql b/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
index c1aee772167ea..58e7ce32e7c9c 100644
--- a/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
+++ b/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
@@ -14,8 +14,6 @@ query getIssuesCount(
$releaseTag: [String!]
$releaseTagWildcardId: ReleaseTagWildcardId
$types: [IssueType!]
- $crmContactId: String
- $crmOrganizationId: String
$not: NegatedIssueFilterInput
) {
group(fullPath: $fullPath) @skip(if: $isProject) {
@@ -34,8 +32,6 @@ query getIssuesCount(
milestoneWildcardId: $milestoneWildcardId
myReactionEmoji: $myReactionEmoji
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -54,8 +50,6 @@ query getIssuesCount(
milestoneWildcardId: $milestoneWildcardId
myReactionEmoji: $myReactionEmoji
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -74,8 +68,6 @@ query getIssuesCount(
milestoneWildcardId: $milestoneWildcardId
myReactionEmoji: $myReactionEmoji
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -98,8 +90,6 @@ query getIssuesCount(
releaseTag: $releaseTag
releaseTagWildcardId: $releaseTagWildcardId
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -119,8 +109,6 @@ query getIssuesCount(
releaseTag: $releaseTag
releaseTagWildcardId: $releaseTagWildcardId
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -140,8 +128,6 @@ query getIssuesCount(
releaseTag: $releaseTag
releaseTagWildcardId: $releaseTagWildcardId
types: $types
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
diff --git a/app/graphql/resolvers/concerns/issue_resolver_arguments.rb b/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
index de44dbb26d7f9..432d6f48607f4 100644
--- a/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
+++ b/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
@@ -68,12 +68,6 @@ module IssueResolverArguments
description: 'Negated arguments.',
prepare: ->(negated_args, ctx) { negated_args.to_h },
required: false
- argument :crm_contact_id, GraphQL::Types::String,
- required: false,
- description: 'ID of a contact assigned to the issues.'
- argument :crm_organization_id, GraphQL::Types::String,
- required: false,
- description: 'ID of an organization assigned to the issues.'
end
def resolve_with_lookahead(**args)
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 3263b4a092063..dae58ff1f9365 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -11556,8 +11556,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
| <a id="groupissuesconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential issues. If "false", excludes confidential issues. If "true", returns only confidential issues. |
| <a id="groupissuescreatedafter"></a>`createdAfter` | [`Time`](#time) | Issues created after this date. |
| <a id="groupissuescreatedbefore"></a>`createdBefore` | [`Time`](#time) | Issues created before this date. |
-| <a id="groupissuescrmcontactid"></a>`crmContactId` | [`String`](#string) | ID of a contact assigned to the issues. |
-| <a id="groupissuescrmorganizationid"></a>`crmOrganizationId` | [`String`](#string) | ID of an organization assigned to the issues. |
| <a id="groupissuesepicid"></a>`epicId` | [`String`](#string) | ID of an epic associated with the issues, "none" and "any" values are supported. |
| <a id="groupissuesiid"></a>`iid` | [`String`](#string) | IID of the issue. For example, "1". |
| <a id="groupissuesiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of issues. For example, `["1", "2"]`. |
@@ -14793,8 +14791,6 @@ Returns [`Issue`](#issue).
| <a id="projectissueconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential issues. If "false", excludes confidential issues. If "true", returns only confidential issues. |
| <a id="projectissuecreatedafter"></a>`createdAfter` | [`Time`](#time) | Issues created after this date. |
| <a id="projectissuecreatedbefore"></a>`createdBefore` | [`Time`](#time) | Issues created before this date. |
-| <a id="projectissuecrmcontactid"></a>`crmContactId` | [`String`](#string) | ID of a contact assigned to the issues. |
-| <a id="projectissuecrmorganizationid"></a>`crmOrganizationId` | [`String`](#string) | ID of an organization assigned to the issues. |
| <a id="projectissueepicid"></a>`epicId` | [`String`](#string) | ID of an epic associated with the issues, "none" and "any" values are supported. |
| <a id="projectissueiid"></a>`iid` | [`String`](#string) | IID of the issue. For example, "1". |
| <a id="projectissueiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of issues. For example, `["1", "2"]`. |
@@ -14835,8 +14831,6 @@ Returns [`IssueStatusCountsType`](#issuestatuscountstype).
| <a id="projectissuestatuscountsconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential issues. If "false", excludes confidential issues. If "true", returns only confidential issues. |
| <a id="projectissuestatuscountscreatedafter"></a>`createdAfter` | [`Time`](#time) | Issues created after this date. |
| <a id="projectissuestatuscountscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Issues created before this date. |
-| <a id="projectissuestatuscountscrmcontactid"></a>`crmContactId` | [`String`](#string) | ID of a contact assigned to the issues. |
-| <a id="projectissuestatuscountscrmorganizationid"></a>`crmOrganizationId` | [`String`](#string) | ID of an organization assigned to the issues. |
| <a id="projectissuestatuscountsiid"></a>`iid` | [`String`](#string) | IID of the issue. For example, "1". |
| <a id="projectissuestatuscountsiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of issues. For example, `["1", "2"]`. |
| <a id="projectissuestatuscountslabelname"></a>`labelName` | [`[String]`](#string) | Labels applied to this issue. |
@@ -14874,8 +14868,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
| <a id="projectissuesconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential issues. If "false", excludes confidential issues. If "true", returns only confidential issues. |
| <a id="projectissuescreatedafter"></a>`createdAfter` | [`Time`](#time) | Issues created after this date. |
| <a id="projectissuescreatedbefore"></a>`createdBefore` | [`Time`](#time) | Issues created before this date. |
-| <a id="projectissuescrmcontactid"></a>`crmContactId` | [`String`](#string) | ID of a contact assigned to the issues. |
-| <a id="projectissuescrmorganizationid"></a>`crmOrganizationId` | [`String`](#string) | ID of an organization assigned to the issues. |
| <a id="projectissuesepicid"></a>`epicId` | [`String`](#string) | ID of an epic associated with the issues, "none" and "any" values are supported. |
| <a id="projectissuesiid"></a>`iid` | [`String`](#string) | IID of the issue. For example, "1". |
| <a id="projectissuesiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of issues. For example, `["1", "2"]`. |
diff --git a/ee/app/assets/javascripts/issues/list/queries/get_issues.query.graphql b/ee/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
index e89f8eb305d4a..5e88113b0f4f8 100644
--- a/ee/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
+++ b/ee/app/assets/javascripts/issues/list/queries/get_issues.query.graphql
@@ -24,8 +24,6 @@ query getIssuesEE(
$iterationId: [ID]
$iterationWildcardId: IterationWildcardId
$weight: String
- $crmContactId: String
- $crmOrganizationId: String
$not: NegatedIssueFilterInput
$beforeCursor: String
$afterCursor: String
@@ -54,8 +52,6 @@ query getIssuesEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
before: $beforeCursor
after: $afterCursor
@@ -97,8 +93,6 @@ query getIssuesEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
before: $beforeCursor
after: $afterCursor
diff --git a/ee/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql b/ee/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
index 7147764714c74..cb687b7f6a009 100644
--- a/ee/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
+++ b/ee/app/assets/javascripts/issues/list/queries/get_issues_counts.query.graphql
@@ -18,8 +18,6 @@ query getIssuesCountEE(
$iterationId: [ID]
$iterationWildcardId: IterationWildcardId
$weight: String
- $crmContactId: String
- $crmOrganizationId: String
$not: NegatedIssueFilterInput
) {
group(fullPath: $fullPath) @skip(if: $isProject) {
@@ -43,8 +41,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -68,8 +64,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -93,8 +87,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -122,8 +114,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -148,8 +138,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
@@ -174,8 +162,6 @@ query getIssuesCountEE(
iterationId: $iterationId
iterationWildcardId: $iterationWildcardId
weight: $weight
- crmContactId: $crmContactId
- crmOrganizationId: $crmOrganizationId
not: $not
) {
count
diff --git a/spec/frontend/issues/list/mock_data.js b/spec/frontend/issues/list/mock_data.js
index 46f342cc67366..b1a135ceb1899 100644
--- a/spec/frontend/issues/list/mock_data.js
+++ b/spec/frontend/issues/list/mock_data.js
@@ -146,8 +146,6 @@ export const locationSearch = [
'not[epic_id]=34',
'weight=1',
'not[weight]=3',
- 'crm_contact_id=123',
- 'crm_organization_id=456',
].join('&');
export const locationSearchWithSpecialValues = [
@@ -196,8 +194,6 @@ export const filteredTokens = [
{ type: 'epic_id', value: { data: '34', operator: OPERATOR_IS_NOT } },
{ type: 'weight', value: { data: '1', operator: OPERATOR_IS } },
{ type: 'weight', value: { data: '3', operator: OPERATOR_IS_NOT } },
- { type: 'crm_contact', value: { data: '123', operator: OPERATOR_IS } },
- { type: 'crm_organization', value: { data: '456', operator: OPERATOR_IS } },
{ type: 'filtered-search-term', value: { data: 'find' } },
{ type: 'filtered-search-term', value: { data: 'issues' } },
];
@@ -226,8 +222,6 @@ export const apiParams = {
iterationId: ['4', '12'],
epicId: '12',
weight: '1',
- crmContactId: '123',
- crmOrganizationId: '456',
not: {
authorUsername: 'marge',
assigneeUsernames: ['patty', 'selma'],
@@ -276,8 +270,6 @@ export const urlParams = {
'not[epic_id]': '34',
weight: '1',
'not[weight]': '3',
- crm_contact_id: '123',
- crm_organization_id: '456',
};
export const urlParamsWithSpecialValues = {
diff --git a/spec/graphql/resolvers/issues_resolver_spec.rb b/spec/graphql/resolvers/issues_resolver_spec.rb
index 3569244e5148f..81aeee0a3d240 100644
--- a/spec/graphql/resolvers/issues_resolver_spec.rb
+++ b/spec/graphql/resolvers/issues_resolver_spec.rb
@@ -389,34 +389,6 @@
end
end
- describe 'filtering by crm' do
- let_it_be(:organization) { create(:organization, group: group) }
- let_it_be(:contact1) { create(:contact, group: group, organization: organization) }
- let_it_be(:contact2) { create(:contact, group: group, organization: organization) }
- let_it_be(:contact3) { create(:contact, group: group) }
- let_it_be(:crm_issue1) { create(:issue, project: project) }
- let_it_be(:crm_issue2) { create(:issue, project: project) }
- let_it_be(:crm_issue3) { create(:issue, project: project) }
-
- before_all do
- create(:issue_customer_relations_contact, issue: crm_issue1, contact: contact1)
- create(:issue_customer_relations_contact, issue: crm_issue2, contact: contact2)
- create(:issue_customer_relations_contact, issue: crm_issue3, contact: contact3)
- end
-
- context 'contact' do
- it 'returns only the issues for the contact' do
- expect(resolve_issues({ crm_contact_id: contact1.id })).to contain_exactly(crm_issue1)
- end
- end
-
- context 'organization' do
- it 'returns only the issues for the contact' do
- expect(resolve_issues({ crm_organization_id: organization.id })).to contain_exactly(crm_issue1, crm_issue2)
- end
- end
- end
-
describe 'sorting' do
context 'when sorting by created' do
it 'sorts issues ascending' do
--
GitLab