remove show nfs file shares feature flag (#7527)

Co-authored-by: Qi Liu <liuqi@microsoft.com>
Azure · Jan 9, 2024 · 9897982 · 9897982
1 parent d5729f0
commit 9897982
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 46 deletions.
diff --git a/client-react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEdit.tsx b/client-react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEdit.tsx
@@ -12,14 +12,13 @@ import { addEditFormStyle, textFieldPrefixStylesOverride } from '../../../../com
 import RadioButton from '../../../../components/form-controls/RadioButton';
 import * as Yup from 'yup';
 import { ValidationRegex } from '../../../../utils/constants/ValidationRegex';
-import { CommonConstants, ExperimentationConstants } from '../../../../utils/CommonConstants';
+import { CommonConstants } from '../../../../utils/CommonConstants';
 import { SiteStateContext } from '../../../../SiteState';
 import { StorageType } from '../../../../models/site/config';
 import { azureStorageTypeLabelStyle, formElementStyle } from '../AppSettings.styles';
 import { isStorageAccessAppSetting } from '../AppSettingsFormData';
 import { Links } from '../../../../utils/FwLinks';
 import { InfoTooltip } from '../../../../components/InfoTooltip/InfoTooltip';
-import { PortalContext } from '../../../../PortalContext';
 
 const MountPathValidationRegex = ValidationRegex.StorageMountPath;
 const MountPathExamples = CommonConstants.MountPathValidationExamples;
@@ -36,7 +35,6 @@ export interface AzureStorageMountsAddEditProps {
 
 export interface AzureStorageMountsAddEditConfigurationOptionsProps {
   storageTypeOptions: IChoiceGroupOption[];
-  showNFSFileShares?: boolean;
   fileShareInfoBubbleMessage?: string;
 }
 
@@ -312,9 +310,6 @@ type AzureStorageMountsAddEdtSubFormProps = FormikProps<FormAzureStorageMounts>
 const AzureStorageMountsAddEditSubForm: React.FC<AzureStorageMountsAddEdtSubFormProps> = props => {
   const { t } = useTranslation();
   const { isLinuxApp } = useContext(SiteStateContext);
-  const portalContext = useContext(PortalContext);
-
-  const [showNFSFileShares, setShowNFSFileShares] = React.useState<boolean>();
 
   const storageTypeOptions = React.useMemo<IChoiceGroupOption[]>(() => {
     return [
@@ -350,41 +345,24 @@ const AzureStorageMountsAddEditSubForm: React.FC<AzureStorageMountsAddEdtSubForm
   }, []);
 
   const fileShareInfoBubbleMessage = React.useMemo(() => {
-    return props.values.type === StorageType.azureFiles && (!isLinuxApp || !showNFSFileShares)
-      ? t('shareNameInfoBubbleMessage')
-      : undefined;
+    return props.values.type === StorageType.azureFiles && !isLinuxApp ? t('shareNameInfoBubbleMessage') : undefined;
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.values.type, isLinuxApp, showNFSFileShares]);
-
-  useEffect(() => {
-    let isSubscribed = true;
-    portalContext.getBooleanFlight(ExperimentationConstants.VariableNames.showNFSFileShares).then(enabled => {
-      if (isSubscribed) {
-        setShowNFSFileShares(enabled);
-      }
-    });
-
-    return () => {
-      isSubscribed = false;
-    };
-  }, [portalContext]);
+  }, [props.values.type, isLinuxApp]);
 
   return (
     <>
       {props.values.configurationOption === ConfigurationOption.Basic && (
         <AzureStorageMountsAddEditBasic
           {...props}
           storageTypeOptions={storageTypeOptions}
-          showNFSFileShares={showNFSFileShares}
           fileShareInfoBubbleMessage={fileShareInfoBubbleMessage}
         />
       )}
       {props.values.configurationOption === ConfigurationOption.Advanced && (
         <AzureStorageMountsAddEditAdvanced
           {...props}
           storageTypeOptions={storageTypeOptions}
-          showNFSFileShares={showNFSFileShares}
           fileShareInfoBubbleMessage={fileShareInfoBubbleMessage}
         />
       )}

diff --git a/...react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEditAdvanced.tsx b/...react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEditAdvanced.tsx
@@ -19,7 +19,7 @@ import StorageProtocol from './StorageProtocol';
 const AzureStorageMountsAddEditAdvanced: React.FC<FormikProps<FormAzureStorageMounts> &
   AzureStorageMountsAddEditPropsCombined &
   AzureStorageMountsAddEditConfigurationOptionsProps> = props => {
-  const { values, fileShareInfoBubbleMessage, setFieldValue, validateField, appSettings, storageTypeOptions, showNFSFileShares } = props;
+  const { values, fileShareInfoBubbleMessage, setFieldValue, validateField, appSettings, storageTypeOptions } = props;
   const { t } = useTranslation();
   const site = useContext(SiteContext);
   const scenarioService = new ScenarioService(t);
@@ -96,7 +96,7 @@ const AzureStorageMountsAddEditAdvanced: React.FC<FormikProps<FormAzureStorageMo
       {supportsBlobStorage && (
         <Field component={RadioButton} name="type" id="azure-storage-type" label={t('storageType')} options={storageTypeOptions} />
       )}
-      <StorageProtocol values={values} showNFSFileShares={showNFSFileShares} />
+      <StorageProtocol values={values} />
       <Field
         component={TextField}
         name="shareName"

diff --git a/...nt-react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEditBasic.tsx b/...nt-react/src/pages/app/app-settings/AzureStorageMounts/AzureStorageMountsAddEditBasic.tsx
@@ -45,16 +45,7 @@ const initializeStorageContainerErrorSchemaValue = (): StorageContainerErrorSche
 const AzureStorageMountsAddEditBasic: React.FC<FormikProps<FormAzureStorageMounts> &
   AzureStorageMountsAddEditPropsCombined &
   AzureStorageMountsAddEditConfigurationOptionsProps> = props => {
-  const {
-    values,
-    initialValues,
-    fileShareInfoBubbleMessage,
-    setValues,
-    setFieldValue,
-    validateForm,
-    storageTypeOptions,
-    showNFSFileShares,
-  } = props;
+  const { values, initialValues, fileShareInfoBubbleMessage, setValues, setFieldValue, validateForm, storageTypeOptions } = props;
   const [accountSMBSharesFiles, setAccountSMBSharesFiles] = useState<any[]>([]);
   const [accountNFSSharesFiles, setAccountNFSSharesFiles] = useState<any[]>([]);
   const [accountSharesBlob, setAccountSharesBlob] = useState([]);
@@ -294,7 +285,7 @@ const AzureStorageMountsAddEditBasic: React.FC<FormikProps<FormAzureStorageMount
       {showStorageTypeOption && (
         <Field component={RadioButton} name="type" id="azure-storage-type" label={t('storageType')} options={storageTypeOptions} />
       )}
-      <StorageProtocol values={values} showNFSFileShares={showNFSFileShares} />
+      <StorageProtocol values={values} />
       <Field
         component={ComboBox}
         name="shareName"

diff --git a/client-react/src/pages/app/app-settings/AzureStorageMounts/StorageProtocol.tsx b/client-react/src/pages/app/app-settings/AzureStorageMounts/StorageProtocol.tsx
@@ -10,14 +10,14 @@ import { MessageBarType } from '@fluentui/react';
 import { style } from 'typestyle';
 import { useTranslation } from 'react-i18next';
 
-const StorageProtocol: React.FC<{ values: FormAzureStorageMounts; showNFSFileShares?: boolean }> = props => {
-  const { values, showNFSFileShares } = props;
+const StorageProtocol: React.FC<{ values: FormAzureStorageMounts }> = props => {
+  const { values } = props;
   const { isLinuxApp } = React.useContext(SiteStateContext);
   const { t } = useTranslation();
 
   const showFileSharesProtocolOptions = React.useMemo(() => {
-    return values.type === StorageType.azureFiles && isLinuxApp && showNFSFileShares;
-  }, [values.type, isLinuxApp, showNFSFileShares]);
+    return values.type === StorageType.azureFiles && isLinuxApp;
+  }, [values.type, isLinuxApp]);
 
   const showCustomBanner = React.useMemo(() => {
     return values.protocol.toLocaleLowerCase() === StorageFileShareProtocol.NFS.toLocaleLowerCase();

diff --git a/client-react/src/utils/CommonConstants.ts b/client-react/src/utils/CommonConstants.ts
@@ -383,10 +383,6 @@ export class ExperimentationConstants {
     portalCallOnEditor: 'disable-portal-call-editor',
     patchCallOnConfig: 'disable-patch-call-config',
   };
-
-  public static VariableNames = {
-    showNFSFileShares: 'show-nfs-file-shares',
-  };
 }
 
 export class Monitoring {