From 7122f87d787e4a4d5cee589a4b9512fd376ae478 Mon Sep 17 00:00:00 2001 From: rhigman <73792779+rhigman@users.noreply.github.com> Date: Mon, 30 May 2022 15:55:10 +0100 Subject: [PATCH 01/53] Update cargo to latest yew version (0.19.3) [broken] --- Cargo.lock | 141 ++++++++++++++++++++++++++++++++++++++++--- thoth-app/Cargo.toml | 2 +- 2 files changed, 134 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 125dca88..927079e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1463,10 +1463,38 @@ checksum = "68ce6f2dfa9f57f15b848efa2aade5e1850dc72986b87a2b0752d44ca08f4967" dependencies = [ "gloo-console-timer", "gloo-events", - "gloo-file", + "gloo-file 0.1.0", "gloo-timers", ] +[[package]] +name = "gloo" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23947965eee55e3e97a5cd142dd4c10631cc349b48cecca0ed230fd296f568cd" +dependencies = [ + "gloo-console", + "gloo-dialogs", + "gloo-events", + "gloo-file 0.2.1", + "gloo-render", + "gloo-storage", + "gloo-timers", + "gloo-utils", +] + +[[package]] +name = "gloo-console" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3907f786f65bbb4f419e918b0c5674175ef1c231ecda93b2dbd65fd1e8882637" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-console-timer" version = "0.1.0" @@ -1476,6 +1504,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-events" version = "0.1.1" @@ -1498,6 +1536,43 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-file" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa5d6084efa4a2b182ef3a8649cb6506cb4843f22cf907c6e0a799944248ae90" +dependencies = [ + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa4ba51c99de680dee3ad99c32ca45e9f13311be72079154d222c3f9a6b6f5" +dependencies = [ + "gloo-utils", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-timers" version = "0.2.1" @@ -1509,6 +1584,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0bbef55e98d946adbd89f3c65a497cf9adb995a73b99573f30180e8813ab21" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "graphql-introspection-query" version = "0.1.0" @@ -2419,7 +2505,7 @@ dependencies = [ "serde_json", "serde_yaml", "thiserror", - "url 1.7.2", + "url 2.2.2", ] [[package]] @@ -3297,6 +3383,12 @@ dependencies = [ "parking_lot 0.10.0", ] +[[package]] +name = "scoped-tls-hkt" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63" + [[package]] name = "scoped_threadpool" version = "0.1.9" @@ -3863,7 +3955,7 @@ dependencies = [ "wasm-bindgen", "wasm-logger", "wasm-pack", - "yew", + "yew 0.19.3", "yew-router", "yewtil", ] @@ -4712,7 +4804,7 @@ dependencies = [ "cfg-if 1.0.0", "cfg-match", "console_error_panic_hook", - "gloo", + "gloo 0.2.1", "http 0.2.6", "indexmap", "js-sys", @@ -4725,7 +4817,26 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "yew-macro", + "yew-macro 0.18.0", +] + +[[package]] +name = "yew" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1ccb53e57d3f7d847338cf5758befa811cabe207df07f543c06f502f9998cd" +dependencies = [ + "console_error_panic_hook", + "gloo 0.4.2", + "gloo-utils", + "indexmap", + "js-sys", + "scoped-tls-hkt", + "slab", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew-macro 0.19.3", ] [[package]] @@ -4741,6 +4852,20 @@ dependencies = [ "syn 1.0.72", ] +[[package]] +name = "yew-macro" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fab79082b556d768d6e21811869c761893f0450e1d550a67892b9bce303b7bb" +dependencies = [ + "boolinator", + "lazy_static 1.4.0", + "proc-macro-error", + "proc-macro2 1.0.36", + "quote 1.0.15", + "syn 1.0.72", +] + [[package]] name = "yew-router" version = "0.15.0" @@ -4749,7 +4874,7 @@ checksum = "27666236d9597eac9be560e841e415e20ba67020bc8cd081076be178e159c8bc" dependencies = [ "cfg-if 1.0.0", "cfg-match", - "gloo", + "gloo 0.2.1", "js-sys", "log", "nom", @@ -4757,7 +4882,7 @@ dependencies = [ "serde_json", "wasm-bindgen", "web-sys", - "yew", + "yew 0.18.0", "yew-router-macro", "yew-router-route-parser", ] @@ -4795,7 +4920,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "yew", + "yew 0.18.0", "yewtil-macro", ] diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml index 7cb4b8c6..120c51a3 100644 --- a/thoth-app/Cargo.toml +++ b/thoth-app/Cargo.toml @@ -23,7 +23,7 @@ anyhow = "1.0.32" chrono = { version = "0.4", features = ["serde"] } log = "0.4.11" thiserror = "1.0.20" -yew = "0.18.0" +yew = "0.19.3" yew-router = "0.15.0" yewtil = { version = "0.4.0", features = ["fetch", "pure"] } wasm-bindgen = "0.2.74" From 855e2464630fefe25385abbc8616439577b49875 Mon Sep 17 00:00:00 2001 From: rhigman <73792779+rhigman@users.noreply.github.com> Date: Mon, 30 May 2022 16:00:09 +0100 Subject: [PATCH 02/53] Basic syntax updates: ShouldRender removed, non-literal props require braces, fn change becomes fn changed [broken] --- thoth-app/src/component/admin.rs | 54 ++--- thoth-app/src/component/affiliations_form.rs | 44 ++-- thoth-app/src/component/catalogue.rs | 25 +-- thoth-app/src/component/contributions_form.rs | 72 +++--- thoth-app/src/component/contributor.rs | 36 +-- thoth-app/src/component/dashboard.rs | 24 +- thoth-app/src/component/delete_dialogue.rs | 16 +- thoth-app/src/component/fundings_form.rs | 46 ++-- thoth-app/src/component/imprint.rs | 28 +-- thoth-app/src/component/institution.rs | 42 ++-- thoth-app/src/component/issues_form.rs | 32 +-- thoth-app/src/component/languages_form.rs | 42 ++-- thoth-app/src/component/locations_form.rs | 44 ++-- thoth-app/src/component/login.rs | 18 +- thoth-app/src/component/menu.rs | 24 +- thoth-app/src/component/mod.rs | 28 ++- thoth-app/src/component/navbar.rs | 12 +- thoth-app/src/component/new_contributor.rs | 40 ++-- thoth-app/src/component/new_imprint.rs | 24 +- thoth-app/src/component/new_institution.rs | 36 +-- thoth-app/src/component/new_publisher.rs | 20 +- thoth-app/src/component/new_series.rs | 52 ++--- thoth-app/src/component/new_work.rs | 152 ++++++------- thoth-app/src/component/notification.rs | 7 +- thoth-app/src/component/prices_form.rs | 36 +-- thoth-app/src/component/publication.rs | 37 ++-- thoth-app/src/component/publication_modal.rs | 84 +++---- thoth-app/src/component/publications_form.rs | 26 +-- thoth-app/src/component/publisher.rs | 24 +- thoth-app/src/component/related_works_form.rs | 42 ++-- thoth-app/src/component/root.rs | 10 +- thoth-app/src/component/series.rs | 56 ++--- thoth-app/src/component/subjects_form.rs | 38 ++-- thoth-app/src/component/utils.rs | 142 ++++++------ thoth-app/src/component/work.rs | 208 +++++++++--------- thoth-app/src/models/contributor/mod.rs | 2 +- thoth-app/src/models/imprint/mod.rs | 2 +- thoth-app/src/models/institution/mod.rs | 2 +- thoth-app/src/models/mod.rs | 2 +- thoth-app/src/models/publication/mod.rs | 2 +- thoth-app/src/models/publisher/mod.rs | 2 +- thoth-app/src/models/series/mod.rs | 2 +- thoth-app/src/models/work/mod.rs | 2 +- 43 files changed, 817 insertions(+), 820 deletions(-) diff --git a/thoth-app/src/component/admin.rs b/thoth-app/src/component/admin.rs index 2314f82a..237f96da 100644 --- a/thoth-app/src/component/admin.rs +++ b/thoth-app/src/component/admin.rs @@ -96,7 +96,7 @@ impl Component for AdminComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::RedirectToLogin => { self.router @@ -106,7 +106,7 @@ impl Component for AdminComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { if self.props != props { self.previous_route.neq_assign(self.props.route.clone()); self.props = props; @@ -134,44 +134,44 @@ impl Component for AdminComponent {
- +
{ match &self.props.route { - AdminRoute::Admin => html!{}, - AdminRoute::Dashboard => html!{}, - AdminRoute::Works => html!{}, - AdminRoute::Books => html!{}, - AdminRoute::Chapters => html!{}, + AdminRoute::Admin => html!{}, + AdminRoute::Dashboard => html!{}, + AdminRoute::Works => html!{}, + AdminRoute::Books => html!{}, + AdminRoute::Chapters => html!{}, AdminRoute::Work(id) => html!{ }, AdminRoute::NewWork => html!{ }, - AdminRoute::Publishers => html!{}, - AdminRoute::Publisher(id) => html!{}, + AdminRoute::Publishers => html!{}, + AdminRoute::Publisher(id) => html!{}, AdminRoute::NewPublisher => html!{}, - AdminRoute::Imprints => html!{}, - AdminRoute::Imprint(id) => html!{}, - AdminRoute::NewImprint => html!{}, - AdminRoute::Institutions => html!{}, - AdminRoute::Institution(id) => html!{}, + AdminRoute::Imprints => html!{}, + AdminRoute::Imprint(id) => html!{}, + AdminRoute::NewImprint => html!{}, + AdminRoute::Institutions => html!{}, + AdminRoute::Institution(id) => html!{}, AdminRoute::NewInstitution => html!{}, - AdminRoute::Publications => html!{}, + AdminRoute::Publications => html!{}, AdminRoute::Publication(id) => html!{ }, AdminRoute::NewPublication => { @@ -183,12 +183,12 @@ impl Component for AdminComponent { } } - AdminRoute::Contributors => html!{}, - AdminRoute::Contributor(id) => html!{}, + AdminRoute::Contributors => html!{}, + AdminRoute::Contributor(id) => html!{}, AdminRoute::NewContributor => html!{}, - AdminRoute::Serieses => html!{}, - AdminRoute::NewSeries => html!{}, - AdminRoute::Series(id) => html!{}, + AdminRoute::Serieses => html!{}, + AdminRoute::NewSeries => html!{}, + AdminRoute::Series(id) => html!{}, } }
diff --git a/thoth-app/src/component/affiliations_form.rs b/thoth-app/src/component/affiliations_form.rs index 0e11df07..cd70b71c 100644 --- a/thoth-app/src/component/affiliations_form.rs +++ b/thoth-app/src/component/affiliations_form.rs @@ -133,7 +133,7 @@ impl Component for AffiliationsFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleModalFormDisplay(show_form, a) => { self.show_modal_form = show_form; @@ -435,7 +435,7 @@ impl Component for AffiliationsFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { if self.props.neq_assign(props) { self.link.send_message(Msg::GetAffiliations); true @@ -455,43 +455,43 @@ impl Component for AffiliationsFormComponent { }); html! {
-
-
+
+

{ self.modal_form_title() }

-
+ { let value = elem.value(); Msg::ChangeInstitution(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
@@ -505,7 +505,7 @@ impl Component for AffiliationsFormComponent { @@ -532,7 +532,7 @@ impl Component for AffiliationsFormComponent { {for affiliations.iter().map(|a| self.render_affiliation(a))} -
+

@@ -542,9 +542,9 @@ impl Component for AffiliationsFormComponent { placeholder="Search Institution" aria-haspopup="true" aria-controls="institutions-menu" - oninput=self.link.callback(|e: InputData| Msg::SearchInstitution(e.value)) - onfocus=self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) - onblur=self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) + oninput={ self.link.callback(|e: InputData| Msg::SearchInstitution(e.value)) } + onfocus={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) } + onblur={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) } /> @@ -628,7 +628,7 @@ impl AffiliationsFormComponent { { EDIT_BUTTON } @@ -636,7 +636,7 @@ impl AffiliationsFormComponent { { REMOVE_BUTTON } diff --git a/thoth-app/src/component/catalogue.rs b/thoth-app/src/component/catalogue.rs index cea10a90..aaffa09c 100644 --- a/thoth-app/src/component/catalogue.rs +++ b/thoth-app/src/component/catalogue.rs @@ -4,7 +4,6 @@ use yew::prelude::Component; use yew::prelude::FocusEvent; use yew::prelude::Html; use yew::prelude::InputData; -use yew::prelude::ShouldRender; use yew::ComponentLink; use yewtil::fetch::Fetch; use yewtil::fetch::FetchAction; @@ -72,7 +71,7 @@ impl Component for CatalogueComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetFetchState(fetch_state) => { self.fetch_data.apply(fetch_state); @@ -143,7 +142,7 @@ impl Component for CatalogueComponent { } } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } @@ -163,29 +162,29 @@ impl Component for CatalogueComponent {

-
+ { let value = elem.value(); Msg::ChangePublisher(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
diff --git a/thoth-app/src/component/institution.rs b/thoth-app/src/component/institution.rs index cf7f6a21..77ebf957 100644 --- a/thoth-app/src/component/institution.rs +++ b/thoth-app/src/component/institution.rs @@ -156,7 +156,7 @@ impl Component for InstitutionComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetCountryCodesFetchState(fetch_state) => { self.fetch_country_codes.apply(fetch_state); @@ -417,7 +417,7 @@ impl Component for InstitutionComponent { } } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } @@ -441,8 +441,8 @@ impl Component for InstitutionComponent {

@@ -452,37 +452,37 @@ impl Component for InstitutionComponent { { self.render_associated_works(&self.affiliated_works, "Member(s) contributed to: ") } - + { Msg::ChangeCountryCode(elem.value()) } _ => unreachable!(), - }) + }) } />
@@ -513,7 +513,7 @@ impl InstitutionComponent {

{ explanatory_text } - route=work.edit_route() + route={ work.edit_route() } > { &work.title } > diff --git a/thoth-app/src/component/issues_form.rs b/thoth-app/src/component/issues_form.rs index b438bb13..66ca888f 100644 --- a/thoth-app/src/component/issues_form.rs +++ b/thoth-app/src/component/issues_form.rs @@ -116,7 +116,7 @@ impl Component for IssuesFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -271,7 +271,7 @@ impl Component for IssuesFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_permissions = self.props.current_user.resource_access != props.current_user.resource_access; let should_render = self.props.neq_assign(props); @@ -295,7 +295,7 @@ impl Component for IssuesFormComponent { { "Issues" }

-
+

@@ -305,9 +305,9 @@ impl Component for IssuesFormComponent { placeholder="Search Series" aria-haspopup="true" aria-controls="serieses-menu" - oninput=self.link.callback(|e: InputData| Msg::SearchSeries(e.value)) - onfocus=self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) - onblur=self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) + oninput={ self.link.callback(|e: InputData| Msg::SearchSeries(e.value)) } + onfocus={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) } + onblur={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) } /> @@ -343,22 +343,22 @@ impl Component for IssuesFormComponent {

-
-
+
+

{ "New Issue" }

-
@@ -368,10 +368,10 @@ impl Component for IssuesFormComponent {
@@ -385,7 +385,7 @@ impl Component for IssuesFormComponent { @@ -471,7 +471,7 @@ impl IssuesFormComponent {
{ REMOVE_BUTTON } diff --git a/thoth-app/src/component/languages_form.rs b/thoth-app/src/component/languages_form.rs index 7e03811a..a3e8c62f 100644 --- a/thoth-app/src/component/languages_form.rs +++ b/thoth-app/src/component/languages_form.rs @@ -113,7 +113,7 @@ impl Component for LanguagesFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -264,7 +264,7 @@ impl Component for LanguagesFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -286,33 +286,33 @@ impl Component for LanguagesFormComponent {
-
-
+
+

{ "New Language" }

-
{ let value = elem.value(); Msg::ChangeLanguageCode( @@ -320,14 +320,14 @@ impl Component for LanguagesFormComponent { ) } _ => unreachable!(), - }) + }) } required = true /> { let value = elem.value(); Msg::ChangeLanguageRelation( @@ -335,20 +335,20 @@ impl Component for LanguagesFormComponent { ) } _ => unreachable!(), - }) + }) } required = true /> { let value = elem.value(); let boolean = value == "true"; Msg::ChangeMainLanguage(boolean) } _ => unreachable!(), - }) + }) } required = true /> @@ -363,7 +363,7 @@ impl Component for LanguagesFormComponent { @@ -433,7 +433,7 @@ impl LanguagesFormComponent {
{ REMOVE_BUTTON } diff --git a/thoth-app/src/component/locations_form.rs b/thoth-app/src/component/locations_form.rs index 1dc784d1..a237dcef 100644 --- a/thoth-app/src/component/locations_form.rs +++ b/thoth-app/src/component/locations_form.rs @@ -110,7 +110,7 @@ impl Component for LocationsFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -252,7 +252,7 @@ impl Component for LocationsFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -274,43 +274,43 @@ impl Component for LocationsFormComponent {
-
-
+
+

{ "New Location" }

-
{ let value = elem.value(); Msg::ChangeLocationPlatform( @@ -318,20 +318,20 @@ impl Component for LocationsFormComponent { ) } _ => unreachable!(), - }) + }) } required = true /> { let value = elem.value(); let boolean = value == "true"; Msg::ChangeCanonical(boolean) } _ => unreachable!(), - }) + }) } required = true /> @@ -346,7 +346,7 @@ impl Component for LocationsFormComponent { @@ -431,8 +431,8 @@ impl LocationsFormComponent {
{ REMOVE_BUTTON } diff --git a/thoth-app/src/component/login.rs b/thoth-app/src/component/login.rs index 7c1fb9ca..20800c87 100644 --- a/thoth-app/src/component/login.rs +++ b/thoth-app/src/component/login.rs @@ -72,7 +72,7 @@ impl Component for LoginComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props = props; if self.props.current_user.is_some() { self.link.send_message(Msg::RedirectToAdmin); @@ -80,7 +80,7 @@ impl Component for LoginComponent { true } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::RedirectToAdmin => { self.router @@ -137,9 +137,9 @@ impl Component for LoginComponent { @@ -151,9 +151,9 @@ impl Component for LoginComponent { @@ -164,7 +164,7 @@ impl Component for LoginComponent {

diff --git a/thoth-app/src/component/menu.rs b/thoth-app/src/component/menu.rs index 7369f4ad..faa2a1bc 100644 --- a/thoth-app/src/component/menu.rs +++ b/thoth-app/src/component/menu.rs @@ -33,12 +33,12 @@ impl Component for MenuComponent { MenuComponent { props } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props = props; true } - fn update(&mut self, _msg: Self::Message) -> ShouldRender { + fn update(&mut self, _msg: Self::Message) -> bool { false } @@ -52,7 +52,7 @@ impl Component for MenuComponent {

  • classes={self.is_active(AdminRoute::Dashboard)} - route=AppRoute::Admin(AdminRoute::Dashboard) + route={ AppRoute::Admin(AdminRoute::Dashboard) } > {"Dashboard"} > @@ -65,7 +65,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Works)} - route=AppRoute::Admin(AdminRoute::Works) + route={ AppRoute::Admin(AdminRoute::Works) } > {"Works"} > @@ -75,7 +75,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Books)} - route=AppRoute::Admin(AdminRoute::Books) + route={ AppRoute::Admin(AdminRoute::Books) } > {"Books"} > @@ -83,7 +83,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Chapters)} - route=AppRoute::Admin(AdminRoute::Chapters) + route={ AppRoute::Admin(AdminRoute::Chapters) } > {"Chapters"} > @@ -93,7 +93,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Publications)} - route=AppRoute::Admin(AdminRoute::Publications) + route={ AppRoute::Admin(AdminRoute::Publications) } > {"Publications"} > @@ -101,7 +101,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Publishers)} - route=AppRoute::Admin(AdminRoute::Publishers) + route={ AppRoute::Admin(AdminRoute::Publishers) } > {"Publishers"} > @@ -109,7 +109,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Imprints)} - route=AppRoute::Admin(AdminRoute::Imprints) + route={ AppRoute::Admin(AdminRoute::Imprints) } > {"Imprints"} > @@ -117,7 +117,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Contributors)} - route=AppRoute::Admin(AdminRoute::Contributors) + route={ AppRoute::Admin(AdminRoute::Contributors) } > {"Contributors"} > @@ -125,7 +125,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Serieses)} - route=AppRoute::Admin(AdminRoute::Serieses) + route={ AppRoute::Admin(AdminRoute::Serieses) } > {"Series"} > @@ -133,7 +133,7 @@ impl Component for MenuComponent {
  • classes={self.is_active(AdminRoute::Institutions)} - route=AppRoute::Admin(AdminRoute::Institutions) + route={ AppRoute::Admin(AdminRoute::Institutions) } > {"Institutions"} > diff --git a/thoth-app/src/component/mod.rs b/thoth-app/src/component/mod.rs index 3a52509a..b27f5e0a 100644 --- a/thoth-app/src/component/mod.rs +++ b/thoth-app/src/component/mod.rs @@ -34,12 +34,12 @@ macro_rules! pagination_helpers { html! { -
    +
    diff --git a/thoth-app/src/component/new_imprint.rs b/thoth-app/src/component/new_imprint.rs index 77db27e2..e5015b67 100644 --- a/thoth-app/src/component/new_imprint.rs +++ b/thoth-app/src/component/new_imprint.rs @@ -97,7 +97,7 @@ impl Component for NewImprintComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetPublishersFetchState(fetch_state) => { self.fetch_publishers.apply(fetch_state); @@ -190,7 +190,7 @@ impl Component for NewImprintComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_permissions = self.props.current_user.resource_access != props.current_user.resource_access; self.props = props; @@ -216,30 +216,30 @@ impl Component for NewImprintComponent {
    - + { let value = elem.value(); Msg::ChangePublisher(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
    diff --git a/thoth-app/src/component/new_institution.rs b/thoth-app/src/component/new_institution.rs index 1e0f1718..3603c779 100644 --- a/thoth-app/src/component/new_institution.rs +++ b/thoth-app/src/component/new_institution.rs @@ -100,7 +100,7 @@ impl Component for NewInstitutionComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetCountryCodesFetchState(fetch_state) => { self.fetch_country_codes.apply(fetch_state); @@ -244,7 +244,7 @@ impl Component for NewInstitutionComponent { } } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } @@ -264,37 +264,37 @@ impl Component for NewInstitutionComponent {
    - + { Msg::ChangeCountryCode(elem.value()) } _ => unreachable!(), - }) + }) } />
    diff --git a/thoth-app/src/component/new_publisher.rs b/thoth-app/src/component/new_publisher.rs index 5082e8b1..50f3d2ce 100644 --- a/thoth-app/src/component/new_publisher.rs +++ b/thoth-app/src/component/new_publisher.rs @@ -64,7 +64,7 @@ impl Component for NewPublisherComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetPublisherPushState(fetch_state) => { self.push_publisher.apply(fetch_state); @@ -134,7 +134,7 @@ impl Component for NewPublisherComponent { } } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } @@ -154,22 +154,22 @@ impl Component for NewPublisherComponent {
    - +
    diff --git a/thoth-app/src/component/new_series.rs b/thoth-app/src/component/new_series.rs index ee2fbb57..36c8c607 100644 --- a/thoth-app/src/component/new_series.rs +++ b/thoth-app/src/component/new_series.rs @@ -113,7 +113,7 @@ impl Component for NewSeriesComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetImprintsFetchState(fetch_state) => { self.fetch_imprints.apply(fetch_state); @@ -242,7 +242,7 @@ impl Component for NewSeriesComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_permissions = self.props.current_user.resource_access != props.current_user.resource_access; self.props = props; @@ -268,65 +268,65 @@ impl Component for NewSeriesComponent {
    - + { let value = elem.value(); Msg::ChangeSeriesType(SeriesType::from_str(&value).unwrap()) } _ => unreachable!(), - }) - data=self.data.series_types.clone() + }) } + data={ self.data.series_types.clone() } required = true /> { let value = elem.value(); Msg::ChangeImprint(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
    diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs index 9b6aa29b..2c9cf020 100644 --- a/thoth-app/src/component/new_work.rs +++ b/thoth-app/src/component/new_work.rs @@ -175,7 +175,7 @@ impl Component for NewWorkComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetImprintsFetchState(fetch_state) => { self.fetch_imprints.apply(fetch_state); @@ -434,7 +434,7 @@ impl Component for NewWorkComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_permissions = self.props.current_user.resource_access != props.current_user.resource_access; self.props = props; @@ -463,78 +463,78 @@ impl Component for NewWorkComponent {
    - +
    { let value = elem.value(); Msg::ChangeWorkType(WorkType::from_str(&value).unwrap()) } _ => unreachable!(), - }) + }) } required = true /> { let value = elem.value(); Msg::ChangeWorkStatus(WorkStatus::from_str(&value).unwrap()) } _ => unreachable!(), - }) + }) } required = true /> { let value = elem.value(); Msg::ChangeImprint(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
    @@ -552,13 +552,13 @@ impl Component for NewWorkComponent {
    @@ -568,27 +568,27 @@ impl Component for NewWorkComponent {
    @@ -596,25 +596,25 @@ impl Component for NewWorkComponent {
    @@ -622,62 +622,62 @@ impl Component for NewWorkComponent {
    diff --git a/thoth-app/src/component/notification.rs b/thoth-app/src/component/notification.rs index e95c371d..4b5874b8 100644 --- a/thoth-app/src/component/notification.rs +++ b/thoth-app/src/component/notification.rs @@ -4,7 +4,6 @@ use yew::Bridge; use yew::Component; use yew::ComponentLink; use yew::Html; -use yew::ShouldRender; use crate::agent::notification_bus::NotificationBus; use crate::agent::notification_bus::NotificationStatus; @@ -39,11 +38,11 @@ impl Component for NotificationComponent { } } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::Add(s) => { let notification = Notification { @@ -73,7 +72,7 @@ impl NotificationComponent { html! {
    { ¬ification.message } diff --git a/thoth-app/src/component/prices_form.rs b/thoth-app/src/component/prices_form.rs index 1e80121a..f11dd0be 100644 --- a/thoth-app/src/component/prices_form.rs +++ b/thoth-app/src/component/prices_form.rs @@ -98,7 +98,7 @@ impl Component for PricesFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -230,7 +230,7 @@ impl Component for PricesFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -252,33 +252,33 @@ impl Component for PricesFormComponent {
    -
    -
    +
    +

    { "New Price" }

    - { let value = elem.value(); Msg::ChangeCurrencyCode( @@ -286,16 +286,16 @@ impl Component for PricesFormComponent { ) } _ => unreachable!(), - }) + }) } required = true />
    @@ -309,7 +309,7 @@ impl Component for PricesFormComponent { @@ -367,7 +367,7 @@ impl PricesFormComponent {
    { REMOVE_BUTTON } diff --git a/thoth-app/src/component/publication.rs b/thoth-app/src/component/publication.rs index a6dae726..93ad9c66 100644 --- a/thoth-app/src/component/publication.rs +++ b/thoth-app/src/component/publication.rs @@ -102,7 +102,7 @@ impl Component for PublicationComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleModalFormDisplay(show_form) => { self.show_modal_form = show_form; @@ -291,7 +291,7 @@ impl Component for PublicationComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props = props; true } @@ -313,29 +313,30 @@ impl Component for PublicationComponent {

    { EDIT_BUTTON }

    @@ -437,15 +438,15 @@ impl Component for PublicationComponent { } diff --git a/thoth-app/src/component/publication_modal.rs b/thoth-app/src/component/publication_modal.rs index 64d6d1f5..20cbc46f 100644 --- a/thoth-app/src/component/publication_modal.rs +++ b/thoth-app/src/component/publication_modal.rs @@ -126,7 +126,7 @@ impl Component for PublicationModalComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::CloseModalForm => { // Prompt parent form to close this form by updating the props @@ -429,7 +429,7 @@ impl Component for PublicationModalComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_show_modal_form = self.props.show_modal_form != props.show_modal_form; self.props = props; if updated_show_modal_form { @@ -446,24 +446,24 @@ impl Component for PublicationModalComponent { Msg::CloseModalForm }); html! { -
    -
    +
    +

    { self.modal_form_title() }

    -
    + { let value = elem.value(); Msg::ChangePublicationType( @@ -471,16 +471,16 @@ impl Component for PublicationModalComponent { ) } _ => unreachable!(), - }) + }) } required = true /> { // Dimensions can only be added for physical (Paperback/Hardback) non-Chapter publications. @@ -490,11 +490,11 @@ impl Component for PublicationModalComponent { @@ -502,15 +502,15 @@ impl Component for PublicationModalComponent {
    @@ -518,15 +518,15 @@ impl Component for PublicationModalComponent {
    @@ -534,15 +534,15 @@ impl Component for PublicationModalComponent {
    @@ -550,15 +550,15 @@ impl Component for PublicationModalComponent {
    @@ -580,7 +580,7 @@ impl Component for PublicationModalComponent { diff --git a/thoth-app/src/component/publications_form.rs b/thoth-app/src/component/publications_form.rs index 6733fd54..047099bb 100644 --- a/thoth-app/src/component/publications_form.rs +++ b/thoth-app/src/component/publications_form.rs @@ -80,7 +80,7 @@ impl Component for PublicationsFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleModalFormDisplay(show_form, p) => { self.show_modal_form = show_form; @@ -180,7 +180,7 @@ impl Component for PublicationsFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -198,7 +198,7 @@ impl Component for PublicationsFormComponent {
    @@ -215,13 +215,13 @@ impl Component for PublicationsFormComponent { } } } @@ -332,7 +332,7 @@ impl PublicationsFormComponent {
    { EDIT_BUTTON } @@ -340,7 +340,7 @@ impl PublicationsFormComponent {
    { VIEW_BUTTON } @@ -348,7 +348,7 @@ impl PublicationsFormComponent {
    { REMOVE_BUTTON } diff --git a/thoth-app/src/component/publisher.rs b/thoth-app/src/component/publisher.rs index 71cd9612..bf54d190 100644 --- a/thoth-app/src/component/publisher.rs +++ b/thoth-app/src/component/publisher.rs @@ -98,7 +98,7 @@ impl Component for PublisherComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetPublisherFetchState(fetch_state) => { self.fetch_publisher.apply(fetch_state); @@ -257,7 +257,7 @@ impl Component for PublisherComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props = props; true } @@ -282,29 +282,29 @@ impl Component for PublisherComponent {

    - +
    diff --git a/thoth-app/src/component/related_works_form.rs b/thoth-app/src/component/related_works_form.rs index dc5c904a..80e8a044 100644 --- a/thoth-app/src/component/related_works_form.rs +++ b/thoth-app/src/component/related_works_form.rs @@ -139,7 +139,7 @@ impl Component for RelatedWorksFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -320,7 +320,7 @@ impl Component for RelatedWorksFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -336,7 +336,7 @@ impl Component for RelatedWorksFormComponent { { "Related Works" }

    -
    +

    @@ -346,9 +346,9 @@ impl Component for RelatedWorksFormComponent { placeholder="Search Work" aria-haspopup="true" aria-controls="works-menu" - oninput=self.link.callback(|e: InputData| Msg::SearchWork(e.value)) - onfocus=self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) - onblur=self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) + oninput={ self.link.callback(|e: InputData| Msg::SearchWork(e.value)) } + onfocus={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(true)) } + onblur={ self.link.callback(|_| Msg::ToggleSearchResultDisplay(false)) } /> @@ -383,34 +383,34 @@ impl Component for RelatedWorksFormComponent {

    -
    -
    +
    +

    { "New Related Work" }

    - { let value = elem.value(); Msg::ChangeRelationtype(RelationType::from_str(&value).unwrap()) } _ => unreachable!(), - }) - data=self.data.relation_types.clone() + }) } + data={ self.data.relation_types.clone() } required = true />
    @@ -421,10 +421,10 @@ impl Component for RelatedWorksFormComponent {
    @@ -438,7 +438,7 @@ impl Component for RelatedWorksFormComponent { @@ -508,7 +508,7 @@ impl RelatedWorksFormComponent {
    { VIEW_BUTTON } @@ -516,7 +516,7 @@ impl RelatedWorksFormComponent {
    { REMOVE_BUTTON } diff --git a/thoth-app/src/component/root.rs b/thoth-app/src/component/root.rs index fefbf0cf..55f5b9e8 100644 --- a/thoth-app/src/component/root.rs +++ b/thoth-app/src/component/root.rs @@ -105,7 +105,7 @@ impl Component for RootComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::FetchCurrentUser => { let task = self @@ -177,7 +177,7 @@ impl Component for RootComponent { true } - fn change(&mut self, _props: Self::Properties) -> ShouldRender { + fn changed(&mut self, _props: Self::Properties) -> bool { false } @@ -188,7 +188,7 @@ impl Component for RootComponent { html! { <>
    - +
    @@ -205,12 +205,12 @@ impl Component for RootComponent { }, AppRoute::Login => html! {
    - +
    }, AppRoute::Admin(admin_route) => html! {
    - +
    }, AppRoute::Error(Permissive(None)) => html! { diff --git a/thoth-app/src/component/series.rs b/thoth-app/src/component/series.rs index bf054ec1..5572774c 100644 --- a/thoth-app/src/component/series.rs +++ b/thoth-app/src/component/series.rs @@ -139,7 +139,7 @@ impl Component for SeriesComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::SetImprintsFetchState(fetch_state) => { self.fetch_imprints.apply(fetch_state); @@ -359,7 +359,7 @@ impl Component for SeriesComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { let updated_permissions = self.props.current_user.resource_access != props.current_user.resource_access; self.props = props; @@ -389,71 +389,71 @@ impl Component for SeriesComponent {

    -
    + { let value = elem.value(); Msg::ChangeSeriesType(SeriesType::from_str(&value).unwrap()) } _ => unreachable!(), - }) - data=self.data.series_types.clone() + }) } + data={ self.data.series_types.clone() } required = true /> { let value = elem.value(); Msg::ChangeImprint(Uuid::parse_str(&value).unwrap_or_default()) } _ => unreachable!(), - }) + }) } required = true />
    diff --git a/thoth-app/src/component/subjects_form.rs b/thoth-app/src/component/subjects_form.rs index edf8f709..7b848ab5 100644 --- a/thoth-app/src/component/subjects_form.rs +++ b/thoth-app/src/component/subjects_form.rs @@ -99,7 +99,7 @@ impl Component for SubjectsFormComponent { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::ToggleAddFormDisplay(value) => { self.show_add_form = value; @@ -237,7 +237,7 @@ impl Component for SubjectsFormComponent { } } - fn change(&mut self, props: Self::Properties) -> ShouldRender { + fn changed(&mut self, props: Self::Properties) -> bool { self.props.neq_assign(props) } @@ -259,33 +259,33 @@ impl Component for SubjectsFormComponent {
    -
    -
    +
    +

    { "New Subject" }

    - { let value = elem.value(); Msg::ChangeSubjectType( @@ -293,21 +293,21 @@ impl Component for SubjectsFormComponent { ) } _ => unreachable!(), - }) + }) } required = true />
    @@ -321,7 +321,7 @@ impl Component for SubjectsFormComponent { @@ -386,7 +386,7 @@ impl SubjectsFormComponent {
    { REMOVE_BUTTON } diff --git a/thoth-app/src/component/utils.rs b/thoth-app/src/component/utils.rs index 941e9275..81af85a1 100644 --- a/thoth-app/src/component/utils.rs +++ b/thoth-app/src/component/utils.rs @@ -389,8 +389,8 @@ impl PureComponent for PureInput { type={ self.input_type.clone() } placeholder={ self.label.clone() } value={ self.value.clone() } - oninput=self.oninput.clone() - onblur=self.onblur.clone() + oninput={ self.oninput.clone() } + onblur={ self.onblur.clone() } required={ self.required } step={ self.step.clone() } min={ self.min.clone() } @@ -410,9 +410,9 @@ impl PureComponent for PureTextarea {