bugfixing

This commit is contained in:
MuslemRahimi 2024-12-12 15:26:57 +01:00
parent 236cd95871
commit 1888d4cc72

View File

@ -145,6 +145,8 @@
{ name: "Change", rule: "changesPercentage", type: "percentSign" }, { name: "Change", rule: "changesPercentage", type: "percentSign" },
]; ];
const defaultRules = ruleOfList?.map((item) => item?.rule);
const excludedRules = new Set([ const excludedRules = new Set([
"volume", "volume",
"price", "price",
@ -776,6 +778,13 @@
// Sort checked items first // Sort checked items first
if (isAChecked !== isBChecked) return isAChecked ? -1 : 1; if (isAChecked !== isBChecked) return isAChecked ? -1 : 1;
// Prioritize items based on default rules
const isADefaultRule = defaultRules?.includes(a?.rule);
const isBDefaultRule = defaultRules?.includes(b?.rule);
if (isADefaultRule !== isBDefaultRule) {
return isADefaultRule ? -1 : 1;
}
// Check if the user is not Pro // Check if the user is not Pro
if (data?.user?.tier !== "Pro") { if (data?.user?.tier !== "Pro") {
const isAPriority = proOnlyItems.has(a?.name); const isAPriority = proOnlyItems.has(a?.name);
@ -1337,7 +1346,28 @@
{#each searchQuery?.length !== 0 ? testList : allRows as item} {#each searchQuery?.length !== 0 ? testList : allRows as item}
<DropdownMenu.Item class="sm:hover:bg-primary"> <DropdownMenu.Item class="sm:hover:bg-primary">
<div class="flex items-center"> <div class="flex items-center">
{#if data?.user?.tier === "Pro" || excludedRules?.has(item?.rule)} {#if defaultRules?.includes(item?.rule)}
<label
on:click|capture={(event) => {
event.preventDefault();
}}
class="text-white"
>
<input
disabled={defaultRules?.includes(item?.rule)
? true
: false}
type="checkbox"
class="rounded {defaultRules?.includes(
item?.rule,
)
? 'checked:bg-gray-700'
: 'checked:bg-blue-700'}"
checked={isChecked(item?.name)}
/>
<span class="ml-2">{item?.name}</span>
</label>
{:else if data?.user?.tier === "Pro" || excludedRules?.has(item?.rule)}
<label <label
on:click|capture={(event) => { on:click|capture={(event) => {
event.preventDefault(); event.preventDefault();
@ -1347,8 +1377,15 @@
for={item?.name} for={item?.name}
> >
<input <input
disabled={defaultRules?.includes(item?.rule)
? true
: false}
type="checkbox" type="checkbox"
class="rounded" class="rounded {defaultRules?.includes(
item?.rule,
)
? 'checked:bg-gray-800'
: 'checked:bg-blue-700'}"
checked={isChecked(item?.name)} checked={isChecked(item?.name)}
/> />
<span class="ml-2">{item?.name}</span> <span class="ml-2">{item?.name}</span>