rename rule to rule clause

This commit is contained in:
Sirttas
2026-05-28 10:53:46 +02:00
parent 9acbc101e1
commit b40b58f866
4 changed files with 15 additions and 15 deletions
+5 -5
View File
@@ -81,13 +81,13 @@ export interface RuleBookResponse {
'characterId': number;
'ruleSets': { [key: string]: RuleSetResponse; };
}
export interface RuleResponse {
'rate': RuleResponseRateEnum;
export interface RuleClauseResponse {
'rate': RuleClauseResponseRateEnum;
'fromLedgerId'?: string;
'toLedgerId'?: string;
}
export const RuleResponseRateEnum = {
export const RuleClauseResponseRateEnum = {
None: 'NONE',
Value: 'VALUE',
JitaBuy: 'JITA_BUY',
@@ -95,10 +95,10 @@ export const RuleResponseRateEnum = {
EveEstimate: 'EVE_ESTIMATE',
} as const;
export type RuleResponseRateEnum = typeof RuleResponseRateEnum[keyof typeof RuleResponseRateEnum];
export type RuleClauseResponseRateEnum = typeof RuleClauseResponseRateEnum[keyof typeof RuleClauseResponseRateEnum];
export interface RuleSetResponse {
'rules': Array<RuleResponse>;
'rules': Array<RuleClauseResponse>;
}
export interface SetCharacterRuleBookRequest {
'ruleSets': { [key: string]: RuleSetResponse; };
@@ -1,11 +1,11 @@
<script setup lang="ts">
import {RuleResponse} from "@/generated/mammon";
import {RuleClauseResponse} from "@/generated/mammon";
import {computed} from "vue";
import {isMain, Ledger, LedgerSelect, systemLedger, useLedgersStore} from "@/ledger";
import {ratesTypes} from "@/rules/rules.ts";
const rule = defineModel<RuleResponse>();
const rule = defineModel<RuleClauseResponse>();
const ledgersStore = useLedgersStore();
const {findById} = ledgersStore;
+6 -6
View File
@@ -1,22 +1,22 @@
<script setup lang="ts">
import {RuleResponse, RuleResponseRateEnum, RuleSetResponse} from "@/generated/mammon";
import RuleInput from "@/rules/RuleInput.vue";
import {RuleClauseResponse, RuleClauseResponseRateEnum, RuleSetResponse} from "@/generated/mammon";
import RuleClauseInput from "@/rules/RuleClauseInput.vue";
import {computed, useTemplateRef} from "vue";
import {Bars4Icon, PlusIcon, TrashIcon} from '@heroicons/vue/24/outline';
import {useSortable} from "@vueuse/integrations/useSortable";
const ruleSet = defineModel<RuleSetResponse>();
const rules = computed<RuleResponse[]>({
const rules = computed<RuleClauseResponse[]>({
get: () => ruleSet.value && ruleSet.value.rules ? ruleSet.value.rules : [],
set: value => ruleSet.value = {rules: value}
})
const addRule = () => {
rules.value = [...rules.value, {rate: RuleResponseRateEnum.None}]
rules.value = [...rules.value, {rate: RuleClauseResponseRateEnum.None}]
}
const setRule = (index: number, rule?: RuleResponse) => {
const setRule = (index: number, rule?: RuleClauseResponse) => {
if (!rule) {
return;
}
@@ -38,7 +38,7 @@ useSortable(sortableContainer, rules, { handle: '.sortable-handle'});
<span class="sortable-handle flex">
<Bars4Icon class="w-6"/>
</span>
<RuleInput :modelValue="rule" @update:modelValue="v => setRule(index, v)" />
<RuleClauseInput :modelValue="rule" @update:modelValue="v => setRule(index, v)" />
<button class="btn-icon" @click="removeRule(index)"><TrashIcon /></button>
</div>
</div>
+2 -2
View File
@@ -1,5 +1,5 @@
import {ruleBookControllerApi} from "@/mammon";
import {RuleBookResponse, RuleResponseRateEnum, RuleSetResponse} from "@/generated/mammon";
import {RuleBookResponse, RuleClauseResponseRateEnum, RuleSetResponse} from "@/generated/mammon";
export const activityTypes = {
itemBought: {key: "ITEM_BOUGHT", name: "Item Bought"},
@@ -20,7 +20,7 @@ export const ratesTypes = {
EveEstimate: {key: "EVE_ESTIMATE", name: "Eve Estimate"},
} as const;
export type Rate = { key: RuleResponseRateEnum, name: string }
export type Rate = { key: RuleClauseResponseRateEnum, name: string }
export const findByCharacterId = (characterId: number): Promise<RuleBook> => ruleBookControllerApi.findByCharacterId(characterId)
.then(response => response.data)