From 8b6318028a19702529c443fb4019f207f4cce663 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 7 Apr 2021 13:29:39 +0200 Subject: [PATCH 1/6] fix: search by contact fullname --- src/views/partials/menu-left.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index ffe7fca..2d59e0a 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -2,7 +2,7 @@ solid-form-search.icon.children-icon-magnifier( id='general-search' class='segment block form menu-search' fields='name' - search-name='circle.name, project.customer.name, project.name, contact.username' + search-name='circle.name, project.customer.name, project.name, contact.username, contact.name' order-asc-names='name' label-name='Rechercher' From 2febc01b7c14d2e3205f7ee613d8d52b31a7cff3 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:42:28 +0200 Subject: [PATCH 2/6] bugfix: sib-ressource endpoints values --- src/views/page-resources.pug | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/page-resources.pug b/src/views/page-resources.pug index 0c98992..f90d0f2 100644 --- a/src/views/page-resources.pug +++ b/src/views/page-resources.pug @@ -1,7 +1,10 @@ div.whitespace-normal - solid-resource(data-src=`${component.endpoints.resources}` - range-resource-type=`${component.endpoints.resourcestypes}` - range-resource-keyword=`${component.endpoints.resourceskeywords}` + solid-resource(data-src=`${component.endpoints.get}` + post-data-src=`${component.endpoints.post}` + range-resource-type=`${component.endpoints.types}` + post-data-type-src=`${component.endpoints.postTypes}` + range-resource-keyword=`${component.endpoints.keywords}` + post-data-keyword-src=`${component.endpoints.postKeywords}` range-resource-circle=`${getComponent('circles').endpoints.get}/` associated-circle-label="" data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}` From 7b7b2a938e0a1fd35e026dade8a83b1d93b31572 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:45:26 +0200 Subject: [PATCH 3/6] doc: update config.json sample for resource --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c58877a..68c35ea 100644 --- a/README.md +++ b/README.md @@ -525,12 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "http://server.url/resources/", - "post": "http://server.url/resources/", - "types": "http://server.url/keywords/", - "keywords": "http://server.url/types/", - "postTypes": "http://server.url/keywords/", - "postKeywords": "http://server.url/types/" + "get": "https://api.test4.startinblox.com/resources/", + "post": "https://api.test4.startinblox.com/resources/", + "types": "https://api.test4.startinblox.com/types/", + "keywords": "https://api.test4.startinblox.com/keywords/", + "postTypes": "https://api.test4.startinblox.com/types/", + "postKeywords": "https://api.test4.startinblox.com/keywords/", + "uploads": "https://api.test4.startinblox.com/upload/" } } ``` From 6f85094bbb89c390669d05a33e8c485ebf67a933 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:54:19 +0200 Subject: [PATCH 4/6] doc: update config.json sample for resource with https://server.url --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 68c35ea..497490c 100644 --- a/README.md +++ b/README.md @@ -525,13 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "https://api.test4.startinblox.com/resources/", - "post": "https://api.test4.startinblox.com/resources/", - "types": "https://api.test4.startinblox.com/types/", - "keywords": "https://api.test4.startinblox.com/keywords/", - "postTypes": "https://api.test4.startinblox.com/types/", - "postKeywords": "https://api.test4.startinblox.com/keywords/", - "uploads": "https://api.test4.startinblox.com/upload/" + "get": "https://server.url/resources/", + "post": "https://server.url/resources/", + "types": "https://server.url/types/", + "keywords": "https://server.url/keywords/", + "postTypes": "https://server.url/types/", + "postKeywords": "https://server.url/keywords/", + "uploads": "https://server.url/upload/" } } ``` From e901804af4446e6889bd8c6db89dadbe5c4a1381 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Wed, 7 Apr 2021 06:50:58 +0200 Subject: [PATCH 5/6] update: bump resource to valid version 3.1 --- src/dependencies.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 283c1a3..d530a0f 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -43,9 +43,8 @@ if componentSet.has("profileDirectory") script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@5.1" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) -//- Disabled - Not in core@0.16 if componentSet.has("resources") - script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.0", defer) + script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.1", defer) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer) if componentSet.has("themeChecker") From 9a747b6ab5d97fff7ba048f6cd0bd44af1fb9650 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 6 Apr 2021 16:05:56 +0000 Subject: [PATCH 6/6] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 497490c..5ab7d75 100644 --- a/README.md +++ b/README.md @@ -525,13 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "https://server.url/resources/", - "post": "https://server.url/resources/", - "types": "https://server.url/types/", - "keywords": "https://server.url/keywords/", - "postTypes": "https://server.url/types/", - "postKeywords": "https://server.url/keywords/", - "uploads": "https://server.url/upload/" + "get": "http://server.url/resources/", + "post": "http://server.url/resources/", + "types": "http://server.url/types/", + "keywords": "http://server.url/keywords/", + "postTypes": "http://server.url/types/", + "postKeywords": "http://server.url/keywords/", + "uploads": "http://server.url/upload/" } } ```