Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@Severino
Severino committed Aug 8, 2024
1 parent c7eff8f commit a697bbf
Show file tree
Hide file tree
Showing 5 changed files with 481 additions and 378 deletions.
2 changes: 2 additions & 0 deletions resources/js/bootstrap/font.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ import {
faComments,
faCopy,
faCopyright,
faCube,
faCubes,
faDatabase,
faDiagramNext,
Expand Down Expand Up @@ -298,6 +299,7 @@ library.add(
faComments,
faCopy,
faCopyright,
faCube,
faCubes,
faDatabase,
faDiagramNext,
Expand Down
66 changes: 41 additions & 25 deletions resources/js/components/AttributeList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -127,7 +127,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -136,7 +136,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -145,7 +145,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -154,7 +154,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -163,7 +163,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -172,23 +172,23 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

<serial-attribute
v-else-if="element.datatype == 'serial'"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
/>

<list-attribute
v-else-if="element.datatype == 'list'"
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:entries="state.attributeValues[element.id].value || []"
:entries="fixedValue(element) || []"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -197,7 +197,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:epochs="selections[element.id] || []"
:type="element.datatype"
@change="e => updateDirtyState(e, element.id)"
Expand All @@ -208,7 +208,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value || {}"
:value="fixedValue(element) || {}"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -217,7 +217,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:metadata="element.metadata"
@change="e => updateDirtyState(e, element.id)"
/>
Expand All @@ -227,7 +227,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:attribute="element"
:selections="selections"
:preview-columns="preview ? previewData[element.id] : null"
Expand All @@ -240,7 +240,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:attribute="element"
@change="e => updateDirtyState(e, element.id)"
/>
Expand All @@ -250,7 +250,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:attribute="element"
@change="e => updateDirtyState(e, element.id)"
/>
Expand All @@ -260,7 +260,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:attribute="element"
@change="e => updateDirtyState(e, element.id)"
/>
Expand All @@ -282,7 +282,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -291,7 +291,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -300,7 +300,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
:selections="selections[element.id] || []"
:selection-from="element.root_attribute_id"
:selection-from-value="state.rootAttributeValues[element.root_attribute_id]"
Expand All @@ -313,7 +313,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixMultiChoice(element)"
:selections="selections[element.id] || []"
@change="e => updateDirtyState(e, element.id)"
/>
Expand All @@ -323,7 +323,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand All @@ -332,15 +332,15 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

<sql-attribute
v-else-if="element.datatype == 'sql'"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
/>

<system-separator-attribute
Expand All @@ -354,7 +354,7 @@
:ref="el => setRef(el, element.id)"
:disabled="element.isDisabled || state.hiddenAttributeList[element.id] || isDisabledInModeration(element.id)"
:name="`attr-${element.id}`"
:value="state.attributeValues[element.id].value"
:value="fixedValue(element)"
@change="e => updateDirtyState(e, element.id)"
/>

Expand Down Expand Up @@ -581,7 +581,7 @@
expClasses[itm] = true;
});
}
return expClasses;
};
const onAttributeExpand = (e, i) => {
Expand Down Expand Up @@ -789,6 +789,8 @@
};
const hasComment = attribute => {
if(!state.attributeValues[attribute.id]) return false;
return state.attributeValues[attribute.id].comments_count > 0;
};
const hasBookmarks = attribute => {
Expand Down Expand Up @@ -830,6 +832,7 @@
}
};
const attrs = context.attrs;
// DATA
const attrRefs = ref({});
Expand Down Expand Up @@ -868,6 +871,17 @@
ignoreMetadata: computed(_ => options.value.ignore_metadata),
itemClasses: computed(_ => options.value.item_classes),
});
const fixedValue = (element, defaultValue = null) => {
return state.attributeValues[element.id]?.value ?? defaultValue;
};
const fixMultiChoice = element => {
const value = fixedValue(element);
if(!value || value === '') return [];
return value;
};
// ON MOUNTED
onMounted(_ => {
Expand All @@ -889,6 +903,8 @@
translateConcept,
// LOCAL
certainty,
fixedValue,
fixMultiChoice,
handleSelectionUpdate,
clFromMetadata,
attributeClasses,
Expand Down
Loading

0 comments on commit a697bbf

Please sign in to comment.