- Bow-commits - mailman.cloud.codelutin.com

01/01: on force la base sur une machine a 2 cpu
by chorem.org scm 02 Jun '20

02 Jun '20

This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 5d719b8e513d9711cf823f9928f81f848ac5475a Author: Benjamin <poussin(a)codelutin.com> Date: Tue Jun 2 22:28:15 2020 +0200 on force la base sur une machine a 2 cpu --- docker/docker-compose.yml | 1 + web/src/views/Preferences.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2f5b12e..9ace5fa 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -30,6 +30,7 @@ services: placement: constraints: - node.labels.function==saas + - node.labels.hosttype=s1-8 resources: # limits: # cpus: '0.60' diff --git a/web/src/views/Preferences.vue b/web/src/views/Preferences.vue index 66ef911..034106c 100644 --- a/web/src/views/Preferences.vue +++ b/web/src/views/Preferences.vue @@ -1,7 +1,7 @@ <template> <div class="preferences"> <div>{{ errorMsg }}</div> - <a :href="bookmarkletAdd">bookmarklet add</a> + <a :href="bookmarkletAdd">bookmarklet add</a>Add this link to your toolbar browser to easily add bookmark. Select some text in page, and click on it, in your toolbar browser. <MaxResultEditor></MaxResultEditor> <MaxTagInCloudEditor></MaxTagInCloudEditor> <Actions :actions="user.actions"></Actions> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch bow-v2-go updated (7b1a18d -> 5d719b8)
by chorem.org scm 02 Jun '20

02 Jun '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 7b1a18d correction recherche par tag depuis le navigateur new 5d719b8 on force la base sur une machine a 2 cpu The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5d719b8e513d9711cf823f9928f81f848ac5475a Author: Benjamin <poussin(a)codelutin.com> Date: Tue Jun 2 22:28:15 2020 +0200 on force la base sur une machine a 2 cpu Summary of changes: docker/docker-compose.yml | 1 + web/src/views/Preferences.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch bow-v2-go updated (2a0232e -> 7b1a18d)
by chorem.org scm 02 Jun '20

02 Jun '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 2a0232e ajout delai avant enregistrement maxResult et MaxTagInCloud new 7b1a18d correction recherche par tag depuis le navigateur The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b1a18dc5e2fc8d384e814dec17e42c0faa08b23 Author: Benjamin <poussin(a)codelutin.com> Date: Tue Jun 2 18:22:47 2020 +0200 correction recherche par tag depuis le navigateur Summary of changes: web/src/views/Home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (ddd9ad6 -> 2a0232e)
by chorem.org scm 30 May '20

30 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from ddd9ad6 correction recup pour l'edition new 53df464 ajout de la config du nombre de tag dans le cloud new dfee8c8 suppression du beforeMount qui ne sert plus avec les computed properties (diminution du nombre d'appel au back) new 2a0232e ajout delai avant enregistrement maxResult et MaxTagInCloud The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2a0232e8aab6f8d7256faddc1ff2b44212770161 Author: Benjamin <poussin(a)codelutin.com> Date: Sun May 31 01:08:09 2020 +0200 ajout delai avant enregistrement maxResult et MaxTagInCloud commit dfee8c8d915759f11c3eaf1e03a29fdd60c53a27 Author: Benjamin <poussin(a)codelutin.com> Date: Sun May 31 01:07:34 2020 +0200 suppression du beforeMount qui ne sert plus avec les computed properties (diminution du nombre d'appel au back) commit 53df46493c2f16860289292a84f28785173229a6 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 23:54:19 2020 +0200 ajout de la config du nombre de tag dans le cloud Summary of changes: pkg/repository/bookmarkRepository.go | 2 +- pkg/repository/database.go | 19 +++---- web/src/components/common/TagsInput.vue | 5 -- web/src/components/preferences/MaxResultEditor.vue | 41 +++++++++----- .../components/preferences/MaxTagInCloudEditor.vue | 63 ++++++++++++++++++++++ web/src/views/Preferences.vue | 6 ++- 6 files changed, 105 insertions(+), 31 deletions(-) create mode 100644 web/src/components/preferences/MaxTagInCloudEditor.vue -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch bow-v2-go updated (ec307ef -> ddd9ad6)
by chorem.org scm 28 May '20

28 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from ec307ef correction index fulltext new 62e9ac8 ajout d'une minidoc pour la recherche fulltext new ddd9ad6 correction recup pour l'edition The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ddd9ad64dd250b4802c7c70ab80687fa4f7e5e48 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 23:23:29 2020 +0200 correction recup pour l'edition commit 62e9ac859aa86213db91fe77365b59b96a2f1eac Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 03:14:34 2020 +0200 ajout d'une minidoc pour la recherche fulltext Summary of changes: pkg/http/bookmarkResource.go | 3 +++ pkg/repository/bookmarkRepository.go | 2 +- web/src/components/SearchInput.vue | 2 +- web/src/views/BookmarkEdit.vue | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch bow-v2-go updated (578fd07 -> ec307ef)
by chorem.org scm 28 May '20

28 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 578fd07 ajout des highlighted sur la description et les tags pour expliquer la presence du bookmark dans les resultats new e434b91 correction pour que le highlight prenne l'ensemble du text new ec307ef correction index fulltext The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ec307efcc9957ceef37c274ff6b9bc1124aac3f7 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 03:06:27 2020 +0200 correction index fulltext commit e434b91be719efe19469f6aa3d7d587aaefac2a4 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 02:48:28 2020 +0200 correction pour que le highlight prenne l'ensemble du text Summary of changes: migrate/001_init_schema.sql | 2 +- pkg/repository/bookmarkRepository.go | 36 ++++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

01/02: correction pour que le highlight prenne l'ensemble du text
by chorem.org scm 28 May '20

28 May '20

This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit e434b91be719efe19469f6aa3d7d587aaefac2a4 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 02:48:28 2020 +0200 correction pour que le highlight prenne l'ensemble du text --- pkg/repository/bookmarkRepository.go | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkg/repository/bookmarkRepository.go b/pkg/repository/bookmarkRepository.go index d212e91..624dd3c 100644 --- a/pkg/repository/bookmarkRepository.go +++ b/pkg/repository/bookmarkRepository.go @@ -39,6 +39,8 @@ func BookmarkJSON(currentUser model.BowUser, id string, uri string, tags []strin orderDirection = "desc" } + tagsJoined := strings.Join(tags, ",") + log.Printf("search bookmark id: %v, uri: %v, tags: '%v', fulltext: '%v', orderBy: %v, orderAsc: %v, first:%v", id, uri, tags, fulltext, orderBy, orderAsc, first) var mainQuery string if id != "" { @@ -48,18 +50,29 @@ func BookmarkJSON(currentUser model.BowUser, id string, uri string, tags []strin } else { // si fulltext and vide, aucun resultat n'est retourne, ce n'est pas ce qu'on veut // dans ce cas, on souhaite que la recherche ne porte que sur les tags - var queryEmptyFulltext string - // highlighted description => hldescription - var hl string - if (fulltext == "") { + queryEmptyFulltext := "" + if fulltext == "" { queryEmptyFulltext = "true OR " - hl = "" - } else { - queryEmptyFulltext = "" - hl = `, - ts_headline(description, websearch_to_tsquery($2)) AS hldescription, - ts_headline(text(tags), websearch_to_tsquery($2))::text[] AS hltags` } + + // highlighted description => hldescription + hl := "" + // il faut que fulltext ou tags soit non vide pour mettre en highlighted les tags + hitags := make([]string, 0, 2) + if fulltext != "" { + hl = `, ts_headline(description, websearch_to_tsquery($2), 'HighlightAll=true') AS hldescription` + hitags = append(hitags, `websearch_to_tsquery($2)`) + } + + if tagsJoined != "" { + hitags = append(hitags, `plainto_tsquery($1)`) + } + + hitagsJoined := strings.Join(hitags, " || ") + if hitagsJoined != "" { + hl = fmt.Sprintf(`%s, string_to_array(ts_headline(array_to_string(tags, ','), %s, 'HighlightAll=true'), ',') AS hltags`, hl, hitagsJoined) + } + // vu qu'on veut utiliser l'index fulltext créer, il faut les meme champs dans la requete (to_tsvector) mainQuery = fmt.Sprintf(`select *%s @@ -70,7 +83,6 @@ func BookmarkJSON(currentUser model.BowUser, id string, uri string, tags []strin `, hl, queryEmptyFulltext) } - tagsJoined := strings.Join(tags, ",") q := &query{sql: fmt.Sprintf(`WITH __query AS (%[5]s), __info AS (select %[3]d as first, %[4]d as limit, count(id) as total, '%[1]s' as orderby, to_json('%[2]s' <> 'desc') as orderasc, string_to_array($1, ',') as tags, $2::TEXT as fulltext, $3::TEXT as uri, $4::TEXT as id from __query), -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch bow-v2-go updated (2b06147 -> 578fd07)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 2b06147 ajout de la recherche fulltext new 578fd07 ajout des highlighted sur la description et les tags pour expliquer la presence du bookmark dans les resultats The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 578fd07bef814a2a9a1baf6c451ad801b7c56d03 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 01:24:27 2020 +0200 ajout des highlighted sur la description et les tags pour expliquer la presence du bookmark dans les resultats Summary of changes: pkg/repository/bookmarkRepository.go | 18 ++++++++++++++---- web/src/components/Bookmark.vue | 8 ++++++-- web/src/components/bookmark/Description.vue | 2 +- web/src/components/bookmark/Tags.vue | 5 +++-- web/src/components/common/TagsInput.vue | 1 - web/src/main.js | 10 ++++++---- 6 files changed, 30 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (be790d5 -> 2b06147)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from be790d5 modif du form de query pour permettre au navigateur firefox android de l'utiliser comme moteur de recherche new 697eb0d vu que sur firefox android il ne fait pas d'appel pour le suggest, pas besoin du token dans l'url new 180246a ajustement style du header new 2b06147 ajout de la recherche fulltext The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2b0614716253838ff069b52890b1c6227f7fdde2 Author: Benjamin <poussin(a)codelutin.com> Date: Thu May 28 00:28:53 2020 +0200 ajout de la recherche fulltext commit 180246a144a5fbc360221c2cc1d1948ad5e4cf4d Author: Benjamin <poussin(a)codelutin.com> Date: Wed May 27 22:59:23 2020 +0200 ajustement style du header commit 697eb0d52d0725a9ec9cd026973ebca009fcc3d3 Author: Benjamin <poussin(a)codelutin.com> Date: Wed May 27 22:34:16 2020 +0200 vu que sur firefox android il ne fait pas d'appel pour le suggest, pas besoin du token dans l'url Summary of changes: pkg/repository/bookmarkRepository.go | 13 ++++++- web/src/components/SearchInput.vue | 69 ++++++++++++++++++++---------------- web/src/components/layout/Header.vue | 30 +++++----------- web/src/utils/FetchHelper.js | 9 ----- 4 files changed, 60 insertions(+), 61 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch bow-v2-go updated (f6f40d7 -> be790d5)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from f6f40d7 correction dans la requete sql new be790d5 modif du form de query pour permettre au navigateur firefox android de l'utiliser comme moteur de recherche The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit be790d56eec8b7f6b4cbd72a7f099982e7abbe88 Author: Benjamin <poussin(a)codelutin.com> Date: Wed May 27 22:24:42 2020 +0200 modif du form de query pour permettre au navigateur firefox android de l'utiliser comme moteur de recherche Summary of changes: web/src/components/SearchInput.vue | 17 ++--------------- web/src/utils/FetchHelper.js | 9 +++++++++ 2 files changed, 11 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1