Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/features/api/schemas/user.schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ export const UserPreferenceSchema: z.ZodType<IPreference> = z.object({
burnDaysYellow: z.number(),
burnResupplyDays: z.number(),
burnOrigin: z.string(),
burnDefaultMode: z
.preprocess((v) => v ?? "simple", z.enum(["simple", "solver"]))
.catch("simple"),
burnFullCoverThreshold: z
.preprocess((v) => v ?? 1.0, z.number())
.catch(1.0),
layoutNavigationStyle: z.enum(["full", "collapsed"]),
planOverrides: z.record(
z.string(),
Expand Down
16 changes: 16 additions & 0 deletions src/features/preferences/usePreferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@ export function usePreferences() {
set: (v) => userStore.setPreference("burnOrigin", v),
});

const burnDefaultMode: WritableComputedRef<
"simple" | "solver",
"simple" | "solver"
> = computed<"simple" | "solver">({
get: () => userStore.preferences.burnDefaultMode,
set: (v) => userStore.setPreference("burnDefaultMode", v),
});

const burnFullCoverThreshold: WritableComputedRef<number, number> =
computed<number>({
get: () => userStore.preferences.burnFullCoverThreshold,
set: (v) => userStore.setPreference("burnFullCoverThreshold", v),
});

const planSettings: ComputedRef<
Record<string, Partial<IPreferencePerPlan>>
> = computed(() => {
Expand Down Expand Up @@ -234,6 +248,8 @@ export function usePreferences() {
burnDaysYellow,
burnResupplyDays,
burnOrigin,
burnDefaultMode,
burnFullCoverThreshold,
planSettings,
planSettingsOverview,
layoutNavigationStyle,
Expand Down
2 changes: 2 additions & 0 deletions src/features/preferences/userDefaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export const preferenceDefaults: IPreferenceDefault = {
burnDaysYellow: 10,
burnResupplyDays: 20,
burnOrigin: "Configure on Execution",
burnDefaultMode: "simple",
burnFullCoverThreshold: 1.0,
layoutNavigationStyle: "full",

planOverrides: {},
Expand Down
2 changes: 2 additions & 0 deletions src/features/preferences/userPreferences.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export interface IPreference {
burnDaysYellow: number;
burnResupplyDays: number;
burnOrigin: string;
burnDefaultMode: "simple" | "solver";
burnFullCoverThreshold: number;
layoutNavigationStyle: "full" | "collapsed";

// seeding per plan defaults
Expand Down
34 changes: 34 additions & 0 deletions src/features/profile/components/UserPreferences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
PInputNumber,
PCheckbox,
PTable,
PTooltip,
} from "@/ui";
import { HelpOutlineSharp } from "@vicons/material";

const planningStore = usePlanningStore();

Expand All @@ -37,10 +39,17 @@
burnDaysYellow,
burnResupplyDays,
burnOrigin,
burnDefaultMode,
burnFullCoverThreshold,
locale,
planSettingsOverview,
cleanPlanPreferences,
} = usePreferences();

const burnModeOptions: Ref<PSelectOption[]> = ref([
{ label: t("xit.form.mode_simple"), value: "simple" },
{ label: t("xit.form.mode_solver"), value: "solver" },
]);
let { defaultEmpireUuid, defaultCXUuid, defaultBuyItemsFromCX } =
usePreferences();

Expand Down Expand Up @@ -174,6 +183,31 @@
<PFormItem :label="t('profile.preferences.form.buy_from_cx')">
<PCheckbox v-model:checked="defaultBuyItemsFromCX" />
</PFormItem>
<PFormItem :label="t('profile.preferences.form.burn_default_mode')">
<PSelect
v-model:value="burnDefaultMode"
:options="burnModeOptions"
class="w-full" />
</PFormItem>
<PFormItem
:label="t('profile.preferences.form.burn_full_cover_threshold')">
<div class="flex flex-row items-center gap-x-2 w-full">
<PInputNumber
v-model:value="burnFullCoverThreshold"
show-button
:min="0"
class="w-full" />
<PTooltip placement="top">
<template #trigger>
<HelpOutlineSharp
class="w-4 h-4 text-white/50 cursor-help" />
</template>
<div class="max-w-75 text-xs">
{{ t("xit.form.full_cover_threshold_info") }}
</div>
</PTooltip>
</div>
</PFormItem>
</PForm>

<h3 class="font-bold py-3">
Expand Down
126 changes: 106 additions & 20 deletions src/features/xit/components/XITBurnActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
const {
burnResupplyDays,
burnOrigin,
burnDefaultMode,
burnFullCoverThreshold,
getBurnDisplayClass,
defaultBuyItemsFromCX,
} = usePreferences();
Expand All @@ -36,8 +38,10 @@
PSelect,
PInput,
PTable,
PTooltip,
} from "@/ui";
import { NDrawer, NDrawerContent } from "naive-ui";
import { HelpOutlineSharp } from "@vicons/material";

// Constants
import { XITSTATIONWAREHOUSES } from "@/features/xit/xitConstants";
Expand Down Expand Up @@ -104,17 +108,34 @@
const refHideInfinite: Ref<boolean> = ref(false);
const refMaterialOverrides: Ref<Record<string, number>> = ref({});
const refMaterialInactives: Ref<Set<string>> = ref(new Set([]));
const refShipWeightCapacity: Ref<number> = ref(1000);
const refShipVolumeCapacity: Ref<number> = ref(1000);

const modeOptions = computed(() => [
{ label: t("xit.form.mode_simple"), value: "simple" },
{ label: t("xit.form.mode_solver"), value: "solver" },
]);

const { materialTable, totalWeightVolume, totalPrice, fit } =
await useBurnXITAction(
burnDefaultMode,
localElements,
burnResupplyDays,
refHideInfinite,
refMaterialOverrides,
refMaterialInactives,
ref(undefined),
ref(undefined)
ref(undefined),
refShipWeightCapacity,
refShipVolumeCapacity,
burnFullCoverThreshold
);

function applyShipPreset(weight: number, volume: number): void {
refShipWeightCapacity.value = weight;
refShipVolumeCapacity.value = volume;
trackEvent("xit_burn_fit_ship", { weight, volume });
}
</script>

<template>
Expand All @@ -129,6 +150,12 @@
<div class="mb-3 grid grid-cols-1 xl:grid-cols-[60%_auto] gap-3">
<div>
<PForm>
<PFormItem :label="t('xit.form.mode')">
<PSelect
v-model:value="burnDefaultMode"
:options="modeOptions"
class="w-full" />
</PFormItem>
<PFormItem :label="t('xit.form.origin')">
<PSelect
v-model:value="burnOrigin"
Expand All @@ -155,27 +182,86 @@
burnOrigin === 'Configure on Execution'
" />
</PFormItem>
<PFormItem :label="t('xit.form.fit_ship')">
<PButtonGroup>
<PButton
v-for="fitOption in fitOptions"
:key="fitOption.label"
@click="
() => {
fit(
<template v-if="burnDefaultMode === 'solver'">
<PFormItem :label="t('xit.form.ship_weight')">
<PInputNumber
v-model:value="refShipWeightCapacity"
:min="0"
show-buttons
class="w-full" />
</PFormItem>
<PFormItem :label="t('xit.form.ship_volume')">
<PInputNumber
v-model:value="refShipVolumeCapacity"
:min="0"
show-buttons
class="w-full" />
</PFormItem>
<PFormItem :label="t('xit.form.fit_ship')">
<PButtonGroup>
<PButton
v-for="fitOption in fitOptions"
:key="fitOption.label"
@click="
applyShipPreset(
fitOption.weight,
fitOption.volume
);
trackEvent('xit_burn_fit_ship', {
weight: fitOption.weight,
volume: fitOption.volume,
});
}
">
{{ fitOption.label }}
</PButton>
</PButtonGroup>
</PFormItem>
)
">
{{ fitOption.label }}
</PButton>
</PButtonGroup>
</PFormItem>
<PFormItem
:label="t('xit.form.full_cover_threshold')">
<div class="flex flex-row items-center gap-x-2">
<PInputNumber
v-model:value="burnFullCoverThreshold"
:min="0"
show-buttons
class="w-full" />
<PTooltip placement="top">
<template #trigger>
<HelpOutlineSharp
class="w-4 h-4 text-white/50 cursor-help" />
</template>
<div class="max-w-75 text-xs">
{{
t(
"xit.form.full_cover_threshold_info"
)
}}
</div>
</PTooltip>
</div>
</PFormItem>
</template>
<template v-else>
<PFormItem :label="t('xit.form.fit_ship')">
<PButtonGroup>
<PButton
v-for="fitOption in fitOptions"
:key="fitOption.label"
@click="
() => {
fit(
fitOption.weight,
fitOption.volume
);
trackEvent(
'xit_burn_fit_ship',
{
weight: fitOption.weight,
volume: fitOption.volume,
}
);
}
">
{{ fitOption.label }}
</PButton>
</PButtonGroup>
</PFormItem>
</template>
<PFormItem :label="t('xit.form.hide_infinite')">
<PCheckbox v-model:checked="refHideInfinite" />
</PFormItem>
Expand Down
Loading