Rename flag to mlUpgradeModeEnabled

elastic · Sep 20, 2021 · 92e5d6a · 92e5d6a
1 parent 824e900
commit 92e5d6a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/...stant/__jest__/client_integration/es_deprecations/ml_snapshots_deprecation_flyout.test.ts b/...stant/__jest__/client_integration/es_deprecations/ml_snapshots_deprecation_flyout.test.ts
@@ -23,7 +23,7 @@ describe('Machine learning deprecation flyout', () => {
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setLoadEsDeprecationsResponse(esDeprecationsMockResponse);
-    httpRequestsMockHelpers.setLoadMlUpgradeModeResponse({ mlUpgradeMode: false });
+    httpRequestsMockHelpers.setLoadMlUpgradeModeResponse({ mlUpgradeModeEnabled: false });
     httpRequestsMockHelpers.setUpgradeMlSnapshotStatusResponse({
       nodeId: 'my_node',
       snapshotId: MOCK_SNAPSHOT_ID,
@@ -134,7 +134,7 @@ describe('Machine learning deprecation flyout', () => {
     });
 
     it('Doesnt allow to take actions if ml_upgrade_mode is enabled', async () => {
-      httpRequestsMockHelpers.setLoadMlUpgradeModeResponse({ mlUpgradeMode: true });
+      httpRequestsMockHelpers.setLoadMlUpgradeModeResponse({ mlUpgradeModeEnabled: true });
 
       await act(async () => {
         testBed = await setupElasticsearchPage({ isReadOnlyMode: false });

diff --git a/.../public/application/components/es_deprecations/deprecation_types/ml_snapshots/context.tsx b/.../public/application/components/es_deprecations/deprecation_types/ml_snapshots/context.tsx
@@ -12,7 +12,7 @@ import { useSnapshotState, SnapshotState } from './use_snapshot_state';
 
 export interface MlSnapshotContext {
   snapshotState: SnapshotState;
-  mlUpgradeMode: boolean;
+  mlUpgradeModeEnabled: boolean;
   upgradeSnapshot: () => Promise<void>;
   deleteSnapshot: () => Promise<void>;
 }
@@ -32,14 +32,14 @@ interface Props {
   children: React.ReactNode;
   snapshotId: string;
   jobId: string;
-  mlUpgradeMode: boolean;
+  mlUpgradeModeEnabled: boolean;
 }
 
 export const MlSnapshotsStatusProvider: React.FunctionComponent<Props> = ({
   api,
   snapshotId,
   jobId,
-  mlUpgradeMode,
+  mlUpgradeModeEnabled,
   children,
 }) => {
   const { updateSnapshotStatus, snapshotState, upgradeSnapshot, deleteSnapshot } = useSnapshotState(
@@ -60,7 +60,7 @@ export const MlSnapshotsStatusProvider: React.FunctionComponent<Props> = ({
         snapshotState,
         upgradeSnapshot,
         deleteSnapshot,
-        mlUpgradeMode,
+        mlUpgradeModeEnabled,
       }}
     >
       {children}

diff --git a/...t/public/application/components/es_deprecations/deprecation_types/ml_snapshots/flyout.tsx b/...t/public/application/components/es_deprecations/deprecation_types/ml_snapshots/flyout.tsx
@@ -160,7 +160,7 @@ export const FixSnapshotsFlyout = ({
   snapshotState,
   upgradeSnapshot,
   deleteSnapshot,
-  mlUpgradeMode,
+  mlUpgradeModeEnabled,
 }: FixSnapshotsFlyoutProps) => {
   const {
     services: {
@@ -207,7 +207,7 @@ export const FixSnapshotsFlyout = ({
           </>
         )}
 
-        {mlUpgradeMode && (
+        {mlUpgradeModeEnabled && (
           <>
             <EuiCallOut
               title={i18nTexts.upgradeModeEnabledErrorTitle}
@@ -240,7 +240,7 @@ export const FixSnapshotsFlyout = ({
             </EuiButtonEmpty>
           </EuiFlexItem>
 
-          {!isResolved && !mlUpgradeMode && (
+          {!isResolved && !mlUpgradeModeEnabled && (
             <EuiFlexItem grow={false}>
               <EuiFlexGroup>
                 <EuiFlexItem>

diff --git a/...ublic/application/components/es_deprecations/deprecation_types/ml_snapshots/table_row.tsx b/...ublic/application/components/es_deprecations/deprecation_types/ml_snapshots/table_row.tsx
@@ -21,7 +21,7 @@ const { useGlobalFlyout } = GlobalFlyout;
 interface TableRowProps {
   deprecation: EnrichedDeprecationInfo;
   rowFieldNames: DeprecationTableColumns[];
-  mlUpgradeMode: boolean;
+  mlUpgradeModeEnabled: boolean;
 }
 
 export const MlSnapshotsTableRowCells: React.FunctionComponent<TableRowProps> = ({
@@ -86,7 +86,7 @@ export const MlSnapshotsTableRow: React.FunctionComponent<TableRowProps> = (prop
     <MlSnapshotsStatusProvider
       snapshotId={(props.deprecation.correctiveAction as MlAction).snapshotId}
       jobId={(props.deprecation.correctiveAction as MlAction).jobId}
-      mlUpgradeMode={props.mlUpgradeMode}
+      mlUpgradeModeEnabled={props.mlUpgradeModeEnabled}
       api={api}
     >
       <MlSnapshotsTableRowCells {...props} />

diff --git a/...upgrade_assistant/public/application/components/es_deprecations/es_deprecations_table.tsx b/...upgrade_assistant/public/application/components/es_deprecations/es_deprecations_table.tsx
@@ -102,14 +102,17 @@ const cellToLabelMap = {
 const cellTypes = Object.keys(cellToLabelMap) as DeprecationTableColumns[];
 const pageSizeOptions = PAGINATION_CONFIG.pageSizeOptions;
 
-const renderTableRowCells = (deprecation: EnrichedDeprecationInfo, mlUpgradeMode: boolean) => {
+const renderTableRowCells = (
+  deprecation: EnrichedDeprecationInfo,
+  mlUpgradeModeEnabled: boolean
+) => {
   switch (deprecation.correctiveAction?.type) {
     case 'mlSnapshot':
       return (
         <MlSnapshotsTableRow
           deprecation={deprecation}
           rowFieldNames={cellTypes}
-          mlUpgradeMode={mlUpgradeMode}
+          mlUpgradeModeEnabled={mlUpgradeModeEnabled}
         />
       );
 
@@ -158,7 +161,7 @@ export const EsDeprecationsTable: React.FunctionComponent<Props> = ({
   } = useAppContext();
 
   const { data } = api.useLoadMLUpgradeMode();
-  const mlUpgradeMode = !!data?.mlUpgradeMode;
+  const mlUpgradeModeEnabled = !!data?.mlUpgradeModeEnabled;
 
   const [sortConfig, setSortConfig] = useState<SortConfig>({
     isSortAscending: true,
@@ -305,7 +308,7 @@ export const EsDeprecationsTable: React.FunctionComponent<Props> = ({
             {visibleDeprecations.map((deprecation, index) => {
               return (
                 <EuiTableRow data-test-subj="deprecationTableRow" key={`deprecation-row-${index}`}>
-                  {renderTableRowCells(deprecation, mlUpgradeMode)}
+                  {renderTableRowCells(deprecation, mlUpgradeModeEnabled)}
                 </EuiTableRow>
               );
             })}

diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
@@ -183,7 +183,7 @@ export class ApiService {
 
   public useLoadMLUpgradeMode() {
     return this.useRequest<{
-      mlUpgradeMode: boolean;
+      mlUpgradeModeEnabled: boolean;
     }>({
       path: `${API_BASE_PATH}/ml_upgrade_mode`,
       method: 'get',

diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
@@ -192,7 +192,7 @@ describe('ML snapshots APIs', () => {
 
       expect(resp.status).toEqual(200);
       expect(resp.payload).toEqual({
-        mlUpgradeMode: true,
+        mlUpgradeModeEnabled: true,
       });
     });
   });

diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
@@ -321,7 +321,7 @@ export function registerMlSnapshotRoutes({ router, lib: { handleEsError } }: Rou
 
           return response.ok({
             body: {
-              mlUpgradeMode: mlInfo.upgrade_mode,
+              mlUpgradeModeEnabled: mlInfo.upgrade_mode,
             },
           });
         } catch (e) {