fix a bug in PP and support inline=xxx.* in UI

Signed-off-by: Doug Davis <[email protected]>

Author: duglin

registry/httpStuff.go

@@ -486,17 +486,37 @@ func (pw *PageWriter) Done() {
 		}
 
 		pp, _ := PropPathFromPath(pw.Info.Abstract)
-		for _, inline := range inlineOptions {
+		for i, inline := range inlineOptions {
+			hilight := ""
+			if i%2 == 0 {
+				hilight = " inlinehilight"
+			}
 			checked = ""
 			pInline := MustPropPathFromUI(inline)
-			fullInline := pp.Append(pInline).DB()
-			if pw.Info.IsInlineSet(fullInline) {
+			fullPP := pp.Append(pInline)
+			if pw.Info.IsInlineSet(fullPP.DB()) {
 				checked = " checked"
 			}
+
+			mini := ""
+			if (fullPP.Len() != 3 || fullPP.Parts[2].Text == "versions") &&
+				fullPP.Len() != 4 {
+				minichecked := ""
+				if pw.Info.IsInlineSet(fullPP.Append(NewPPP("*")).DB()) {
+					minichecked = " checked"
+				}
+				mini = fmt.Sprintf(`
+      <div class=minicheckdiv>
+        <input id=inline%d type='checkbox' class=minicheck value='%s'%s/>.*
+      </div>`, inlineCount, inline+".*", minichecked)
+				inlineCount++
+			}
+
 			inlines += fmt.Sprintf(`
-    <div class=inlines>
-      <input id=inline%d type='checkbox' value='%s'%s/>%s
-    </div>`, inlineCount, inline, checked, inline)
+    <div class='inlines%s'>
+      <input id=inline%d type='checkbox' value='%s'%s/>%s%s
+    </div>`, hilight, inlineCount, inline, checked, inline, mini)
+
 			inlineCount++
 
 		}
@@ -515,9 +535,9 @@ func (pw *PageWriter) Done() {
 	}
 
 	structureswitch := "false"
+	structureButton := ""
 	if pw.Info.RootPath == "" || pw.Info.RootPath == "export" {
 		structuretext := ""
-		structureButton := ""
 		if pw.Info.ShowStructure {
 			structureswitch = "true"
 			structuretext = "Show document"
@@ -527,14 +547,11 @@ func (pw *PageWriter) Done() {
 			structuretext = "Show structure"
 		}
 		if pw.Info.ResourceUID != "" && pw.Info.What == "Entity" {
-			structureButton = fmt.Sprintf(`<div>
-      <button id=structure onclick='structureswitch=!structureswitch ; apply()' style="font-weight:bold">%s</button>
-    </div>
+			structureButton = fmt.Sprintf(`<center>
+      <button id=structure onclick='structureswitch=!structureswitch ; apply()'>%s</button>
+    </center>
 `, structuretext)
 		}
-
-		apply = `
-    ` + structureButton
 	}
 
 	applyBtn := ""
@@ -607,28 +624,39 @@ func (pw *PageWriter) Done() {
     align-items: start ;
     padding: 2px ;
   }
+
+  .colorButton, #applyBtn, #structure {
+    border-radius: 13px ;
+    border: 1px solid #407d16 ;
+    background: #407d16 ;
+    padding: 5 20 6 20 ;
+    color: white ;
+  }
+
   #structure {
+    font-weight: bold ;
     display: inline ;
     margin-top: 10px ;
     margin-bottom: 10px ;
+    padding: 1 10 2 10 ;
+  }
+  #structure:hover { background: #c4c4c4 ; color : black ; }
+  #structure:active { background: #c4c4c4 ; color : black ; }
+  #structure:focus { background: darkgray ; color : black ; }
+
+  legend {
+    margin-bottom: 3 ;
   }
 
   fieldset {
-    // padding: 0 ;
-    border-width: 2 0 0 2 ;
+    border-width: 1 0 1 1 ;
     border-color: black ;
-    padding: 0 0 0 2 ;
-    margin-bottom: 10 ;
+    padding: 0 0 4 4 ;
   }
 
   #applyBtn {
     font-weight: bold ;
-    margin: 0 5 0 5 ;
-    border-radius: 13px ;
-    border: 1px solid #407d16 ;
-    background: #407d16 ;
-    padding: 5 20 6 20 ;
-    color: white ;
+    margin: 5 5 0 5 ;
   }
 
   #applyBtn:hover { background: #c4c4c4 ; color : black ; }
@@ -663,16 +691,34 @@ func (pw *PageWriter) Done() {
     font-family: courier ;
   }
   .inlines {
+    display: flex ;
     font-size: 13px ;
     font-family: courier ;
+    align-items: center ;
   }
+
+  .inlinehilight {
+    background-color : #d0d0d0 ;
+  }
+
+  .minicheckdiv {
+    margin-left: auto ;
+    padding: 0 2 0 5 ;
+  }
+
+  .minicheck {
+    height: 10px ;
+    width: 10px ;
+    margin: 0px ;
+  }
+
   .line {
     width: 90%% ;
     border-bottom: 1px solid black ;
     margin: 3 0 3 20 ;
   }
   #urlPath {
-    background-color: lightgray ;
+    background-color: ghostwhite; // lightgray ;
     padding: 3px ;
     font-size: 16px ;
     font-family: courier ;
@@ -759,6 +805,7 @@ func (pw *PageWriter) Done() {
 `+roots+`
   <div id=buttonList>
     `+applyBtn+`
+    `+structureButton+`
   </div>
   <div style="height:12px"></div> <!-- buffer for "Commmit:" line -->
   <div id=commit><a target=_blank

registry/info.go

@@ -45,9 +45,9 @@ var nonModelInlines = append([]string{"*"}, explicitInlines...)
 var rootPaths = []string{"capabilities", "model", "export"}
 
 type Inline struct {
-	path    string    // value from ?inline query param
-	pp      *PropPath // PP for 'value'
-	nonWild *PropPath // PP for value w/o .* if present, else nil
+	Path    string    // value from ?inline query param
+	PP      *PropPath // PP for 'value'
+	NonWild *PropPath // PP for value w/o .* if present, else nil
 }
 
 func (info *RequestInfo) AddInline(path string) error {
@@ -57,9 +57,9 @@ func (info *RequestInfo) AddInline(path string) error {
 
 	if ArrayContains(nonModelInlines, path) {
 		info.Inlines = append(info.Inlines, &Inline{
-			path:    NewPPP(path).DB(),
-			pp:      NewPPP(path),
-			nonWild: nil,
+			Path:    NewPPP(path).DB(),
+			PP:      NewPPP(path),
+			NonWild: nil,
 		})
 		return nil
 	}
@@ -70,14 +70,14 @@ func (info *RequestInfo) AddInline(path string) error {
 	}
 
 	storeInline := &Inline{
-		path:    NewPPP(path).DB(),
-		pp:      pp,
-		nonWild: nil,
+		Path:    pp.DB(),
+		PP:      pp,
+		NonWild: nil,
 	}
 
 	if pp.Bottom() == "*" {
 		pp = pp.RemoveLast()
-		storeInline.nonWild = pp
+		storeInline.NonWild = pp
 	}
 
 	// Check to make sure the requested inline attribute exists, else error
@@ -109,7 +109,7 @@ func (info *RequestInfo) AddInline(path string) error {
 
 				// We have a match, but these don't allow wildcards, so err
 				// if * was in ?inline value
-				if storeInline.nonWild != nil {
+				if storeInline.NonWild != nil {
 					hasErr = true
 					break
 				}
@@ -140,7 +140,7 @@ func (info *RequestInfo) IsInlineSet(entityPath string) bool {
 		entityPath = "*"
 	}
 	for _, inline := range info.Inlines {
-		if inline.path == entityPath {
+		if inline.Path == entityPath {
 			return true
 		}
 	}
@@ -156,8 +156,8 @@ func (info *RequestInfo) ShouldInline(entityPath string) bool {
 	ePP, _ := PropPathFromDB(entityPath) // entity-PP
 
 	for _, inline := range info.Inlines {
-		iPP := inline.pp
-		log.VPrintf(4, "Inline cmp: %q in %q", entityPath, inline.path)
+		iPP := inline.PP
+		log.VPrintf(4, "Inline cmp: %q in %q", entityPath, inline.Path)
 
 		// * doesn't include "model"... because they're special, they need to
 		// be explicit if they want to include those
@@ -171,10 +171,10 @@ func (info *RequestInfo) ShouldInline(entityPath string) bool {
 		if (iPP.Top() == "*" && !ArrayContains(explicitInlines, ePP.UI())) ||
 			ePP.Equals(iPP) ||
 			iPP.HasPrefix(ePP) ||
-			(inline.nonWild != nil && ePP.HasPrefix(inline.nonWild)) {
+			(inline.NonWild != nil && ePP.HasPrefix(inline.NonWild)) {
 			// (iPP.Len() > 1 && iPP.Bottom() == "*" && ePP.HasPrefix(iPP.RemoveLast())) {
 
-			log.VPrintf(4, "Inline match: %q in %q", entityPath, inline.path)
+			log.VPrintf(4, "Inline match: %q in %q", entityPath, inline.Path)
 			return true
 		}
 	}