From a4f10d193bb38990d8400183c6d320522d2db71e Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 12:34:59 +0200
Subject: [PATCH] feat: release recurring retros (#9625)

---
 .../components/ActivityLibrary/ActivityDetailsSidebar.tsx  | 7 +------
 .../graphql/private/typeDefs/updateOrgFeatureFlag.graphql  | 1 -
 .../server/graphql/public/typeDefs/Organization.graphql    | 1 -
 .../graphql/public/types/OrganizationFeatureFlags.ts       | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 1d335f21a90..0fbe9cfab1a 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -89,9 +89,6 @@ const ActivityDetailsSidebar = (props: Props) => {
         orgId
         organization {
           name
-          featureFlags {
-            recurringRetros
-          }
         }
         retroSettings: meetingSettings(meetingType: retrospective) {
           ...NewMeetingSettingsToggleCheckIn_settings
@@ -252,9 +249,7 @@ const ActivityDetailsSidebar = (props: Props) => {
           : type === 'action'
             ? 'Check-in'
             : 'Meeting'
-  const withRecurrence =
-    type === 'teamPrompt' ||
-    (selectedTeam.organization.featureFlags.recurringRetros && type === 'retrospective')
+  const withRecurrence = type === 'teamPrompt' || type === 'retrospective'
 
   return (
     <>
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index ef74a967ff1..ab0497ff8b3 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -15,7 +15,6 @@ enum OrganizationFeatureFlagsEnum {
   kudos
   aiIcebreakers
   aiTemplate
-  recurringRetros
   relatedDiscussions
 }
 
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 49d3169c48f..349a943c5b6 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -190,6 +190,5 @@ type OrganizationFeatureFlags {
   kudos: Boolean!
   aiIcebreakers: Boolean!
   aiTemplate: Boolean!
-  recurringRetros: Boolean!
   relatedDiscussions: Boolean!
 }
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index 1f917215116..dac0884752c 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -14,7 +14,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   kudos: ({kudos}) => !!kudos,
   aiIcebreakers: ({aiIcebreakers}) => !!aiIcebreakers,
   aiTemplate: ({aiTemplate}) => !!aiTemplate,
-  recurringRetros: ({recurringRetros}) => !!recurringRetros,
   relatedDiscussions: ({relatedDiscussions}) => !!relatedDiscussions
 }