Remove Env Group Feature Flag (#3359)

api/server/handlers/project/create.go

@@ -44,7 +44,6 @@ func (p *ProjectCreateHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		CapiProvisionerEnabled: true,
 		SimplifiedViewEnabled:  true,
 		HelmValuesEnabled:      false,
-		EnvGroupEnabled:        true,
 		MultiCluster:           false,
 	}
 

api/server/handlers/project/create_test.go

@@ -45,7 +45,6 @@ func TestCreateProjectSuccessful(t *testing.T) {
 		CapiProvisionerEnabled: true,
 		SimplifiedViewEnabled:  true,
 		HelmValuesEnabled:      false,
-		EnvGroupEnabled:        true,
 		MultiCluster:           false,
 	}
 

api/types/project.go

@@ -13,7 +13,6 @@ type Project struct {
 	SimplifiedViewEnabled  bool    `json:"simplified_view_enabled"`
 	AzureEnabled           bool    `json:"azure_enabled"`
 	HelmValuesEnabled      bool    `json:"helm_values_enabled"`
-	EnvGroupEnabled        bool    `json:"env_group_enabled"`
 	MultiCluster           bool    `json:"multi_cluster"`
 }
 
@@ -26,7 +25,6 @@ type FeatureFlags struct {
 	SimplifiedViewEnabled      string `json:"simplified_view_enabled,omitempty"`
 	AzureEnabled               bool   `json:"azure_enabled,omitempty"`
 	HelmValuesEnabled          bool   `json:"helm_values_enabled,omitempty"`
-	EnvGroupEnabled            bool   `json:"env_group_enabled,omitempty"`
 	MultiCluster               bool   `json:"multi_cluster,omitempty"`
 }
 

dashboard/src/main/home/app-dashboard/expanded-app/env-vars/EnvVariablesTab.tsx

@@ -109,52 +109,52 @@ export const EnvVariablesTab: React.FC<EnvVariablesTabProps> = ({
         fileUpload={true}
         syncedEnvGroups={syncedEnvGroups}
       />
-      {currentProject.env_group_enabled && (
-        <>
-          <TooltipWrapper
-            onMouseOver={() => setHovered(true)}
-            onMouseOut={() => setHovered(false)}>
-            <LoadButton
-              disabled={maxEnvGroupsReached}
-              onClick={() => !maxEnvGroupsReached && setShowEnvModal(true)}
-            >
-              <img src={sliders} /> Load from Env Group
-            </LoadButton>
-            <TooltipText visible={maxEnvGroupsReached && hovered}>Max 4 Env Groups allowed</TooltipText>
-          </TooltipWrapper>
 
-          {showEnvModal && <EnvGroupModal
-            setValues={(x: any) => {
-              if (status !== "") {
-                clearStatus();
-              }
-              setEnvVars(x);
-            }}
-            values={envVars}
-            closeModal={() => setShowEnvModal(false)}
-            syncedEnvGroups={syncedEnvGroups}
-            setSyncedEnvGroups={setSyncedEnvGroups}
-            namespace={appData.chart.namespace}
-          />}
-          {!!syncedEnvGroups?.length && (
-            <>
-              <Spacer y={0.5} />
-              <Text size={16}>Synced environment groups</Text >
-              {syncedEnvGroups?.map((envGroup: any) => {
-                return (
-                  <ExpandableEnvGroup
-                    key={envGroup?.name}
-                    envGroup={envGroup}
-                    onDelete={() => {
-                      deleteEnvGroup(envGroup);
-                    }}
-                  />
-                );
-              })}
-            </>
-          )}
-        </>
-      )}
+      <>
+        <TooltipWrapper
+          onMouseOver={() => setHovered(true)}
+          onMouseOut={() => setHovered(false)}>
+          <LoadButton
+            disabled={maxEnvGroupsReached}
+            onClick={() => !maxEnvGroupsReached && setShowEnvModal(true)}
+          >
+            <img src={sliders} /> Load from Env Group
+          </LoadButton>
+          <TooltipText visible={maxEnvGroupsReached && hovered}>Max 4 Env Groups allowed</TooltipText>
+        </TooltipWrapper>
+
+        {showEnvModal && <EnvGroupModal
+          setValues={(x: any) => {
+            if (status !== "") {
+              clearStatus();
+            }
+            setEnvVars(x);
+          }}
+          values={envVars}
+          closeModal={() => setShowEnvModal(false)}
+          syncedEnvGroups={syncedEnvGroups}
+          setSyncedEnvGroups={setSyncedEnvGroups}
+          namespace={appData.chart.namespace}
+        />}
+        {!!syncedEnvGroups?.length && (
+          <>
+            <Spacer y={0.5} />
+            <Text size={16}>Synced environment groups</Text >
+            {syncedEnvGroups?.map((envGroup: any) => {
+              return (
+                <ExpandableEnvGroup
+                  key={envGroup?.name}
+                  envGroup={envGroup}
+                  onDelete={() => {
+                    deleteEnvGroup(envGroup);
+                  }}
+                />
+              );
+            })}
+          </>
+        )}
+      </>
+
 
       <Spacer y={0.5} />
       <Button

dashboard/src/main/home/app-dashboard/new-app-flow/NewAppFlow.tsx

@@ -519,50 +519,50 @@ const NewAppFlow: React.FC<Props> = ({ ...props }) => {
                   fileUpload={true}
                   syncedEnvGroups={syncedEnvGroups}
                 />
-                {currentProject?.env_group_enabled && (
-                  <>
-                    <TooltipWrapper
-                      onMouseOver={() => setHovered(true)}
-                      onMouseOut={() => setHovered(false)}>
-                      <LoadButton
-                        disabled={maxEnvGroupsReached}
-                        onClick={() => !maxEnvGroupsReached && setShowEnvModal(true)}
-                      >
-                        <img src={sliders} /> Load from Env Group
-                      </LoadButton>
-                      <TooltipText visible={maxEnvGroupsReached && hovered}>Max 4 Env Groups allowed</TooltipText>
-                    </TooltipWrapper>
-
-                    {showEnvModal && <EnvGroupModal
-                      setValues={(x: any) => {
-                        setFormState({ ...formState, envVariables: x });
-                      }}
-                      values={formState.envVariables}
-                      closeModal={() => setShowEnvModal(false)}
-                      syncedEnvGroups={syncedEnvGroups}
-                      setSyncedEnvGroups={setSyncedEnvGroups}
-                      namespace={"porter-stack-" + porterApp.name}
-                      newApp={true}
-                    />}
-                    {!!syncedEnvGroups?.length && (
-                      <>
-                        <Spacer y={0.5} />
-                        <Text size={16}>Synced environment groups</Text >
-                        {syncedEnvGroups?.map((envGroup: any) => {
-                          return (
-                            <ExpandableEnvGroup
-                              key={envGroup?.name}
-                              envGroup={envGroup}
-                              onDelete={() => {
-                                deleteEnvGroup(envGroup);
-                              }}
-                            />
-                          );
-                        })}
-                      </>
-                    )}
-                  </>
-                )}
+
+                <>
+                  <TooltipWrapper
+                    onMouseOver={() => setHovered(true)}
+                    onMouseOut={() => setHovered(false)}>
+                    <LoadButton
+                      disabled={maxEnvGroupsReached}
+                      onClick={() => !maxEnvGroupsReached && setShowEnvModal(true)}
+                    >
+                      <img src={sliders} /> Load from Env Group
+                    </LoadButton>
+                    <TooltipText visible={maxEnvGroupsReached && hovered}>Max 4 Env Groups allowed</TooltipText>
+                  </TooltipWrapper>
+
+                  {showEnvModal && <EnvGroupModal
+                    setValues={(x: any) => {
+                      setFormState({ ...formState, envVariables: x });
+                    }}
+                    values={formState.envVariables}
+                    closeModal={() => setShowEnvModal(false)}
+                    syncedEnvGroups={syncedEnvGroups}
+                    setSyncedEnvGroups={setSyncedEnvGroups}
+                    namespace={"porter-stack-" + porterApp.name}
+                    newApp={true}
+                  />}
+                  {!!syncedEnvGroups?.length && (
+                    <>
+                      <Spacer y={0.5} />
+                      <Text size={16}>Synced environment groups</Text >
+                      {syncedEnvGroups?.map((envGroup: any) => {
+                        return (
+                          <ExpandableEnvGroup
+                            key={envGroup?.name}
+                            envGroup={envGroup}
+                            onDelete={() => {
+                              deleteEnvGroup(envGroup);
+                            }}
+                          />
+                        );
+                      })}
+                    </>
+                  )}
+                </>
+
               </>,
               formState.selectedSourceType == "github" &&
               <>

dashboard/src/main/home/sidebar/Sidebar.tsx

@@ -223,16 +223,15 @@ class Sidebar extends Component<PropsType, StateType> {
               <Img src={addOns} />
               Add-ons
             </NavButton>
-            {currentProject.env_group_enabled && <NavButton
+            <NavButton
               path="/env-groups"
               active={
                 window.location.pathname.startsWith("/env-groups")
               }
             >
               <Img src={sliders} />
-
               Env groups
-            </NavButton>}
+            </NavButton>
             {this.props.isAuthorized("settings", "", [
               "get",
               "update",
@@ -278,7 +277,7 @@ class Sidebar extends Component<PropsType, StateType> {
               <Img src={addOns} />
               Add-ons
             </NavButton>
-            {currentProject.env_group_enabled && <NavButton
+            <NavButton
               path="/env-groups"
               active={
                 window.location.pathname.startsWith("/env-groups")
@@ -286,7 +285,7 @@ class Sidebar extends Component<PropsType, StateType> {
             >
               <Img src={sliders} />
               Env groups
-            </NavButton>}
+            </NavButton>
             {this.props.isAuthorized("settings", "", [
               "get",
               "update",

dashboard/src/shared/types.tsx

@@ -173,6 +173,7 @@ export interface PorterTemplate {
   description: string;
   icon: string;
   repo_url?: string;
+  tags?: string[]
 }
 
 export interface ExpandedPorterTemplate {
@@ -271,7 +272,6 @@ export interface ProjectType {
   simplified_view_enabled: boolean;
   azure_enabled: boolean;
   helm_values_enabled: boolean;
-  env_group_enabled: boolean;
   multi_cluster: boolean;
   roles: {
     id: number;

internal/models/project.go

@@ -67,7 +67,6 @@ type Project struct {
 	SimplifiedViewEnabled  bool
 	AzureEnabled           bool
 	HelmValuesEnabled      bool
-	EnvGroupEnabled        bool
 	MultiCluster           bool `gorm:"default:false"`
 }
 
@@ -92,7 +91,6 @@ func (p *Project) ToProjectType() *types.Project {
 		SimplifiedViewEnabled:  p.SimplifiedViewEnabled,
 		AzureEnabled:           p.AzureEnabled,
 		HelmValuesEnabled:      p.HelmValuesEnabled,
-		EnvGroupEnabled:        p.EnvGroupEnabled,
 		MultiCluster:           p.MultiCluster,
 	}
 }