Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SWA Configuration] Removing configuration experimentation #7818

Merged
merged 4 commits into from
Sep 19, 2024
Merged

[SWA Configuration] Removing configuration experimentation #7818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe43404
removing configuration experimentation
valentina-vallalta Sep 16, 2024
444fc72
removing app settings and general settings code
valentina-vallalta Sep 16, 2024
262a23c
removing pivot file
valentina-vallalta Sep 19, 2024
cdcff79
Merge branch 'dev' into vvallalta/remove-configuration-experimentation
valentina-vallalta Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions client-react/src/pages/static-app/configuration/Configuration.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ export interface ConfigurationFormProps {
refresh: (currentEnvironment?: ArmObj<Environment>) => Promise<void>;
selectedEnvironmentVariableResponse?: ArmObj<KeyValue<string>>;
staticSiteSku: StaticSiteSku;
showNewConfiguration: boolean;
formData?: ConfigurationFormData;
location?: string;
}
Expand All @@ -176,8 +175,6 @@ export interface ConfigurationPivotProps {
selectedEnvironmentVariableResponse?: ArmObj<KeyValue<string>>;
staticSiteSku: StaticSiteSku;
refresh: (currentEnvironment?: ArmObj<Environment>) => Promise<void>;
showAppSettings: boolean;
showNewConfiguration: boolean;
}

export enum StaticSiteSku {
Expand Down
9 changes: 0 additions & 9 deletions client-react/src/pages/static-app/configuration/ConfigurationDataLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { PortalContext } from '../../../PortalContext';
import { ArmObj } from '../../../models/arm-obj';
import { KeyValue } from '../../../models/portal-models';
import { Environment } from '../../../models/static-site/environment';
import { ExperimentationConstants } from '../../../utils/CommonConstants';
import { LogCategories } from '../../../utils/LogCategories';
import { usePortalLogging } from '../../../utils/hooks/usePortalLogging';
import RbacConstants from '../../../utils/rbac-constants';
Expand Down Expand Up @@ -44,7 +43,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
const [codeFormValidationSchema, setCodeFormValidationSchema] = useState<ConfigurationYupValidationSchemaType>();
const [staticSiteSku, setStaticSiteSku] = useState(StaticSiteSku.Standard);
const [location, setLocation] = useState<string>();
const [showNewConfiguration, setShowNewConfiguration] = useState(false);

const portalContext = useContext(PortalContext);
const { t } = useTranslation();
Expand Down Expand Up @@ -229,12 +227,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
[fetchData]
);

useEffect(() => {
portalContext
.getBooleanFlight(ExperimentationConstants.TreatmentFlight.swaConfigurationNew)
.then((isEnabled: boolean) => setShowNewConfiguration(isEnabled));
}, [portalContext]);

useEffect(() => {
fetchData();

Expand All @@ -259,7 +251,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
selectedEnvironmentVariableResponse={selectedEnvironmentVariableResponse}
staticSiteSku={staticSiteSku}
validationSchema={codeFormValidationSchema}
showNewConfiguration={showNewConfiguration}
/>
</ConfigurationContext.Provider>
);
Expand Down
15 changes: 7 additions & 8 deletions client-react/src/pages/static-app/configuration/ConfigurationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
StagingEnvironmentPolicyTypes,
} from './Configuration.types';
import ConfigurationCommandBar from './ConfigurationCommandBar';
import ConfigurationPivot from './ConfigurationPivot';
import ConfigurationSnippets from './ConfigurationSnippets';

const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: ConfigurationFormProps) => {
const {
Expand All @@ -36,7 +36,6 @@ const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: Configuratio
resourceId,
selectedEnvironmentVariableResponse,
validationSchema,
showNewConfiguration,
} = props;

const [isDiscardConfirmDialogVisible, setIsDiscardConfirmDialogVisible] = useState(false);
Expand Down Expand Up @@ -317,13 +316,13 @@ const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: Configuratio
</>
</div>
<div>
<ConfigurationPivot
{...props}
refresh={props.refresh}
isLoading={isLoading || formProps.isSubmitting}
<ConfigurationSnippets
hasWritePermissions={hasWritePermissions}
refresh={refresh}
disabled={isLoading || !hasWritePermissions || formProps.isSubmitting}
formProps={formProps}
showAppSettings={false}
showNewConfiguration={showNewConfiguration}
isLoading={isLoading}
resourceId={resourceId}
/>
</div>
</div>
Expand Down
106 changes: 0 additions & 106 deletions client-react/src/pages/static-app/configuration/ConfigurationPivot.tsx
View file
Open in desktop

This file was deleted.

Loading