comi-logic/cfw-autumn
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/johnyeocx/autumn

Browse Source
This commit is contained in:
John Yeo
2025-04-22 22:42:51 +01:00
parent 5255b61410 0235aafd8d
commit 83fcadd37d
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vite/src/views/products/product/product-item/CreateProductItem.tsx
View File

@@ -32,7 +32,7 @@ export let defaultProductItem: ProductItem = {
// Others
entity_feature_id: null,
reset_usage_when_enabled: false,
reset_usage_when_enabled: true,
};
let defaultPriceItem: ProductItem = {
@@ -49,7 +49,7 @@ let defaultPriceItem: ProductItem = {
// Others
entity_feature_id: null,
reset_usage_when_enabled: false,
reset_usage_when_enabled: true,
};
export function CreateProductItem() {

50
vite/src/views/products/product/product-item/MoreMenuButton.tsx
View File

@@ -25,16 +25,30 @@ export default function MoreMenuButton({
}: { item: ProductItem; setItem: (item: ProductItem) => void } =
useProductItemContext();
// useEffect(() => {
// const shouldCarryOver =
// item.interval === null || item.reset_usage_on_billing === false;
// if (item.carry_over_usage !== shouldCarryOver) {
// setItem({
// ...item,
// carry_over_usage: shouldCarryOver,
// });
// }
// }, [item.interval, item.reset_usage_on_billing]);
const [checkedChanged, setCheckedChanged] = useState(false);
const [initialLoad, setInitialLoad] = useState(true);
useEffect(() => {
//function to determine default reset usage when enabled state
console.log(item);
if (checkedChanged) return; //don't change anything if user has explicity set the state value
const defaultReset = !(
(item.interval === null || item.reset_usage_on_billing === false) // what our default behaviour is
);
if (initialLoad) {
const diverged = (item.reset_usage_when_enabled != defaultReset) === true; //on the first load see if it's diverged from the state (ie if this item has the value explicity set already)
diverged && setCheckedChanged(true);
setInitialLoad(false);
return;
}
setItem({
...item,
reset_usage_when_enabled: defaultReset,
});
}, [item.interval, item.reset_usage_on_billing, checkedChanged]);
return (
<Popover open={showPopover} onOpenChange={setShowPopover}>
@@ -58,6 +72,7 @@ export default function MoreMenuButton({
variant="secondary"
className="text-xs text-t2 shadow-none border-none w-full justify-start"
onClick={() => {
setCheckedChanged(true);
setItem({
...item,
reset_usage_when_enabled: !item.reset_usage_when_enabled,
@@ -70,12 +85,15 @@ export default function MoreMenuButton({
// defaultChecked={
// item.interval === null || item.reset_usage_on_billing === false
// }
onCheckedChange={(checked) =>
setItem({
...item,
reset_usage_when_enabled: Boolean(!checked),
})
}
// onCheckedChange={() => console.log("hello")}
// onChange={(checked) => {
// console.log("hello");
// setCheckedChanged(true);
// setItem({
// ...item,
// reset_usage_when_enabled: Boolean(!checked),
// });
// }}
/>
Reset usage when product is enabled
</Button>