Update provenance links in browser

server/routes/browser/api.py

@@ -12,29 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Knowledge Graph related handlers."""
-
-import json
-
 import flask
-from flask import request
-from flask import Response
+from flask import jsonify
 
 from server.lib import fetch
 from server.lib.cache import cache
 from server.routes import TIMEOUT
-import server.services.datacommons as dc
 
 bp = flask.Blueprint('api_browser', __name__, url_prefix='/api/browser')
 
 
 @bp.route('/provenance')
 @cache.cached(timeout=TIMEOUT, query_string=True)
 def provenance():
-  """Returns all the provenance information."""
+  """Return provenance name for all available data sources."""
   prov_resp = fetch.property_values(['Provenance'], 'typeOf', False)
-  url_resp = fetch.property_values(prov_resp['Provenance'], "url", True)
+  prov_dcids = prov_resp.get('Provenance', [])
+
+  if not prov_dcids:
+    return jsonify({})
+
+  properties_to_fetch = ['name']
+  prop_resp = fetch.multiple_property_values(prov_dcids, properties_to_fetch,
+                                             True)
+
   result = {}
-  for dcid, urls in url_resp.items():
-    if len(urls) > 0:
-      result[dcid] = urls[0]
-  return result
+  for dcid, props in prop_resp.items():
+    names = props.get('name', [])
+
+    result[dcid] = {'name': names[0] if names else dcid}
+
+  return jsonify(result)

server/webdriver/shared_tests/browser_test.py

@@ -100,7 +100,7 @@ def test_page_serve_ca_population(self):
         value='//*[@id="node-content"]/div[1]/div/table/tbody/tr[3]/td')
     self.assertEqual(type_of_row[0].text, 'typeOf')
     self.assertEqual(type_of_row[1].text, 'StatisticalVariable')
-    self.assertEqual(type_of_row[2].text, 'datacommons.org')
+    self.assertEqual(type_of_row[2].text, 'HumanReadableStatVars')
 
     # Assert observation charts loaded.
     self.assertGreater(

static/css/table.scss

@@ -36,8 +36,7 @@ $border-radius: 3px;
 }
 
 .node-table .property-column,
-.node-table tr > td:last-of-type,
-.node-table tr > th:last-of-type {
+.node-table .provenance-column {
   width: 25%;
 }
 

static/js/browser/app.tsx

@@ -49,7 +49,7 @@ interface BrowserPagePropType {
 }
 
 interface BrowserPageStateType {
-  provDomain: { [key: string]: URL };
+  provenanceNames: { [key: string]: string };
   dataFetched: boolean;
 }
 
@@ -101,7 +101,7 @@ export class BrowserPage extends React.Component<
     super(props);
     this.state = {
       dataFetched: false,
-      provDomain: {},
+      provenanceNames: {},
     };
   }
 
@@ -163,7 +163,7 @@ export class BrowserPage extends React.Component<
             <h3>{outArcHeader}</h3>
             <OutArcSection
               dcid={arcDcid}
-              provDomain={this.state.provDomain}
+              provenanceNames={this.state.provenanceNames}
               nodeTypes={this.props.nodeTypes}
               showAllProperties={showAllProperties}
             />
@@ -186,7 +186,7 @@ export class BrowserPage extends React.Component<
             <InArcSection
               nodeName={this.props.nodeName}
               dcid={this.props.dcid}
-              provDomain={this.state.provDomain}
+              provenanceNames={this.state.provenanceNames}
             />
           )}
           {this.props.pageDisplayType === PageDisplayType.PLACE_STAT_VAR && (
@@ -222,18 +222,14 @@ export class BrowserPage extends React.Component<
       .get("/api/browser/provenance")
       .then((resp) => {
         const provenance = resp.data;
-        const provDomain = {};
+        const provenanceNames = {};
         for (const provId in provenance) {
-          const url = provenance[provId];
-          try {
-            provDomain[provId] = new URL(url).host;
-          } catch (err) {
-            console.log("Invalid url in prov: " + url);
-          }
+          const provenanceName = provenance[provId].name;
+          provenanceNames[provId] = provenanceName;
         }
         this.setState({
           dataFetched: true,
-          provDomain,
+          provenanceNames,
         });
       })
       .catch((e) => {

static/js/browser/arc_table_row.tsx

@@ -32,14 +32,16 @@ const NUM_VALUES_UNEXPANDED = 5;
 interface ArcTableRowPropType {
   propertyLabel: string;
   values: Array<ArcValue>;
-  // If provenanceId and src are skipped, ensure that table only has 2-columns.
+  // If provenanceId and provenanceName are skipped, ensure that table only has 2-columns.
   provenanceId?: string;
-  src?: URL;
+  provenanceName?: string;
   // If set to true, will not add a link to the property node.
   noPropLink?: boolean;
   // Index of the property label; the same property can be listed multiple times
   // in an arc table. This index differentiates them.
   propIndex?: number;
+  // If set to true, will hide the provenance column entirely.
+  hideProvenanceColumn?: boolean;
 }
 
 interface ArcTableRowStateType {
@@ -137,17 +139,18 @@ export class ArcTableRow extends React.Component<
               })}
           </div>
         </td>
-        {this.props.provenanceId && this.props.src ? (
-          <td className="provenance-column">
-            {this.props.provenanceId && (
-              <a href={HREF_PREFIX + this.props.provenanceId}>
-                {this.props.src}
-              </a>
-            )}
-          </td>
-        ) : (
-          <td></td>
-        )}
+        {!this.props.hideProvenanceColumn &&
+          (this.props.provenanceId && this.props.provenanceName ? (
+            <td className="provenance-column">
+              {this.props.provenanceId && (
+                <a href={HREF_PREFIX + this.props.provenanceId}>
+                  {this.props.provenanceName}
+                </a>
+              )}
+            </td>
+          ) : (
+            <td className="provenance-column"></td>
+          ))}
       </tr>
     );
   }

static/js/browser/in_arc_section.tsx

@@ -33,7 +33,7 @@ const LOADING_CONTAINER_ID = "browser-in-arc-section";
 interface InArcSectionsPropType {
   nodeName: string;
   dcid: string;
-  provDomain: { [key: string]: URL };
+  provenanceNames: { [key: string]: string };
 }
 interface InArcSectionStateType {
   data: { [parentType: string]: { [property: string]: Array<InArcValue> } };
@@ -78,7 +78,7 @@ export class InArcSection extends React.Component<
                     parentType={parentType}
                     property={predicate}
                     arcValues={arcsByPredicate[predicate]}
-                    provDomain={this.props.provDomain}
+                    provenanceNames={this.props.provenanceNames}
                     key={parentType + predicate}
                   />
                 );

static/js/browser/in_arc_subsection.tsx

@@ -29,7 +29,7 @@ interface InArcSubsectionPropType {
   parentType: string;
   property: string;
   arcValues: Array<InArcValue>;
-  provDomain: { [key: string]: URL };
+  provenanceNames: { [key: string]: string };
 }
 
 export class InArcSubsection extends React.Component<InArcSubsectionPropType> {
@@ -73,10 +73,11 @@ export class InArcSubsection extends React.Component<InArcSubsectionPropType> {
                     propertyLabel={this.props.property}
                     values={[{ dcid: arcValue.dcid, text: valueText }]}
                     provenanceId={arcValue.provenanceId}
-                    src={
-                      this.props.provDomain[arcValue.provenanceId]
-                        ? this.props.provDomain[arcValue.provenanceId]
-                        : null
+                    provenanceName={
+                      this.props.provenanceNames[arcValue.provenanceId] || null
+                    }
+                    hideProvenanceColumn={
+                      this.props.parentType === "Provenance"
                     }
                   />
                 );

static/js/browser/out_arc_section.tsx

@@ -67,7 +67,7 @@ export function shouldIgnoreProperty(property: string): boolean {
 
 interface OutArcSectionPropType {
   dcid: string;
-  provDomain: { [key: string]: URL };
+  provenanceNames: { [key: string]: string };
   nodeTypes: string[];
   showAllProperties: boolean;
 }
@@ -121,21 +121,25 @@ export class OutArcSection extends React.Component<
     }
     const predicates = Object.keys(this.state.data);
     predicates.sort(this.predicateComparator);
+    const isProvenanceNode = this.props.nodeTypes.includes("Provenance");
     return (
       <div className={`card p-0 ${ASYNC_ELEMENT_CLASS}`}>
         <table className="node-table">
           <tbody>
             <tr key="header">
               <th className="property-column">Property</th>
               <th>Value</th>
-              <th>Provenance</th>
+              {!isProvenanceNode && (
+                <th className="provenance-column">Provenance</th>
+              )}
             </tr>
             <ArcTableRow
               key={DCID_PREDICATE}
               propertyLabel={DCID_PREDICATE}
               values={[{ text: this.props.dcid }]}
               provenanceId={""}
-              src={null}
+              provenanceName={null}
+              hideProvenanceColumn={isProvenanceNode}
             />
             {predicates.map((predicate) => {
               const valuesByProvenance = this.state.data[predicate];
@@ -147,12 +151,11 @@ export class OutArcSection extends React.Component<
                       propertyLabel={predicate}
                       values={valuesByProvenance[provenanceId]}
                       provenanceId={provenanceId}
-                      src={
-                        this.props.provDomain[provenanceId]
-                          ? this.props.provDomain[provenanceId]
-                          : null
+                      provenanceName={
+                        this.props.provenanceNames[provenanceId] || null
                       }
                       propIndex={index}
+                      hideProvenanceColumn={isProvenanceNode}
                     />
                   );
                 }