Skip to content

Commit

Permalink
WIP: use gitlab.com repository
Browse files Browse the repository at this point in the history
  • Loading branch information
reimarstier committed Jan 15, 2025
1 parent e83442b commit f218d93
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@ indoc = "2.0.4"
jsonwebtoken = "9.2.0"
leptos = { version = "0.7.3" }
# https://gitlab.com/GoodLucky777/leptos_oidc, version 0.7.0
# leptos_oidc = { git = "https://gitlab.com/GoodLucky777/leptos_oidc", rev = "ed55987efec1004de93455591ef702bf1ffd2e43" }
# TODO: change to appropriate location
leptos_oidc = { path = "leptos_oidc" }
# TODO: change location
leptos_oidc = { git = "https://gitlab.com/opendut/leptos_oidc", branch = "upgrade-leptos-0.7" }
leptos_router = { version = "0.7.3" }
leptos-use = { version = "0.15.3" }
mime = "0.3.17"
Expand Down
7 changes: 4 additions & 3 deletions opendut-lea/src/about/overview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ pub fn AboutOverview() -> impl IntoView {
let globals = use_app_globals();

let metadata: LocalResource<VersionInfo> = LocalResource::new(move || {
let mut carl = globals.client;
let carl = globals.client.clone();
async move {
let mut carl = carl.clone();
carl.metadata.version().await
.expect("Failed to request the version from carl.")
}
});

view! {
<BasePageContainer
title="About"
Expand All @@ -42,7 +43,7 @@ pub fn AboutOverview() -> impl IntoView {
<td>Version</td>
<td>
<Transition fallback=move || view! { <p>"-"</p> }>
{ move || { metadata.get().map(|version| version.name)} }
{ move || Suspend::new(async move { metadata.await.name })}
</Transition>
</td>
</tr>
Expand Down
3 changes: 2 additions & 1 deletion opendut-lea/src/clusters/card.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ pub fn ClustersCard() -> impl IntoView {
let globals = use_app_globals();

let clusters: LocalResource<Clusters> = LocalResource::new(move || {
let mut carl = globals.client;
let carl = globals.client.clone();
async move {
let mut carl = carl.clone();
let configured = carl.cluster.list_cluster_configurations().await
.expect("Failed to request the list of cluster configurations.")
.len();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn SaveClusterButton(cluster_configuration: ReadSignal<UserClusterConfiguration>
let globals = use_app_globals();
let toaster = use_toaster();

let store_action = create_action(move |_: &()| {
let store_action = Action::new(move |_| {
let toaster = Arc::clone(&toaster);
let configuration = ClusterConfiguration::try_from(cluster_configuration.get_untracked());
async move {
Expand Down
2 changes: 1 addition & 1 deletion opendut-lea/src/components/authenticated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn Initialized(
match config.auth_parameters {
Some(ref auth_parameters) => {
info!("Auth parameters: {auth_parameters:?}");
let auth = Auth::init(auth_parameters.clone());
let auth = Auth::init(auth_parameters.clone()).await;
let client = CarlClient::create(Clone::clone(&config.carl_url), Some(auth.clone())).await
.expect("Failed to create CARL client");

Expand Down

0 comments on commit f218d93

Please sign in to comment.