cleaning up

Author: KittyJose

packages/tdb-documents-ui/src/arrayFrames/arrayType.utils.js

@@ -43,7 +43,7 @@ export function getUILayout(frame, item, uiFrame, mode, formData, documentation)
     }
     else {
         // Create and Edit 
-        uiLayout=helper.getArrayUILayout(frame, item, documentation)
+        uiLayout=helper.getArrayUILayout(frame, item, mode, documentation)
     }
 
     // custom ui:schema - add to default ui schema

packages/tdb-documents-ui/src/arrayFrames/helpers.js

@@ -21,7 +21,7 @@ export function gatherItemsLayout (frame, item, mode, formData) {
 
             if (frame.properties[item].info === CONST.CHOICESUBCLASSES) {
                 // choice sub documents
-                return getChoiceSubDocumentsArrayItems(frame, item, formData)
+                return getChoiceSubDocumentsArrayItems(frame, item, formData, mode)
             }
             else if (frame.properties[item].info === CONST.ONEOFVALUES) {
                 return getOneOfTypeArrayItems(frame, item, formData)
@@ -59,21 +59,40 @@ export function extractAdditionalLayout (frame, item) {
 } 
 
 
+
+function getAdditionalUI(ui, mode) {
+    let uiLayout={}
+    for(let item in ui) {
+        if(ui[item].hasOwnProperty("ui:readonly")) {
+            uiLayout[item]={}
+            for(let subItems in ui[item]) {
+                if(subItems === "ui:readonly") {
+                    uiLayout[item][subItems] = false
+                }
+                else uiLayout[item][subItems] = ui[item][subItems] 
+            }
+        }
+        else uiLayout[item] = ui[item]
+    }
+    return uiLayout
+}
+
+
 /**
  * 
  * @param {*} frame - frame of document
  * @param {*} item - current property
  * @returns UI Layout for Set Array  
  */ 
- export function getArrayUILayout (frame, item, documentation) {
+ export function getArrayUILayout (frame, item, mode, documentation) {
     let ui = util.removeRequired(item, documentation, frame.uiSchema[item])
 
     let uiLayout={}
     // default ui
     uiLayout={
         "classNames": "tdb__array__items__css tdb__array__frames",
         "items": ui,  
-        "additionalItems": ui, 
+        "additionalItems": getAdditionalUI(ui, mode) , 
         "ui:options": CONST.SET_UI_ARRAY_OPTIONS,
         "ui:ArrayFieldTemplate" : template.ArrayFieldTemplate
     }

packages/tdb-documents-ui/src/choiceSubDocumentTypeFrames/choiceSubDocumentTypeFrames.utils.js

@@ -10,5 +10,5 @@ export function getUILayout(anyOfFrames, item, uiFrame, mode, formData, document
     let subDocuemntBg = util.extractUIFrameSubDocumentTemplate(uiFrame) ? util.extractUIFrameSubDocumentTemplate(uiFrame) : 'bg-secondary'
     //anyOfFrames.uiSchema["classNames"]=`choice_subdocument_title card ${subDocuemntBg} p-4 mt-4 mb-4`
     anyOfFrames.uiSchema["classNames"]=`choice_subdocument_title d-block mt-4 mb-4 `
-    return anyOfFrames.uiSchema 
+    return anyOfFrames.uiSchema  
 }

packages/tdb-documents-ui/src/choiceSubDocumentTypeFrames/helpers.js

@@ -100,8 +100,18 @@ export function getAnyOfSchema(args) {
  * @param {*} formData - data to be displayed
  * @returns a filled array items with any of choice document only with filled info 
  */
-export function getChoiceSubDocumentsArrayItems (frame, item, formData) {
-    let arrayItems=[]
+export function getChoiceSubDocumentsArrayItems (frame, item, formData, mode) {
+    let arrayItems={}
+
+    if(mode === CONST.EDIT) {
+        arrayItems={
+            type: CONST.OBJECT_TYPE,
+            info: CONST.CHOICESUBCLASSES,
+            //title: choice,
+            anyOf: frame.properties[item].anyOf
+        }
+    
+    }
 
     if(!formData) return arrayItems
     if(!Array.isArray(formData)) return arrayItems

packages/tdb-documents-ui/src/css/terminusdb__styles.css

@@ -574,17 +574,36 @@ div.deleted fieldset div.w-md-editor-show-preview * {
     color: white !important;
 }
 
-div.inserted hr,
+div.inserted hr, 
+div.inserted .card div,
+/** choice sub doc */
+div.inserted .card .form-group select,
+div.inserted .card .form-group div label,
+div.inserted .choice_subdocument_title span,
+div.inserted .choice_subdocument_title div.control-label, 
+div.inserted .choice_subdocument_title label div, 
+div.inserted .choice_subdocument_title textarea,
+div.inserted .choice_subdocument_title input,
 div.inserted .tdb__subdocument__card span,
 div.inserted .tdb__subdocument__card div.control-label, 
 div.inserted .tdb__subdocument__card label div, 
 div.inserted .tdb__subdocument__card textarea,
 div.inserted .tdb__subdocument__card input,
 div.deleted hr,
+div.deleted .choice_subdocument_title span,
+div.deleted .choice_subdocument_title div.control-label, 
+div.deleted .choice_subdocument_title label div, 
+div.deleted .choice_subdocument_title textarea,
+div.deleted .choice_subdocument_title input,
+div.deleted .choice_subdocument_title select,
+/** choice sub doc */
+div.deleted .card .form-group select,
+div.deleted .card .form-group div label,
 div.deleted .tdb__subdocument__card label div, 
 div.deleted .tdb__subdocument__card textarea,
 div.deleted .tdb__subdocument__card input {
     color: #fff !important;
+    color: inital !important;
 }
 
 div.inserted .tdb__subdocument__card span div, 
@@ -653,6 +672,9 @@ div.tdb__array__items__css button.tdb__documentation__help {
     display: none !important;
 }
 
+.tdb__view__existing__doc__hide + .panel-body {
+    display: none !important;
+}
 
 /*
 .tdb__view input:empty,

packages/tdb-documents-ui/src/dataTypeFrames/widget.js

@@ -35,9 +35,9 @@ export function getURIUIWidget(title, uiFrame) {
     let uiLayout = {} 
     let css = uiFrame && uiFrame.hasOwnProperty(title) ? uiFrame[title][CONST.CLASSNAME] : ``
     function displayURI(props) {
-        return <div className={css}>
-            <Form.Label>{title}</Form.Label> 
-            <a href={props.formData} className="text-light" target="_blank">{props.formData}</a>
+        return <div className={`${css} d-flex`}>
+            <Form.Label className="control-label">{title}</Form.Label> 
+            <a href={props.formData} className="text-light text-break" target="_blank">{props.formData}</a>
         </div>
     }
     uiLayout["ui:field"] = displayURI