From a987ede7c9034273e58be44526a029fabc0f2a7c Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 15 Dec 2020 20:20:32 +0100 Subject: [PATCH 1/4] Avoid server roundtrip when switching pages When changing pages in webui a server request should not happen. This makes the webapp snappy again. Issue: #508 --- modules/webapp/src/main/elm/App/Update.elm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm index 604a24fb..bd43e4d7 100644 --- a/modules/webapp/src/main/elm/App/Update.elm +++ b/modules/webapp/src/main/elm/App/Update.elm @@ -178,8 +178,11 @@ updateWithSub msg model = page = Page.fromUrl url |> Maybe.withDefault (defaultPage model.flags) + + ( m, c, s ) = + initPage model page in - ( model, Page.goto page, Sub.none ) + ( { m | page = page }, c, s ) ToggleNavMenu -> ( { model From ae1bb46ae9b3306b7b168fc142d90f3ecd084885 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 15 Dec 2020 20:25:51 +0100 Subject: [PATCH 2/4] Update changelog --- Changelog.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Changelog.md b/Changelog.md index 570b47ba..cfc9a2e4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,16 @@ # Changelog +## v0.17.1 + +*Dec 15, 2020* + +An unfortunate bug has made it into the previous release that makes +the webapp near unusable. Therefore this release, containing only the +fix for #508. + +Sorry for the inconvenience! + + ## v0.17.0 *Dec 14, 2020* From 14428c0eade63b1de1ebeb0cb0b8bd5f0b4f84ef Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 15 Dec 2020 20:22:05 +0100 Subject: [PATCH 3/4] Set version to 0.17.1 --- modules/joexapi/src/main/resources/joex-openapi.yml | 2 +- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- version.sbt | 2 +- website/site/config.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index 831ecacc..e36998bf 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.17.0 + version: 0.17.1 servers: - url: /api/v1 diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index d4f2dc5c..0f477b6d 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.17.0 + version: 0.17.1 description: | This is the remote API to Docspell, a personal document organizer. diff --git a/version.sbt b/version.sbt index 48456ba3..74835c38 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.17.0" +version in ThisBuild := "0.17.1" diff --git a/website/site/config.toml b/website/site/config.toml index 40b17961..31a60dd7 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.17.0" +version = "0.17.1" From e8433be8625785ce22fa7d0124b26497f84f26a2 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 15 Dec 2020 20:43:01 +0100 Subject: [PATCH 4/4] Update nix package --- nix/release.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nix/release.nix b/nix/release.nix index cd06c76a..90e8f2d4 100644 --- a/nix/release.nix +++ b/nix/release.nix @@ -1,5 +1,20 @@ rec { cfg = { + v0_17_1 = rec { + version = "0.17.1"; + server = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip"; + sha256 = "1mvzpf8cpc3kwlvvyib2gmbnls6dic7f7z525nvg7v2pm80yy1r5"; + }; + joex = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip"; + sha256 = "0ymi2smwd5m0jqb6jrnld3xralyrq77h9r6m639wiwjdf4ka8s4a"; + }; + tools = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip"; + sha256 = "1fncqw7aif1nv03cjckn401ykbm785hkiws00wbv2qmakymxl5y4"; + }; + }; v0_16_0 = rec { version = "0.16.0"; server = { @@ -257,7 +272,7 @@ rec { }; }; pkg = v: import ./pkg.nix v; - currentPkg = pkg cfg.v0_16_0; + currentPkg = pkg cfg.v0_17_1; module-joex = ./module-joex.nix; module-restserver = ./module-server.nix; module-consumedir = ./module-consumedir.nix;