Skip to content

Commit

Permalink
Merge branch 'hotfix-2024.10.1.2' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
jacderida committed Oct 1, 2024
2 parents 2d1b27d + 1c46d76 commit c3f0a28
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## 2024-10-01

### Launchpad

#### Changed

- Disable node selection on status screen
- We change node size from 5GB to 35GB

## 2024-10-01

### Network

#### Changed

- Increase node storage size from 4GB to 32GB
- Increase node storage size from 2GB to 32GB

## 2024-09-24

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node-launchpad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["MaidSafe Developers <[email protected]>"]
description = "Node Launchpad"
name = "node-launchpad"
version = "0.3.16"
version = "0.3.17"
edition = "2021"
license = "GPL-3.0"
homepage = "https://maidsafe.net"
Expand Down
2 changes: 1 addition & 1 deletion node-launchpad/src/components/popup/manage_nodes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::{

use super::super::{utils::centered_rect_fixed, Component};

pub const GB_PER_NODE: usize = 5;
pub const GB_PER_NODE: usize = 35;
pub const MB: usize = 1000 * 1000;
pub const GB: usize = MB * 1000;
pub const MAX_NODE_COUNT: usize = 50;
Expand Down
16 changes: 10 additions & 6 deletions node-launchpad/src/components/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ impl Status {
);

if !self.node_services.is_empty() && self.node_table_state.selected().is_none() {
self.node_table_state.select(Some(0));
// self.node_table_state.select(Some(0));
self.node_table_state.select(None);
}

Ok(())
Expand All @@ -200,7 +201,7 @@ impl Status {
.collect()
}

fn select_next_table_item(&mut self) {
fn _select_next_table_item(&mut self) {
let i = match self.node_table_state.selected() {
Some(i) => {
if i >= self.node_services.len() - 1 {
Expand All @@ -214,7 +215,7 @@ impl Status {
self.node_table_state.select(Some(i));
}

fn select_previous_table_item(&mut self) {
fn _select_previous_table_item(&mut self) {
let i = match self.node_table_state.selected() {
Some(i) => {
if i == 0 {
Expand Down Expand Up @@ -417,10 +418,10 @@ impl Component for Status {
return Ok(Some(Action::SwitchScene(Scene::ManageNodesPopUp)));
}
StatusActions::PreviousTableItem => {
self.select_previous_table_item();
// self.select_previous_table_item();
}
StatusActions::NextTableItem => {
self.select_next_table_item();
// self.select_next_table_item();
}
StatusActions::StartNodes => {
debug!("Got action to start nodes");
Expand Down Expand Up @@ -678,9 +679,12 @@ impl Component for Status {
]);

let line2 = Line::from(vec![Span::styled(
"Each node will use 5GB of storage and a small amount of memory, \
format!(
"Each node will use {}GB of storage and a small amount of memory, \
CPU, and Network bandwidth. Most computers can run many nodes at once, \
but we recommend you add them gradually",
GB_PER_NODE
),
Style::default().fg(LIGHT_PERIWINKLE),
)]);

Expand Down
2 changes: 1 addition & 1 deletion release-cycle-info
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
release-year: 2024
release-month: 10
release-cycle: 1
release-cycle-counter: 1
release-cycle-counter: 2

0 comments on commit c3f0a28

Please sign in to comment.