Imporved: archived rule item rendering in list in case of rules and n…

…o rules (#386)
hotwax · Nov 27, 2024 · ebf3585 · ebf3585
1 parent 2b7908b
commit ebf3585
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 23 deletions.
diff --git a/src/components/RuleItem.vue b/src/components/RuleItem.vue
@@ -314,7 +314,7 @@ async function archiveRule() {
 
           try {
             await RuleService.updateRule(rule, props.rule.ruleId)
-            await store.dispatch('rule/archiveRule', { rule })
+            await store.dispatch('rule/fetchRules', { ruleGroupId: props.rule.ruleGroupId })
             showToast(translate("Rule archived successfully."))
             alertController.dismiss()
           } catch(err: any) {

diff --git a/src/store/modules/rule/actions.ts b/src/store/modules/rule/actions.ts
@@ -91,16 +91,6 @@ const actions: ActionTree<RuleState, RootState> = {
     commit(types.RULE_RULES_UPDATED, { list: payload.rules, total: payload.rules.length});
   },
 
-  archiveRule({ commit, state }, { rule }) {
-    const rules = JSON.parse(JSON.stringify(state.rules.list))
-
-    const index = rules.findIndex((currRule: any) => currRule.ruleId === rule.ruleId);
-    if (index !== -1) {
-      rules.splice(index, 1);
-    }
-    commit(types.RULE_RULES_UPDATED, { list: rules, total: state.rules.total - 1 });
-  },
-
   async clearRuleState({ commit }) {
     commit(types.RULE_CLEARED)
   },

diff --git a/src/views/SafetyStock.vue b/src/views/SafetyStock.vue
@@ -8,11 +8,11 @@
     </ion-header>
 
     <ion-content>
-      <main v-if="ruleGroup.ruleGroupId && rules.length">
-        <ScheduleRuleItem />
+      <main v-if="ruleGroup.ruleGroupId && (rules.length || archivedRules.length)">
+        <ScheduleRuleItem v-if="rules.length" />
         <ArchivedRuleItem v-if="archivedRules?.length" />
 
-        <section>
+        <section v-if="rules.length">
           <ion-reorder-group :disabled="false" @ionItemReorder="updateReorderingRules($event)">
             <RuleItem v-for="(rule, ruleIndex) in (isReorderActive ? reorderingRules : rules)" :rule="rule" :ruleIndex="ruleIndex" :key="rule.ruleId" />
           </ion-reorder-group>

diff --git a/src/views/Shipping.vue b/src/views/Shipping.vue
@@ -21,11 +21,11 @@
 
     <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
       <main v-if="selectedSegment !== 'SHIPPING_FACILITY'">
-        <template v-if="ruleGroup.ruleGroupId && rules.length">
-          <ScheduleRuleItem />
+        <template v-if="ruleGroup.ruleGroupId && (rules.length || archivedRules.length)">
+          <ScheduleRuleItem v-if="rules.length" />
           <ArchivedRuleItem v-if="archivedRules?.length" />
 
-          <section>
+          <section v-if="rules.length">
             <ion-reorder-group :disabled="false" @ionItemReorder="updateReorderingRules($event)">
               <RuleItem v-for="(rule, ruleIndex) in (isReorderActive ? reorderingRules : rules)" :rule="rule" :ruleIndex="ruleIndex" :key="rule.ruleId" />
             </ion-reorder-group>

diff --git a/src/views/StorePickup.vue b/src/views/StorePickup.vue
@@ -21,11 +21,11 @@
 
     <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
       <main v-if="selectedSegment !== 'PICKUP_FACILITY'">
-        <template v-if="ruleGroup.ruleGroupId && rules.length">
-          <ScheduleRuleItem />
+        <template v-if="ruleGroup.ruleGroupId && (rules.length || archivedRules.length)">
+          <ScheduleRuleItem v-if="rules.length" />
           <ArchivedRuleItem v-if="archivedRules?.length" />
 
-          <section>
+          <section v-if="rules.length">
             <ion-reorder-group :disabled="false" @ionItemReorder="updateReorderingRules($event)">
               <RuleItem v-for="(rule, ruleIndex) in (isReorderActive ? reorderingRules : rules)" :rule="rule" :ruleIndex="ruleIndex" :key="rule.ruleId" />
             </ion-reorder-group>

diff --git a/src/views/Threshold.vue b/src/views/Threshold.vue
@@ -8,11 +8,11 @@
     </ion-header>
 
     <ion-content>
-      <main v-if="ruleGroup.ruleGroupId && rules.length">
-        <ScheduleRuleItem />
+      <main v-if="ruleGroup.ruleGroupId && (rules.length || archivedRules.length)">
+        <ScheduleRuleItem v-if="rules.length" />
         <ArchivedRuleItem v-if="archivedRules?.length" />
 
-        <section>
+        <section v-if="rules.length">
           <ion-reorder-group :disabled="false" @ionItemReorder="updateReorderingRules($event)">
             <RuleItem v-for="(rule, ruleIndex) in (isReorderActive ? reorderingRules : rules)" :rule="rule" :ruleIndex="ruleIndex" :key="rule.ruleId" />
           </ion-reorder-group>