@dcrackel/hematournamentui 1.0.696 → 1.0.698

package/src/stories/Organisms/Grids/GridContainer.vue

@@ -33,10 +33,62 @@ import FencerFinalResultCard from "../../Organisms/Cards/FencerFinalResultCard/F
 import ClubCard from "../../Organisms/Cards/ClubCard/ClubCard.vue";
 import FilterAndSortBar from "../../Molecules/Filters/FilterAndSortBar/FilterAndSortBar.vue";
 import FilterUpcomingPast from "../../Molecules/Filters/FilterUpcomingPast/FilterUpcomingPast.vue";
-import emptyDesertIcon from '../../../assets/empty_desert_icon.png';
-import TournamentCardSkeleton from "../Skeletons/TournamentCard/TournamentCardSkeleton.vue";
-
-export default {
+import emptyDesertIcon from '../../../assets/empty_desert_icon.png';
+import TournamentCardSkeleton from "../Skeletons/TournamentCard/TournamentCardSkeleton.vue";
+
+const componentConfig = {
+  TournamentAdminCard: {
+    defaultSelectedItem: { text: 'Date', link: 'date' },
+    title: 'Tournaments',
+    gridClass: 'grid-cols-1',
+    noResultsMessage: 'No tournaments found.',
+    detailMessage: 'Click the add tournament button and let\'s get started!',
+    getSearchText: item => item.Name?.toLowerCase() ?? ''
+  },
+  FencerFinalResultCard: {
+    defaultSelectedItem: { text: 'Name', link: 'name' },
+    title: 'Fencers',
+    gridClass: 'grid-cols-1',
+    noResultsMessage: 'No fencers found.',
+    detailMessage: 'Click the add fencer button and let\'s get started!',
+    getSearchText: item => item.DisplayName?.toLowerCase() ?? ''
+  },
+  ClubCard: {
+    defaultSelectedItem: { text: 'Club', link: 'club' },
+    title: 'Clubs',
+    noResultsMessage: 'No clubs found.',
+    detailMessage: 'Click the add club button and let\'s get started!',
+    getSearchText: item => item.Name?.toLowerCase() ?? ''
+  }
+};
+
+const defaultComponentConfig = {
+  defaultSelectedItem: {},
+  title: 'Unknown',
+  noResultsMessage: 'No results found.',
+  detailMessage: 'Click the add button and let\'s get started!',
+  getSearchText: () => ''
+};
+
+const sortOptionsByComponent = {
+  FencerFinalResultCard: [
+    { text: 'Name', link: '/sort/name' },
+    { text: 'Club', link: '/sort/club' },
+    { text: 'HR Rating', link: '/sort/hr' }
+  ],
+  ClubCard: [
+    { text: 'Name', link: '/sort/name' },
+    { text: 'Location', link: '/sort/club' }
+  ]
+};
+
+const defaultSortOptions = [
+  { text: 'Date', link: '/sort/date' },
+  { text: 'Name', link: '/sort/name' },
+  { text: 'Location', link: '/sort/location' }
+];
+
+export default {
   name: 'GridContainer',
   components: {
     TournamentCardSkeleton,
@@ -91,101 +143,35 @@ export default {
   mounted() {
     this.applyFilters();
   },
-  computed: {
-    defaultSelectedItem() {
-      switch (this.component) {
-        case 'FencerFinalResultCard':
-          return { text: 'Name', link: 'name' };
-        case 'ClubCard':
-          return { text: 'Club', link: 'club' };
-        case 'TournamentAdminCard':
-          return { text: 'Date', link: 'date' };
-        default:
-          return {};
-      }
-    },
-    getTitle() {
-      switch (this.component) {
-        case 'TournamentAdminCard':
-          return 'Tournaments';
-        case 'FencerFinalResultCard':
-          return 'Fencers';
-        case 'ClubCard':
-          return 'Clubs';
-        default:
-          return 'Unknown';
-      }
-    },
-    placeholder() {
-      switch (this.component) {
-        case 'TournamentAdminCard':
-          return 'Filter by Name';
-        case 'FencerFinalResultCard':
-          return 'Filter by Name';
-        case 'ClubCard':
-          return 'Filter by Name';
-        default:
-          return 'Filter by Name';
-      }
+  computed: {
+    componentSettings() {
+      return componentConfig[this.component] || defaultComponentConfig;
+    },
+    defaultSelectedItem() {
+      return this.componentSettings.defaultSelectedItem;
+    },
+    getTitle() {
+      return this.componentSettings.title;
+    },
+    placeholder() {
+      return 'Filter by Name';
     },
     showButtons() {
       return this.component === 'TournamentAdminCard';
-    },
-    getGridClass() {
-      if (this.component === 'TournamentAdminCard') {
-        return 'grid-cols-1';
-      }
-      if (this.component === 'FencerFinalResultCard') {
-        return 'grid-cols-1';
-      }
-    },
-    getNoResultsMessage() {
-      switch (this.component) {
-        case 'TournamentAdminCard':
-          return 'No tournaments found.';
-        case 'FencerFinalResultCard':
-          return 'No fencers found.';
-        case 'ClubCard':
-          return 'No clubs found.';
-        default:
-          return 'No results found.';
-      }
-    },
-    getDetailMessage(){
-      switch (this.component) {
-        case 'TournamentAdminCard':
-          return 'Click the add tournament button and let\'s get started!';
-        case 'FencerFinalResultCard':
-          return 'Click the add fencer button and let\'s get started!';
-        case 'ClubCard':
-          return 'Click the add club button and let\'s get started!';
-        default:
-          return 'Click the add button and let\'s get started!';
-      }
-    },
-    sortOptions() {
-      if (this.component === 'FencerFinalResultCard') {
-        return [
-          { text: 'Name', link: '/sort/name' },
-          { text: 'Club', link: '/sort/club' },
-          { text: 'HR Rating', link: '/sort/hr' }
-        ];
-      }
-      if (this.component === 'ClubCard') {
-        return [
-          { text: 'Name', link: '/sort/name' },
-          { text: 'Location', link: '/sort/club' },
-        ];
-      }
-
-      return [
-        { text: 'Date', link: '/sort/date' },
-        { text: 'Name', link: '/sort/name' },
-        { text: 'Location', link: '/sort/location' }
-      ];
-
-    }
-  },
+    },
+    getGridClass() {
+      return this.componentSettings.gridClass;
+    },
+    getNoResultsMessage() {
+      return this.componentSettings.noResultsMessage;
+    },
+    getDetailMessage(){
+      return this.componentSettings.detailMessage;
+    },
+    sortOptions() {
+      return sortOptionsByComponent[this.component] || defaultSortOptions;
+    }
+  },
   methods: {
     applyFilters() {
       let result = [...this.items];
@@ -198,25 +184,12 @@ export default {
     },
     applySearchFilter(items) {
       if (!this.filterOn.trim()) return items;
-      const searchText = this.filterOn.toLowerCase();
-      return items.filter(item => {
-        let nameToCheck;
-        switch (this.component) {
-          case 'TournamentAdminCard':
-            nameToCheck = item.Name?.toLowerCase() ?? '';
-            break;
-          case 'FencerFinalResultCard':
-            nameToCheck = item.DisplayName?.toLowerCase() ?? '';
-            break;
-          case 'ClubCard':
-            nameToCheck = item.Name?.toLowerCase() ?? '';
-            break;
-          default:
-            nameToCheck = '';
-        }
-
-        if (!nameToCheck) return false;
-        return nameToCheck.includes(searchText);
+      const searchText = this.filterOn.toLowerCase();
+      return items.filter(item => {
+        const nameToCheck = this.componentSettings.getSearchText(item);
+
+        if (!nameToCheck) return false;
+        return nameToCheck.includes(searchText);
       });
     },
     filterByTimeFrame(items) {
@@ -229,19 +202,20 @@ export default {
       const futureLimit = new Date(currentDate);
       futureLimit.setDate(futureLimit.getDate() + 90);
 
-      switch (this.selectedTimeFrame) {
-        case 'Upcoming':
-          return items.filter(item => new Date(item.EndDate) >= currentDate);
-        case 'Past':
-          return items.filter(item => new Date(item.EndDate) < currentDate);
-        default:
-          let filtered = items.filter(item => {
-            const endDate = new Date(item.EndDate);
-            return endDate >= pastLimit && endDate <= futureLimit;
-          });
-
-          return filtered.slice(0, 20);
-      }
+      const timeFrameFilters = {
+        Upcoming: () => items.filter(item => new Date(item.EndDate) >= currentDate),
+        Past: () => items.filter(item => new Date(item.EndDate) < currentDate),
+        Default: () => {
+          const filtered = items.filter(item => {
+            const endDate = new Date(item.EndDate);
+            return endDate >= pastLimit && endDate <= futureLimit;
+          });
+
+          return filtered.slice(0, 20);
+        }
+      };
+
+      return (timeFrameFilters[this.selectedTimeFrame] || timeFrameFilters.Default)();
     },
     sortTournament(items) {
       if (this.selectedTimeFrame === 'Default') return items;
@@ -270,19 +244,17 @@ export default {
       }[this.sortCriteria];
 
       return sortFn ? [...items].sort(sortFn) : items;
-    },
-    applySorting(items) {
-      switch (this.component) {
-        case 'TournamentAdminCard':
-          return this.sortTournament(items);
-        case 'FencerFinalResultCard':
-          return this.sortFencers(items);
-        case 'ClubCard':
-          return this.sortClubs(items);
-        default:
-          return items;
-      }
-    },
+    },
+    applySorting(items) {
+      const sortByComponent = {
+        TournamentAdminCard: this.sortTournament,
+        FencerFinalResultCard: this.sortFencers,
+        ClubCard: this.sortClubs
+      };
+      const sortItems = sortByComponent[this.component];
+
+      return sortItems ? sortItems(items) : items;
+    },
     handleFilter(filterText) {
       this.filterOn = filterText;
       this.applyFilters();

package/src/stories/Organisms/Headers/EventFinalResultsHeader/EventFinalResultsHeader.vue

@@ -31,6 +31,7 @@ import BaseButton from "../../../Molecules/Buttons/BaseButton/BaseButton.vue";
 
 export default {
   name: 'EventFinalResultsHeader',
+  emits: ['export:HemaRatings'],
   components: {BaseButton, BaseIcon, BaseText, CounterBox, EventStatusBox },
   props: {
     event: {

package/src/stories/Organisms/Headers/PoolResultsHeader/PoolResultsHeader.vue

@@ -67,6 +67,7 @@ import BaseIcon from "../../../Atoms/Icon/BaseIcon.vue";
 
 export default {
   name: 'PoolResultsHeader',
+  emits: ['update:handleChange', 'update:handleDecreaseCount', 'update:handleIncreaseCount'],
   components: {BaseIcon, BaseButton, BaseText, CounterBox, EventStatusBox },
   props: {
     eventName: {

package/src/stories/Organisms/Headers/PoolSummary/PoolSummary.vue

@@ -67,6 +67,7 @@ import ToggleSwitch from "../../../Molecules/Inputs/Toggle/Toggle.vue";
 
 export default {
   name: 'PoolSummary',
+  emits: ['update:manualEdit', 'update:numberOfRings', 'update:poolSize'],
   components: {ToggleSwitch, BaseIcon, BaseButton, BaseText, CounterBox, EventStatusBox },
   props: {
     event: {

package/src/stories/Organisms/Headers/ToggleHeader/ToggleHeader.vue

@@ -34,6 +34,7 @@ import Toggle from "../../../Molecules/Inputs/Toggle/Toggle.vue";
 
 export default {
   name: 'ToggleHeader',
+  emits: ['update:cardSize', 'update:selection'],
   components: {Toggle, ServerConnected, BaseButton },
   props: {
     firstButtonLabel: {

package/src/stories/Organisms/Wizards/EditEventWizard/BasicEventInfo/BasicEventInfo.vue

@@ -84,6 +84,7 @@ import StepIndicator from "../../../../Molecules/StepIndicator/BaseStepIndicator
 
 export default {
   name: 'BasicEventInfoForm',
+  emits: ['update', 'update:back', 'update:next'],
   components: {StepIndicator, BaseText, DropDownMenu, DatePicker, TitledInput, BaseButton},
   props: {
     eventConfig: {

package/src/stories/Organisms/Wizards/EditEventWizard/DirectEliminationPromotion/DirectEliminationPromotion.vue

@@ -67,12 +67,21 @@ import TitledInput from "../../../../Molecules/CombinationInputs/TitledInput/Tit
 import MultiSelect from "../../../../Molecules/Inputs/MultiSelect/MultiSelect.vue";
 import BaseText from "../../../../Atoms/Text/BaseText.vue";
 import BaseButton from "../../../../Molecules/Buttons/BaseButton/BaseButton.vue";
-import StepIndicator from "../../../../Molecules/StepIndicator/BaseStepIndicator/StepIndicator.vue";
-import DropDownMenu from "../../../ComplexInputs/DropDown/DropDownMenu.vue";
-import Toggle from "../../../../Molecules/Inputs/Toggle/Toggle.vue";
-
-export default {
+import StepIndicator from "../../../../Molecules/StepIndicator/BaseStepIndicator/StepIndicator.vue";
+import DropDownMenu from "../../../ComplexInputs/DropDown/DropDownMenu.vue";
+import Toggle from "../../../../Molecules/Inputs/Toggle/Toggle.vue";
+
+const promotionTypeDefaults = {
+  'Top Percent': { typeCode: 'Percent', defaultAmount: '100%' },
+  'Top Count': { typeCode: 'Count', defaultAmount: '16' },
+  'Top Count of Each Pool': { typeCode: 'Top', defaultAmount: '2' }
+};
+
+const defaultPromotionType = { typeCode: 'Percent', defaultAmount: '100%' };
+
+export default {
   name: 'DirectEliminationPromotion',
+  emits: ['update', 'update:back', 'update:DEPromotionType', 'update:next'],
   components: {Toggle, DropDownMenu, StepIndicator, BaseButton, BaseText, TitledInput, MultiSelect},
   props: {
     eventConfig: Object,
@@ -135,35 +144,13 @@ export default {
     handleNext() {
       this.$emit('update:next', this.eventConfig);
     },
-    handleDEPromotionTypeChange(item) {
-      this.selectedItem = item;
-
-      let typeCode;
-      let defaultAmount;
-
-      switch (item.text) {
-        case 'Top Percent':
-          typeCode      = 'Percent';
-          defaultAmount = '100%';
-          break;
-
-        case 'Top Count':
-          typeCode      = 'Count';
-          defaultAmount = '16';
-          break;
-
-        case 'Top Count of Each Pool':
-          typeCode      = 'Top';
-          defaultAmount = '2';
-          break;
-
-        default:
-          typeCode      = 'Percent';
-          defaultAmount = '100%';
-      }
-
-      this.eventConfig.DEPromotionTypes  = typeCode;
-      this.eventConfig.DEPromotionAmount = defaultAmount;
+    handleDEPromotionTypeChange(item) {
+      this.selectedItem = item;
+
+      const { typeCode, defaultAmount } = promotionTypeDefaults[item.text] || defaultPromotionType;
+
+      this.eventConfig.DEPromotionTypes  = typeCode;
+      this.eventConfig.DEPromotionAmount = defaultAmount;
 
       this.$emit('update:DEPromotionType', typeCode);
     },

package/src/stories/Organisms/Wizards/EditEventWizard/EditEventWizard.vue

@@ -62,11 +62,76 @@ import BasicEventInfo from './BasicEventInfo/BasicEventInfo.vue';
 import PoolConfiguration from './PoolConfiguration/PoolConfiguration.vue';
 import DirectElimination from './DirectElimination/DirectElimination.vue';
 import BaseButton from "../../../Molecules/Buttons/BaseButton/BaseButton.vue";
-import StepIndicator from "../../../Molecules/StepIndicator/BaseStepIndicator/StepIndicator.vue";
-import DirectEliminationPromotion from "./DirectEliminationPromotion/DirectEliminationPromotion.vue";
-import EventCustomization from "../../..//Organisms/Wizards/EditEventWizard/EventCustomization/EventCustomization.vue";
-
-export default {
+import StepIndicator from "../../../Molecules/StepIndicator/BaseStepIndicator/StepIndicator.vue";
+import DirectEliminationPromotion from "./DirectEliminationPromotion/DirectEliminationPromotion.vue";
+import EventCustomization from "../../..//Organisms/Wizards/EditEventWizard/EventCustomization/EventCustomization.vue";
+
+const ruleValueIsTrue = (rule, fallbackField) => rule.RuleValue === 'true' || rule.RuleValue === true || rule[fallbackField] === true;
+
+const ruleAppliers = {
+  1: (eventConfig, rule) => {
+    eventConfig.poolTime = rule.RuleValue;
+    eventConfig.poolTimer = true;
+  },
+  2: (eventConfig, rule) => {
+    eventConfig.poolMaxPoints = rule.RuleValue;
+    eventConfig.poolMax = true;
+  },
+  3: (eventConfig, rule) => {
+    eventConfig.DETime = rule.RuleValue;
+    eventConfig.DETimer = true;
+  },
+  4: (eventConfig, rule) => {
+    eventConfig.DEMaxPoints = rule.RuleValue;
+    eventConfig.DEMax = true;
+  },
+  5: (eventConfig, rule) => {
+    eventConfig.thirdPlaceBout = ruleValueIsTrue(rule, 'thirdPlaceBout');
+  },
+  6: (eventConfig, rule) => {
+    eventConfig.boutCount = rule.RuleValue;
+    eventConfig.boutCounter = true;
+  },
+  7: (eventConfig, rule) => {
+    eventConfig.DEBoutCount = rule.RuleValue;
+    eventConfig.DEBoutCounter = true;
+  },
+  9: (eventConfig, rule) => {
+    eventConfig.DEPromotionOrder = rule.RuleValue.split(',');
+  },
+  10: (eventConfig, rule) => {
+    eventConfig.DEPromotionAmount = rule.RuleValue;
+  },
+  11: (eventConfig, rule) => {
+    eventConfig.seedWith = rule.RuleValue;
+  },
+  14: (eventConfig, rule) => {
+    eventConfig.CutOffNumber = rule.RuleValue;
+  },
+  15: (eventConfig, rule) => {
+    eventConfig.DEType = rule.RuleValue;
+  },
+  16: (eventConfig, rule) => {
+    eventConfig.PoolScoreDirection = ruleValueIsTrue(rule, 'PoolScoreDirection');
+  },
+  17: (eventConfig, rule) => {
+    eventConfig.DEPromoteBy = rule.RuleValue;
+  },
+  19: (eventConfig, rule) => {
+    eventConfig.CountHandshots = ruleValueIsTrue(rule, 'CountHandshots');
+  },
+  20: (eventConfig, rule) => {
+    eventConfig.CountDoubles = ruleValueIsTrue(rule, 'CountDoubles');
+  },
+  21: (eventConfig, rule) => {
+    eventConfig.PenaltiesReset = ruleValueIsTrue(rule, 'PenaltiesReset');
+  },
+  22: (eventConfig, rule) => {
+    eventConfig.IncludeInRatings = ruleValueIsTrue(rule, 'IncludeInRatings');
+  }
+};
+
+export default {
   name: 'EditEventWizard',
   components: {
     EventCustomization,
@@ -161,73 +226,13 @@ export default {
     }
   },
   methods: {
-    setInitialValues() {
-      if (!this.event.rules) return;
-      this.event.rules.forEach(rule => {
-        switch (rule.RuleId) {
-          case 1:
-            this.eventConfig.poolTime = rule.RuleValue;
-            this.eventConfig.poolTimer = true;
-            break;
-          case 2:
-            this.eventConfig.poolMaxPoints = rule.RuleValue;
-            this.eventConfig.poolMax = true;
-            break;
-          case 3:
-            this.eventConfig.DETime = rule.RuleValue;
-            this.eventConfig.DETimer = true;
-            break;
-          case 4:
-            this.eventConfig.DEMaxPoints = rule.RuleValue;
-            this.eventConfig.DEMax = true;
-            break;
-          case 5:
-            this.eventConfig.thirdPlaceBout = rule.thirdPlaceBout === 'true' || rule.thirdPlaceBout === true;
-            break;
-          case 6:
-            this.eventConfig.boutCount = rule.RuleValue;
-            this.eventConfig.boutCounter = true;
-            break;
-          case 7:
-            this.eventConfig.DEBoutCount = rule.RuleValue;
-            this.eventConfig.DEBoutCounter = true;
-            break;
-          case 9:
-            this.eventConfig.DEPromotionOrder = rule.RuleValue.split(',');
-            break;
-          case 10:
-            this.eventConfig.DEPromotionAmount = rule.RuleValue;
-            break;
-          case 11:
-            this.eventConfig.seedWith = rule.RuleValue;
-            break;
-          case 14:
-            this.eventConfig.CutOffNumber = rule.RuleValue;
-            break;
-          case 15:
-            this.eventConfig.DEType = rule.RuleValue;
-            break;
-          case 16:
-            this.eventConfig.PoolScoreDirection = rule.RuleValue === 'true' || rule.RuleValue === true;
-            break;
-          case 17:
-            this.eventConfig.DEPromoteBy = rule.RuleValue;
-            break;
-          case 19:
-            this.eventConfig.CountHandshots = rule.RuleValue === 'true' || rule.CountHandshots === true;
-            break;
-          case 20:
-            this.eventConfig.CountDoubles = rule.RuleValue === 'true' || rule.CountDoubles === true;
-            break;
-          case 21:
-            this.eventConfig.PenaltiesReset = rule.RuleValue === 'true' || rule.PenaltiesReset === true;
-            break;
-          case 22:
-            this.eventConfig.IncludeInRatings = rule.RuleValue === 'true' || rule.IncludeInRatings === true;
-            break;
-        }
-      });
-    },
+    setInitialValues() {
+      if (!this.event.rules) return;
+      this.event.rules.forEach(rule => {
+        const applyRule = ruleAppliers[rule.RuleId];
+        if (applyRule) applyRule(this.eventConfig, rule);
+      });
+    },
     handleValueChange(change) {
       const [key, value] = Object.entries(change)[0];
 

package/src/stories/Organisms/Wizards/EditEventWizard/PoolConfiguration/PoolConfiguration.vue

@@ -95,6 +95,7 @@ import BaseButton from "../../../../Molecules/Buttons/BaseButton/BaseButton.vue"
 
 export default {
   name: 'PoolConfiguration',
+  emits: ['update', 'update:back', 'update:next'],
   components: {BaseButton, StepIndicator, BaseText, DropDownMenu, TitledInput, Toggle},
   props: {
     eventConfig: {