Skip to content

Merge stage into main - unpaid ram update #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Devin-Holland merged 4 commits into from
Nov 4, 2024
Merged

Merge stage into main - unpaid ram update #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c869c8
Allow user to update ram if the account is unpaid
Devin-Holland Nov 1, 2024
166eeec
Merge branch 'stage' into allow-ram-update-if-customer-unpaid
BboyAkers Nov 4, 2024
729ef6d
Merge pull request #406 from HarperDB/allow-ram-update-if-customer-un…
Devin-Holland Nov 4, 2024
4edca4b
Update version to 4.6.3
Devin-Holland Nov 4, 2024
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "harperdb-studio",
"version": "4.6.2",
"version": "4.6.3",
"description": "A UI for HarperDB",
"deploymentUrl": "studio.harperdb.io",
"private": true,
Expand Down Expand Up @@ -86,4 +86,4 @@
"typescript": "^5.6.2"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
}
3 changes: 2 additions & 1 deletion src/components/instance/config/UpdateRAM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function UpdateRAM({ setInstanceAction, showPrepaidCompute }) {
const is_wavelength = useStoreState(instanceState, (s) => s.wavelength_zone_id);
const compute_subscription_id = useStoreState(instanceState, (s) => s.compute_subscription_id);
const is_being_modified = useStoreState(instanceState, (s) => !['CREATE_COMPLETE', 'UPDATE_COMPLETE'].includes(s.status));
const is_unpaid = useStoreState(appState, (s) => s.customer?.is_unpaid)

const filteredProducts = useStoreState(appState, (s) => s.products[is_local ? 'local_compute' : is_wavelength ? 'wavelength_compute' : 'cloud_compute']);
const filteredSubscriptions = useStoreState(appState, (s) =>
Expand Down Expand Up @@ -128,7 +129,7 @@ function UpdateRAM({ setInstanceAction, showPrepaidCompute }) {
onClick={() => navigate(`/o/${customer_id}/billing?returnURL=/${customer_id}/i/${compute_stack_id}/config`)}
/>
</div>
) : hasChanged && (storage?.storage_price || formData?.compute_price) && !hasCard ? (
) : hasChanged && (storage?.storage_price || formData?.compute_price) && !hasCard && !is_unpaid ? (
<VisitCard
disabled={!hasChanged || formState.submitted}
label="Add Credit Card To Account"
Expand Down