Merge branch 'revert-59108d3b' into 'master'

Revert "Merge branch 'mokhax/489771/simple-fields' into 'master'"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169504



Merged-by: Bishwa Hang Rai <bhrai@gitlab.com>
Approved-by: Thong Kuah <tkuah@gitlab.com>
Approved-by: mo khan <mo@mokhan.ca>

app/graphql/types/member_interface.rb

@@ -22,9 +22,6 @@ module MemberInterface
     field :expires_at, Types::TimeType, null: true,
       description: 'Date and time the membership expires.'
-    field :last_activity_on, Types::TimeType,
-      description: 'Date of last activity in the namespace (group or project).'
-
     field :user, Types::UserType, null: true,
       description: 'User that is associated with the member object.'

doc/api/graphql/reference/index.md

@@ -25156,7 +25156,6 @@ Represents a Group Membership.
 | <a id="groupmemberexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="groupmembergroup"></a>`group` | [`Group`](#group) | Group that a user is a member of. |
 | <a id="groupmemberid"></a>`id` | [`ID!`](#id) | ID of the member. |
-| <a id="groupmemberlastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="groupmembernotificationemail"></a>`notificationEmail` | [`String`](#string) | Group notification email for user. Only available for admins. |
 | <a id="groupmemberupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="groupmemberuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |
@@ -29462,7 +29461,6 @@ Represents a Pending Group Membership.
 | <a id="pendinggroupmemberexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="pendinggroupmemberid"></a>`id` | [`ID!`](#id) | ID of the member. |
 | <a id="pendinggroupmemberinvited"></a>`invited` | [`Boolean`](#boolean) | Whether the pending member has been invited. |
-| <a id="pendinggroupmemberlastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="pendinggroupmembername"></a>`name` | [`String`](#string) | Name of the pending member. |
 | <a id="pendinggroupmemberupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="pendinggroupmemberuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |
@@ -29500,7 +29498,6 @@ Represents a Pending Project Membership.
 | <a id="pendingprojectmemberexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="pendingprojectmemberid"></a>`id` | [`ID!`](#id) | ID of the member. |
 | <a id="pendingprojectmemberinvited"></a>`invited` | [`Boolean`](#boolean) | Whether the pending member has been invited. |
-| <a id="pendingprojectmemberlastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="pendingprojectmembername"></a>`name` | [`String`](#string) | Name of the pending member. |
 | <a id="pendingprojectmemberupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="pendingprojectmemberuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |
@@ -32231,7 +32228,6 @@ Represents a Project Membership.
 | <a id="projectmembercreatedby"></a>`createdBy` | [`UserCore`](#usercore) | User that authorized membership. |
 | <a id="projectmemberexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="projectmemberid"></a>`id` | [`ID!`](#id) | ID of the member. |
-| <a id="projectmemberlastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="projectmemberproject"></a>`project` | [`Project`](#project) | Project that User is a member of. |
 | <a id="projectmemberupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="projectmemberuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |
@@ -41456,7 +41452,6 @@ Implementations:
 | <a id="memberinterfacecreatedby"></a>`createdBy` | [`UserCore`](#usercore) | User that authorized membership. |
 | <a id="memberinterfaceexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="memberinterfaceid"></a>`id` | [`ID!`](#id) | ID of the member. |
-| <a id="memberinterfacelastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="memberinterfaceupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="memberinterfaceuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |
@@ -41571,7 +41566,6 @@ Implementations:
 | <a id="pendingmemberinterfaceexpiresat"></a>`expiresAt` | [`Time`](#time) | Date and time the membership expires. |
 | <a id="pendingmemberinterfaceid"></a>`id` | [`ID!`](#id) | ID of the member. |
 | <a id="pendingmemberinterfaceinvited"></a>`invited` | [`Boolean`](#boolean) | Whether the pending member has been invited. |
-| <a id="pendingmemberinterfacelastactivityon"></a>`lastActivityOn` | [`Time`](#time) | Date of last activity in the namespace (group or project). |
 | <a id="pendingmemberinterfacename"></a>`name` | [`String`](#string) | Name of the pending member. |
 | <a id="pendingmemberinterfaceupdatedat"></a>`updatedAt` | [`Time`](#time) | Date and time the membership was last updated. |
 | <a id="pendingmemberinterfaceuser"></a>`user` | [`UserCore`](#usercore) | User that is associated with the member object. |

ee/spec/requests/api/graphql/group_query_spec.rb

@@ -364,7 +364,6 @@ def query_epics(number)
             invited
             avatarUrl
             approved
-            lastActivityOn
           }
         }
         QUERY
@@ -406,7 +405,6 @@ def query_epics(number)
           expect(pending_members.first[:avatarUrl]).to eq(GravatarService.new.execute(pending_member.user.email))
           expect(pending_members.first[:approved]).to eq(pending_member.active?)
           expect(pending_members.first[:invited]).to eq(pending_member.invite?)
-          expect(pending_members.first[:last_activity_on]).to eq(pending_member.last_activity_on)
         end
         it 'returns pending project members' do

spec/graphql/types/member_interface_spec.rb

@@ -9,7 +9,6 @@
       access_level
       created_by
       created_at
-      last_activity_on
       updated_at
       expires_at
       user
@@ -19,8 +18,6 @@
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
-  it { expect(described_class.fields['lastActivityOn']).to have_graphql_type(Types::TimeType) }
-
   describe '.resolve_type' do
     subject { described_class.resolve_type(object, {}) }

spec/requests/api/graphql/user/group_member_query_spec.rb

@@ -13,7 +13,6 @@
           integerValue
           stringValue
         }
-        lastActivityOn
         group {
           id
         }
@@ -31,6 +30,4 @@
   it_behaves_like 'a working graphql query'
   it_behaves_like 'a working membership object query'
-
-  it { expect(graphql_data.dig('user', 'groupMemberships', 'nodes', 0, 'lastActivityOn')).to be_present }
 end

spec/requests/api/graphql/user/project_member_query_spec.rb

@@ -13,7 +13,6 @@
           integerValue
           stringValue
         }
-        lastActivityOn
         project {
           id
         }
@@ -31,6 +30,4 @@
   it_behaves_like 'a working graphql query'
   it_behaves_like 'a working membership object query'
-
-  it { expect(graphql_data.dig('user', 'projectMemberships', 'nodes', 0, 'lastActivityOn')).to be_present }
 end