').text('Inherited attributes');
- return this.$title;
+ renderTitle(note) {
+ const inheritedAttributes = this.getInheritedAttributes(note);
+
+ this.$title.text(`Inherited attrs (${inheritedAttributes.length})`);
+
+ return {
+ show: true,
+ $title: this.$title
+ };
}
doRender() {
@@ -37,12 +43,19 @@ export default class InheritedAttributesWidget extends TabAwareWidget {
this.$container = this.$widget.find('.inherited-attributes-container');
this.$widget.append(this.attributeDetailWidget.render());
+
+ this.$title = $('
');
}
async refreshWithNote(note) {
this.$container.empty();
- const inheritedAttributes = note.getAttributes().filter(attr => attr.noteId !== this.noteId);
+ const inheritedAttributes = this.getInheritedAttributes(note);
+
+ if (inheritedAttributes.length === 0) {
+ this.$container.append("No inherited attributes.");
+ return;
+ }
for (const attribute of inheritedAttributes) {
const $attr = (await attributeRenderer.renderAttribute(attribute, false))
@@ -63,4 +76,8 @@ export default class InheritedAttributesWidget extends TabAwareWidget {
.append(" ");
}
}
+
+ getInheritedAttributes(note) {
+ return note.getAttributes().filter(attr => attr.noteId !== this.noteId);
+ }
}
diff --git a/src/public/app/widgets/owned_attribute_list.js b/src/public/app/widgets/owned_attribute_list.js
index 11b5d38c1..c2b1fab92 100644
--- a/src/public/app/widgets/owned_attribute_list.js
+++ b/src/public/app/widgets/owned_attribute_list.js
@@ -8,6 +8,7 @@ const TPL = `
.attribute-list {
margin-left: 7px;
margin-right: 7px;
+ margin-top: 3px;
position: relative;
}
@@ -30,9 +31,15 @@ export default class OwnedAttributeListWidget extends TabAwareWidget {
this.child(this.attributeEditorWidget, this.attributeDetailWidget);
}
- renderTitle() {
- this.$title = $('
').text('Owned attributes');
- return this.$title;
+ renderTitle(note) {
+ const ownedNotes = note.getAttributes().filter(attr => attr.noteId === this.noteId)
+
+ this.$title.text(`Owned attrs (${ownedNotes.length})`);
+
+ return {
+ show: true,
+ $title: this.$title
+ };
}
doRender() {
@@ -41,6 +48,8 @@ export default class OwnedAttributeListWidget extends TabAwareWidget {
this.$widget.find('.attr-editor-placeholder').replaceWith(this.attributeEditorWidget.render());
this.$widget.append(this.attributeDetailWidget.render());
+
+ this.$title = $('
');
}
async saveAttributesCommand() {
@@ -58,6 +67,8 @@ export default class OwnedAttributeListWidget extends TabAwareWidget {
entitiesReloadedEvent({loadResults}) {
if (loadResults.getAttributes(this.componentId).find(attr => attr.isAffecting(this.note))) {
this.refreshWithNote(this.note, true);
+
+ this.renderTitle(this.note);
}
}
}
diff --git a/src/public/app/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js
index 7db504519..94d7816f0 100644
--- a/src/public/app/widgets/promoted_attributes.js
+++ b/src/public/app/widgets/promoted_attributes.js
@@ -39,11 +39,24 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
this.$widget = $(TPL);
this.overflowing();
this.$container = this.$widget.find(".promoted-attributes-container");
+
+ this.$title = $('
');
}
- renderTitle() {
- this.$title = $('
').text('Promoted attributes');
- return this.$title;
+ renderTitle(note) {
+ const promotedDefAttrs = this.getPromotedDefinitionAttributes();
+
+ if (promotedDefAttrs.length === 0) {
+ return { show: false };
+ }
+
+ this.$title.text(`Promoted attrs (${promotedDefAttrs.length})`);
+
+ return {
+ show: true,
+ activate: true,
+ $title: this.$title
+ };
}
async refreshWithNote(note) {
@@ -292,6 +305,8 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
entitiesReloadedEvent({loadResults}) {
if (loadResults.getAttributes(this.componentId).find(attr => attr.isAffecting(this.note))) {
this.refresh();
+
+ this.renderTitle(this.note);
}
}
}