fix flag archive and reset sampling

Author: bimalgrg519

ui/web-v2/src/components/FeatureConfirmDialog/index.tsx

@@ -268,15 +268,15 @@ export const FeatureConfirmDialog: FC<FeatureConfirmDialogProps> = ({
   //   });
   // };
 
-  const checkSubmitBtnDisabled = () => {
-    // if (
-    //   // selectedSwitchEnabledType === SwitchEnabledType.SCHEDULE &&
-    //   saveFeatureType === SaveFeatureType.SCHEDULE &&
-    //   !scheduleErrorMessage
-    // ) {
-    //   return false;
-    // }
-  };
+  // const checkSubmitBtnDisabled = () => {
+  // if (
+  //   // selectedSwitchEnabledType === SwitchEnabledType.SCHEDULE &&
+  //   saveFeatureType === SaveFeatureType.SCHEDULE &&
+  //   !scheduleErrorMessage
+  // ) {
+  //   return false;
+  // }
+  // };
 
   return (
     <Modal
@@ -293,7 +293,7 @@ export const FeatureConfirmDialog: FC<FeatureConfirmDialogProps> = ({
       <div className="mt-2">
         <p className="text-sm text-gray-500">{description}</p>
       </div>
-      {flagList.length > 0 && (
+      {flagList.length > 0 && !feature?.archived && (
         <div className="rounded-md bg-red-50 p-4 mt-4">
           <div className="flex">
             <div className="flex-shrink-0">
@@ -366,7 +366,7 @@ export const FeatureConfirmDialog: FC<FeatureConfirmDialogProps> = ({
             id="comment"
             rows={3}
             className="input-text w-full"
-            disabled={flagList.length > 0}
+            disabled={flagList.length > 0 && !feature?.archived}
           />
           <p className="input-error">
             {errors.comment && (
@@ -536,7 +536,8 @@ export const FeatureConfirmDialog: FC<FeatureConfirmDialogProps> = ({
             </div>
           )
       }
-      {!isArchive && (
+      {/* {!isArchive && ( */}
+      {flagList.length > 0 && !feature?.archived ? null : (
         <div className="mt-4 space-y-2">
           <div className="flex items-center space-x-2">
             <input

ui/web-v2/src/components/FeatureTargetingForm/index.tsx

@@ -211,7 +211,12 @@ export const FeatureTargetingForm: FC<FeatureTargetingFormProps> = memo(
                 </div>
                 <div className="flex items-center text-primary border-r border-gray-300 px-4 space-x-2">
                   <PencilIcon className="w-4 h-4" />
-                  <button className="text-sm font-normal">Edit Schedule</button>
+                  <button
+                    className="text-sm font-normal"
+                    onClick={onOpenConfirmDialog}
+                  >
+                    Edit Schedule
+                  </button>
                 </div>
                 <div className="flex items-center text-primary border-r border-gray-300 px-4 space-x-2">
                   <EyeIcon className="w-5 h-5" />

ui/web-v2/src/modules/features.ts

@@ -26,7 +26,7 @@ import {
   UnarchiveFeatureCommand,
   Command
 } from '../proto/feature/command_pb';
-import { Feature, StringListValue } from '../proto/feature/feature_pb';
+import { Feature } from '../proto/feature/feature_pb';
 import {
   ArchiveFeatureRequest,
   CreateFeatureRequest,
@@ -58,6 +58,7 @@ import {
   RolloutStrategy,
   Strategy
 } from '../proto/feature/strategy_pb';
+import { StringListValue } from '../proto/common/string_pb';
 
 const MODULE_NAME = 'features';
 
@@ -331,6 +332,8 @@ export interface UpdateFeatureParams {
   name?: string;
   description?: string;
   tags?: string[];
+  archived?: boolean;
+  resetSampling?: boolean;
 }
 
 export const updateFeature = createAsyncThunk<
@@ -395,6 +398,18 @@ export const updateFeature = createAsyncThunk<
     request.setTags(mapTags(params.tags));
   }
 
+  if (params.archived !== undefined) {
+    console.log('archived set');
+    request.setArchived(new BoolValue().setValue(params.archived));
+  }
+
+  if (params.resetSampling) {
+    console.log('resetSampling set');
+    request.setResetSamplingSeed(
+      new BoolValue().setValue(params.resetSampling)
+    );
+  }
+
   await featureGrpc.updateFeature(request);
 });
 

ui/web-v2/src/pages/feature/index.tsx

@@ -470,9 +470,28 @@ export const FeatureIndexPage: FC = memo(() => {
   );
 
   const handleArchive = useCallback(
-    async (data) => {
-      dispatch(
-        data.feature.archived
+    async (data, saveFeatureType) => {
+      const handleDispatch = async (action) => {
+        await dispatch(action);
+        archiveReset();
+        setIsArchiveConfirmDialogOpen(false);
+        history.replace(
+          `${PAGE_PATH_ROOT}${currentEnvironment.urlCode}${PAGE_PATH_FEATURES}`
+        );
+        updateFeatureList(null, 1);
+      };
+
+      if (saveFeatureType === SaveFeatureType.SCHEDULE) {
+        handleDispatch(
+          updateFeature({
+            environmentId: currentEnvironment.id,
+            id: data.feature.id,
+            comment: data.comment,
+            archived: !data.feature.archived
+          })
+        );
+      } else {
+        const action = data.feature.archived
           ? unarchiveFeature({
               environmentId: currentEnvironment.id,
               id: data.feature.id,
@@ -482,15 +501,10 @@ export const FeatureIndexPage: FC = memo(() => {
               environmentId: currentEnvironment.id,
               id: data.feature.id,
               comment: data.comment
-            })
-      ).then(() => {
-        archiveReset();
-        setIsArchiveConfirmDialogOpen(false);
-        history.replace(
-          `${PAGE_PATH_ROOT}${currentEnvironment.urlCode}${PAGE_PATH_FEATURES}`
-        );
-        updateFeatureList(null, 1);
-      });
+            });
+
+        handleDispatch(action);
+      }
     },
     [dispatch, archiveReset, setIsArchiveConfirmDialogOpen]
   );
@@ -620,8 +634,8 @@ export const FeatureIndexPage: FC = memo(() => {
             featureId={archiveMethod.getValues().feature?.id}
             feature={archiveMethod.getValues().feature}
             open={isArchiveConfirmDialogOpen}
-            handleSubmit={() => {
-              archiveHandleSubmit(handleArchive)();
+            handleSubmit={(arg) => {
+              archiveHandleSubmit((data) => handleArchive(data, arg))();
             }}
             onClose={() => setIsArchiveConfirmDialogOpen(false)}
             title={

ui/web-v2/src/pages/feature/targeting.tsx

@@ -181,26 +181,21 @@ export const FeatureTargetingPage: FC<FeatureTargetingPageProps> = memo(
           field && JSON.stringify(field).includes('true');
 
         if (saveFeatureType === SaveFeatureType.SCHEDULE) {
-          const hasDirtyPrerequisites = dirtyFields.prerequisites?.some(
-            (item) => Object.values(item).includes(true)
-          );
-          const hasDirtyTargets = dirtyFields.targets?.some((item) =>
-            Object.values(item).includes(true)
-          );
-
           const updatePayload = {
             environmentId: currentEnvironment.id,
             id: featureId,
             comment: data.comment,
             enabled: dirtyFields.enabled ? data.enabled : undefined,
-            prerequisitesList: hasDirtyPrerequisites && data.prerequisites,
-            targets: hasDirtyTargets && data.targets,
+            prerequisitesList:
+              hasDirtyField(dirtyFields.prerequisites) && data.prerequisites,
+            targets: hasDirtyField(dirtyFields.targets) && data.targets,
             rules: hasDirtyField(dirtyFields.rules) && data.rules,
             defaultStrategy:
               hasDirtyField(dirtyFields.defaultStrategy) &&
               data.defaultStrategy,
             offVariation:
-              hasDirtyField(dirtyFields.offVariation) && data.offVariation
+              hasDirtyField(dirtyFields.offVariation) && data.offVariation,
+            resetSampling: data.resetSampling
           };
 
           await prepareUpdate(updateFeature, updatePayload);