Deeplink to resource - fix #1275 #1289
Conversation
| @@ -64,13 +72,16 @@ new Vue({ | |||
| /** | |||
| * Display a resource or a community ressource in a modal | |||
| */ | |||
| showResource(id, e, isCommunity) { | |||
| // Ensure edit button work | |||
| if ([e.target, e.target.parentNode].some(el => el.classList.contains('btn-edit'))) return; | |||
There was a problem hiding this comment.
Why this has been removed ?
| location.hash = `resource${communityPrefix}-${id}`; | ||
| const modal = this.$modal(ResourceModal, {resource}); | ||
| modal.$on('modal:closed', () => { | ||
| // prevent scrolling to top |
There was a problem hiding this comment.
Is this behavior common to all modals on close ?
Then maybe be we should issue a fix in a separate PR for this ?
There was a problem hiding this comment.
Nope, it's for this one only: since I set the location.hash with the current resource hash, I need to unset it when closing the modal. The #_ is just a trick to avoid the top scroll that would be triggered with #.
js/front/dataset/index.js
Outdated
| @@ -28,6 +28,9 @@ function parseUrl(url) { | |||
| return a; | |||
| } | |||
|
|
|||
| const RESOURCE_REGEX = /^#resource-([0-9a-f-]{36})$/; | |||
| const RESOURCE_COMMUNITY_REGEX = /^#resource-community-([0-9a-f-]{36})$/; | |||
There was a problem hiding this comment.
I think both regexp might be combined into a single one:
const RESOURCE_REGEX = /^#resource(?:-community)?-([0-9a-f-]{36})$/There was a problem hiding this comment.
const RESOURCE_REGEX = /^#resource(-community)?-([0-9a-f-]{36})$/ will permit to extract in a single pass the ID and the fact that's it's a community resource or not.
js/front/dataset/index.js
Outdated
| if (RESOURCE_REGEX.test(hash)) { | ||
| const [, id] = hash.match(RESOURCE_REGEX); | ||
| this.showResource(id, false); | ||
| } else if (RESOURCE_COMMUNITY_REGEX.test(hash)) { |
There was a problem hiding this comment.
If using a single regexp, you remove this else if
There was a problem hiding this comment.
With the single pass regex, you can write:
const [, isCommunity, id] = hash.match(RESOURCE_REGEX);
this.showResource(id, Boolean(isCommunity));| @@ -1,12 +1,17 @@ | |||
| {% set resource_format = resource.format|trim|lower or 'data' %} | |||
| <div id="resource-{{resource.id}}" class="list-group-item" | |||
| <div id="resource{% if resource.from_community %}-community{% endif %}-{{resource.id}}" class="list-group-item" | |||
There was a problem hiding this comment.
Hum, this distinction comes from this.
As ressources IDs (including community ressources) are unique and behavior is stricly the same, is this really necessary to have distinct ID pattern ?
There was a problem hiding this comment.
I need the distinction to use showResource that expects a isCommunity parameter, apparently in order to fetch the right resource in the JSON-LD.
The only alternative I can think of right now is to try to find the resource by id in both dataset[resources] and dataset[communityResources]. I'm not sure it's a better alternative.
| @@ -28,7 +33,7 @@ <h4 class="list-group-item-heading ellipsis"> | |||
| {% set edit_path = 'dataset/{id}/resource/{rid}' %} | |||
| {% endif %} | |||
| <div class="btn-group btn-group-xs tools"> | |||
| <a class="btn btn-default btn-edit" v-tooltip title="{{ _('Edit') }}" | |||
| <a @click.stop class="btn btn-default btn-edit" v-tooltip title="{{ _('Edit') }}" | |||
There was a problem hiding this comment.
OMG, is this working ? If so I understand the above removal !! 😍
There was a problem hiding this comment.
Yep, it should work ;-) At least it does on my machine.
|
The link icon I'm talking about above:
|
abulte
force-pushed
the
gh-1275-community-resource-deeplink
branch
from
e946085
to
bdb66a6
Compare
This PR allows to make a deep link to a resource – community or standard.
A few points open to discussion:
location.hash– still, this seems to do the jobNB: the previous logic above https://github.com/opendatateam/udata/compare/master...abulte:gh-1275-community-resource-deeplink?expand=1#diff-50704b3aa6249195308d85bc02bc10acL70 should now be handled by
.stopand.preventmodifiers on@clickevents.