Merge pull request #2593 from devtron-labs/refactor/plugin-policy-v1

refactor: remove plugin policy v1 code and theming feature flag

Author: eshankvaish

.env

@@ -51,7 +51,6 @@ FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE=false
 HIDE_NETWORK_STATUS_INTERFACE=true
 SYSTEM_CONTROLLER_LISTING_TIMEOUT=300000
 FEATURE_IMAGE_PROMOTION_ENABLE=false
-FEATURE_CD_MANDATORY_PLUGINS_ENABLE=true
 FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS=false
 FEATURE_CONFIG_DRIFT_ENABLE=false
 FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
@@ -66,5 +65,4 @@ FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
 FEATURE_CODE_MIRROR_ENABLE=false
-FEATURE_EXPERIMENTAL_THEMING_ENABLE=true
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false

.storybook/preview.tsx

@@ -38,9 +38,7 @@ const preview: Preview = {
     },
     decorators: (Story) => {
         if (!window._env_) {
-            window._env_ = {
-                FEATURE_EXPERIMENTAL_THEMING_ENABLE: true,
-            } as customEnv
+            window._env_ = {} as customEnv
         }
 
         return (

config.md

@@ -48,6 +48,5 @@
 | TRIGGER_API_TIMEOUT                          | 60000      | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD                   |
 | FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS | "true" | Would hide the user direct permissions for non-super admin users in User Permissions |
 | FEATURE_ACTION_AUDIOS_ENABLE                 | true         | Would enable audios in dashboard   |
-| FEATURE_EXPERIMENTAL_THEMING_ENABLE                       | true         | Would enable theming in dashboard   |
 
 # DASHBOARD CONFIG SECRET

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.10.3",
+        "@devtron-labs/devtron-fe-common-lib": "1.10.4",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/Shared/SwitchThemeDialog/SwitchThemeDialog.component.tsx

@@ -203,7 +203,6 @@ const SwitchThemeDialog = ({
                 },
             }}
             isLandscapeView
-            showConfetti={!initialThemePreference}
         >
             <div className="dc__grid dc__column-gap-16 theme-preference-option__container">
                 {THEME_PREFERENCE_OPTION_LIST.map((value) => (

src/components/common/helpers/Helpers.tsx

@@ -1161,11 +1161,7 @@ export const getParsedBranchValuesForPlugin = (branchName: string): string => {
         return ''
     }
 
-    if (window._env_.FEATURE_CD_MANDATORY_PLUGINS_ENABLE) {
-        return `[${branchName}]`
-    }
-
-    return branchName
+    return `[${branchName}]`
 }
 
 export const getAppFilterLocalStorageKey = (filterParentType: FilterParentType): AppEnvLocalStorageKeyType =>

src/components/common/navigation/NavigationRoutes.tsx

@@ -354,7 +354,7 @@ export default function NavigationRoutes() {
     }
 
     const handleInitializeUserPreferencesFromResponse = (userPreferencesResponse: UserPreferencesType) => {
-        if (window._env_.FEATURE_EXPERIMENTAL_THEMING_ENABLE && !userPreferencesResponse?.themePreference) {
+        if (!userPreferencesResponse?.themePreference) {
             handleThemeSwitcherDialogVisibilityChange(true)
         } else if (userPreferencesResponse?.themePreference) {
             handleThemePreferenceChange(userPreferencesResponse?.themePreference)
@@ -507,7 +507,7 @@ export default function NavigationRoutes() {
             }}
         >
             <main className={_isOnboardingPage ? 'no-nav' : ''} id={DEVTRON_BASE_MAIN_ID}>
-                {window._env_.FEATURE_EXPERIMENTAL_THEMING_ENABLE && showThemeSwitcherDialog && (
+                {showThemeSwitcherDialog && (
                     <SwitchThemeDialog
                         initialThemePreference={userPreferences?.themePreference}
                         handleClose={handleCloseSwitchThemeDialog}

src/components/globalConfigurations/GlobalConfiguration.tsx

@@ -64,7 +64,6 @@ const ScopedVariables = lazy(() => import('../scopedVariables/ScopedVariables'))
 // NOTE: Might import from index itself
 const BuildInfra = lazy(() => import('../../Pages/GlobalConfigurations/BuildInfra/BuildInfra'))
 const TagListContainer = importComponentFromFELibrary('TagListContainer')
-const PluginsPolicyV1 = importComponentFromFELibrary('PluginsPolicyV1')
 const PluginsPolicy = importComponentFromFELibrary('PluginsPolicy', null, 'function')
 const FilterConditions = importComponentFromFELibrary('FilterConditions')
 const LockDeploymentConfiguration = importComponentFromFELibrary('LockDeploymentConfiguration', null, 'function')
@@ -764,17 +763,11 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
                         <ImagePromotion isSuperAdmin={isSuperAdmin} />
                     </Route>
                 ),
-                window._env_.FEATURE_CD_MANDATORY_PLUGINS_ENABLE
-                    ? PluginsPolicy && (
-                          <Route path={URLS.GLOBAL_CONFIG_PLUGIN_POLICY}>
-                              <PluginsPolicy OfflinePipelineModalAppView={OffendingPipelineModalAppView} />
-                          </Route>
-                      )
-                    : PluginsPolicyV1 && (
-                          <Route path={URLS.GLOBAL_CONFIG_PLUGIN_POLICY}>
-                              <PluginsPolicyV1 />
-                          </Route>
-                      ),
+                PluginsPolicy && (
+                    <Route path={URLS.GLOBAL_CONFIG_PLUGIN_POLICY}>
+                        <PluginsPolicy OfflinePipelineModalAppView={OffendingPipelineModalAppView} />
+                    </Route>
+                ),
                 PullImageDigest && (
                     <Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
                         <PullImageDigest isSuperAdmin={isSuperAdmin} />
@@ -799,7 +792,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
                     <Route path={CommonURLS.GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}>
                         <DevtronAppTemplates AppConfig={AppConfig} />
                     </Route>
-                )
+                ),
             ]}
             <Redirect to={defaultRoute()} />
         </Switch>

src/components/login/Login.tsx

@@ -125,7 +125,7 @@ const Login = () => {
             {loginList
                 .filter((sso) => sso.active)
                 .map((item) => (
-                    <div className="login-button">
+                    <div className="login-button" key={item.name}>
                         <Button
                             variant={ButtonVariantType.secondary}
                             text={`Login with ${item.name}`}

src/index.tsx

@@ -155,7 +155,6 @@ if (!window || !window._env_) {
         HIDE_NETWORK_STATUS_INTERFACE: true,
         SYSTEM_CONTROLLER_LISTING_TIMEOUT: 60000 * 5,
         FEATURE_IMAGE_PROMOTION_ENABLE: false,
-        FEATURE_CD_MANDATORY_PLUGINS_ENABLE: true,
         FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS: false,
         FEATURE_CONFIG_DRIFT_ENABLE: false,
         FEATURE_PROMO_EMBEDDED_BUTTON_TEXT: '',
@@ -168,7 +167,6 @@ if (!window || !window._env_) {
         FEATURE_DEFAULT_LANDING_RB_ENABLE: false,
         FEATURE_CLUSTER_MAP_ENABLE: true,
         FEATURE_ACTION_AUDIOS_ENABLE: true,
-        FEATURE_EXPERIMENTAL_THEMING_ENABLE: import.meta.env.DEV,
         FEATURE_APPLICATION_TEMPLATES_ENABLE: true,
         FEATURE_CODE_MIRROR_ENABLE: true,
         FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE: false,