Skip to content
Snippets Groups Projects
Commit 284e57d6 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-fix-hidden-prop-in-preview' into 'dev'

F fix hidden prop in preview

See merge request !92
parents a57093ba c1ad9248
No related branches found
No related tags found
1 merge request!92F fix hidden prop in preview
Pipeline #32982 passed
...@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
* [#194](https://gitlab.com/caosdb/caosdb-webui/-/issues/194) - Properties
remain hidden in previews of referenced entities
### Security ### Security
### Documentation ### Documentation
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* @requires log (singleton from loglevel library) * @requires log (singleton from loglevel library)
* @requires load_config (function from webcaosdb.js) * @requires load_config (function from webcaosdb.js)
*/ */
var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, getPropertyElements, getPropertyName, getUserName, getUserRoles, logger, load_config, query) { var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, getPropertyElements, getPropertyName, getUserName, getUserRoles, logger, load_config, preview, query) {
/** /**
* Return the property-display config file; `ext_prop_display.json` by * Return the property-display config file; `ext_prop_display.json` by
...@@ -213,10 +213,17 @@ var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, get ...@@ -213,10 +213,17 @@ var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, get
document.body.addEventListener(edit_mode.start_edit.type, (e) => { document.body.addEventListener(edit_mode.start_edit.type, (e) => {
edit_mode.app.onAfterShowResults = this._displayPropertiesWrapper(edit_mode.app.onAfterShowResults, conf, allTypes); edit_mode.app.onAfterShowResults = this._displayPropertiesWrapper(edit_mode.app.onAfterShowResults, conf, allTypes);
}, true); }, true);
// After showing a preview for the first time, its entity card is
// added to the dom tree, so the properties have to be (un)hidden
// afterwards.
document.body.addEventListener(preview.previewReadyEvent.type, (e) => {
let newEntities = $(".caosdb-entity-preview");
this.displayProperties(newEntities, conf, allTypes, userName, userRoles);
}, true);
} else { } else {
// There are no properties to be hidden, so make this clear in HTML body // There are no properties to be hidden, so make this clear in HTML body
$("body").attr("data-hidden-properties", "false") $("body").attr("data-hidden-properties", "false");
this.unhideAllProperties(); this.unhideAllProperties();
document.body.addEventListener(edit_mode.start_edit.type, (e) => { document.body.addEventListener(edit_mode.start_edit.type, (e) => {
// also unhide properties when leaving the edit mode // also unhide properties when leaving the edit mode
...@@ -226,9 +233,10 @@ var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, get ...@@ -226,9 +233,10 @@ var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, get
// entity or canceling the edit. // entity or canceling the edit.
edit_mode.app.onAfterShowResults = this._unhideAllPropertiesWrapper(edit_mode.app.onAfterShowResults); edit_mode.app.onAfterShowResults = this._unhideAllPropertiesWrapper(edit_mode.app.onAfterShowResults);
}, true); }, true);
document.body.addEventListener(preview.previewReadyEvent.type, (e) => this.unhideAllProperties(), true);
} }
} }
}($, edit_mode, getEntityName, getEntityRole, getPropertyElements, getPropertyName, getUserName, getUserRoles, log.getLogger("ext_prop_display"), load_config, query); }($, edit_mode, getEntityName, getEntityRole, getPropertyElements, getPropertyName, getUserName, getUserRoles, log.getLogger("ext_prop_display"), load_config, preview, query);
$(document).ready(() => { $(document).ready(() => {
if ("${BUILD_MODULE_EXT_PROPERTY_DISPLAY}" == "ENABLED") { if ("${BUILD_MODULE_EXT_PROPERTY_DISPLAY}" == "ENABLED") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment