make checkpoint mandatory

Signed-off-by: Shenoy Pratik <[email protected]>
ps48 · Oct 23, 2023 · 3702e2b · 3702e2b
1 parent 937ff30
commit 3702e2b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 33 deletions.
diff --git a/.../components/acceleration/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap b/.../components/acceleration/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
@@ -734,7 +734,7 @@ Array [
                           class="euiFormLabel euiFormRow__label"
                           for="some_html_id"
                         >
-                          Checkpoint location - optional
+                          Checkpoint location
                         </label>
                       </div>
                       <div
@@ -1986,7 +1986,7 @@ Array [
                             className="euiFormLabel euiFormRow__label"
                             htmlFor="some_html_id"
                           >
-                            Checkpoint location - optional
+                            Checkpoint location
                           </label>
                         </div>
                         <div

diff --git a/public/components/acceleration/create/__tests__/utils.test.tsx b/public/components/acceleration/create/__tests__/utils.test.tsx
@@ -155,46 +155,39 @@ describe('validateIndexName', () => {
 });
 
 describe('validateCheckpointLocation', () => {
-  it('should return an array with an error message when creating a materialized view without a checkpoint location', () => {
-    const materializedError = validateCheckpointLocation('materialized', undefined);
-    expect(materializedError).toEqual([
-      'Checkpoint location is mandatory for materialized view creation',
-    ]);
+  it('should return an array with an error message when using auto refresh without a checkpoint location', () => {
+    const materializedError = validateCheckpointLocation('auto', undefined);
+    expect(materializedError).toEqual(['Checkpoint location is mandatory for auto refresh']);
   });
 
-  it('should return an array with an error message when creating a materialized view without a checkpoint location', () => {
-    const materializedError = validateCheckpointLocation('materialized', '');
-    expect(materializedError).toEqual([
-      'Checkpoint location is mandatory for materialized view creation',
-    ]);
+  it('should return an array with an error message when using auto refresh without a checkpoint location', () => {
+    const materializedError = validateCheckpointLocation('auto', '');
+    expect(materializedError).toEqual(['Checkpoint location is mandatory for auto refresh']);
   });
 
   it('should return an array with an error message when the checkpoint location is not a valid S3 URL', () => {
-    const invalidCheckpoint = validateCheckpointLocation('skipping', 'not_a_valid_s3_url');
+    const invalidCheckpoint = validateCheckpointLocation('auto', 'not_a_valid_s3_url');
     expect(invalidCheckpoint).toEqual(['Enter a valid checkpoint location']);
   });
 
   it('should return an empty array when the checkpoint location is a valid S3 URL', () => {
     const validCheckpoint = validateCheckpointLocation(
-      'covering',
+      'interval',
       's3://valid-s3-bucket/path/to/checkpoint'
     );
     expect(validCheckpoint).toEqual([]);
   });
 
   it('should return an empty array when the checkpoint location is a valid S3A URL', () => {
     const validCheckpoint = validateCheckpointLocation(
-      'skipping',
+      'auto',
       's3a://valid-s3-bucket/path/to/checkpoint'
     );
     expect(validCheckpoint).toEqual([]);
   });
 
-  it('should return an empty array when creating a materialized view with a valid checkpoint location', () => {
-    const validMaterializedCheckpoint = validateCheckpointLocation(
-      'materialized',
-      's3://valid-s3-bucket/path/to/checkpoint'
-    );
+  it('should return an empty array when using manual refresh with no checkpoint location', () => {
+    const validMaterializedCheckpoint = validateCheckpointLocation('manual', '');
     expect(validMaterializedCheckpoint).toEqual([]);
   });
 

diff --git a/public/components/acceleration/create/utils.tsx b/public/components/acceleration/create/utils.tsx
@@ -9,6 +9,7 @@ import {
 } from '../../../../common/constants';
 import {
   AccelerationIndexType,
+  AccelerationRefreshType,
   CreateAccelerationForm,
   FormErrorsType,
   SkippingIndexRowType,
@@ -56,11 +57,11 @@ export const validateIndexName = (value: string) => {
 };
 
 export const validateCheckpointLocation = (
-  accelerationIndexType: AccelerationIndexType,
+  refreshType: AccelerationRefreshType,
   checkpointLocation: string | undefined
 ) => {
-  if (accelerationIndexType === 'materialized' && !checkpointLocation) {
-    return ['Checkpoint location is mandatory for materialized view creation'];
+  if (refreshType !== 'manual' && !checkpointLocation) {
+    return ['Checkpoint location is mandatory for auto refresh'];
   }
 
   if (checkpointLocation && !ACCELERATION_S3_URL_REGEX.test(checkpointLocation))
@@ -135,7 +136,7 @@ export const formValidator = (accelerationformData: CreateAccelerationForm) => {
       refreshType,
       refreshIntervalOptions.refreshWindow
     ),
-    checkpointLocationError: validateCheckpointLocation(accelerationIndexType, checkpointLocation),
+    checkpointLocationError: validateCheckpointLocation(refreshType, checkpointLocation),
     indexNameError: validateIndexName(accelerationIndexName),
     skippingIndexError: validateSkippingIndexData(accelerationIndexType, skippingIndexQueryData),
     coveringIndexError: validateCoveringIndexData(accelerationIndexType, coveringIndexQueryData),

diff --git a/...onents/acceleration/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap b/...onents/acceleration/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
@@ -363,7 +363,7 @@ Array [
         className="euiFormLabel euiFormRow__label"
         htmlFor="some_html_id"
       >
-        Checkpoint location - optional
+        Checkpoint location
       </label>
     </div>
     <div
@@ -771,7 +771,7 @@ Array [
         className="euiFormLabel euiFormRow__label"
         htmlFor="some_html_id"
       >
-        Checkpoint location - optional
+        Checkpoint location
       </label>
     </div>
     <div
@@ -1179,7 +1179,7 @@ Array [
         className="euiFormLabel euiFormRow__label"
         htmlFor="some_html_id"
       >
-        Checkpoint location - optional
+        Checkpoint location
       </label>
     </div>
     <div

diff --git a/public/components/acceleration/selectors/index_setting_options.tsx b/public/components/acceleration/selectors/index_setting_options.tsx
@@ -228,11 +228,7 @@ export const IndexSettingOptions = ({
       )}
       {refreshTypeSelected !== manualRefreshId && (
         <EuiFormRow
-          label={
-            accelerationFormData.accelerationIndexType === 'materialized'
-              ? 'Checkpoint location'
-              : 'Checkpoint location - optional'
-          }
+          label="Checkpoint location"
           helpText="The HDFS compatible file system location path for incremental refresh job checkpoint."
           isInvalid={hasError(accelerationFormData.formErrors, 'checkpointLocationError')}
           error={accelerationFormData.formErrors.checkpointLocationError}
@@ -247,7 +243,7 @@ export const IndexSettingOptions = ({
               setAccelerationFormData(
                 producer((accData) => {
                   accData.formErrors.checkpointLocationError = validateCheckpointLocation(
-                    accData.accelerationIndexType,
+                    accData.refreshType,
                     e.target.value
                   );
                 })