publish_my_data 1.3.19 → 1.3.20

data/app/assets/javascripts/publish_my_data/grid/50_cube-dimensions-controls.js

@@ -75,9 +75,9 @@
           // 1. the label
           ////////////////////
           var field = $('<div class="field"></div>');
-            
-          console.log(lockedDimensionsSelector);
-          
+
+          // console.log(lockedDimensionsSelector);
+
           $(lockedDimensionsSelector).append(field);
 
           // 1. the label for this dimension
@@ -97,7 +97,7 @@
           valuesDropdown.disable(); // create as disbaled
 
           // add it to our collection
-          console.log(valuesDropdown);
+          // console.log(valuesDropdown);
           lockedDimensionValuesDropdowns.push(valuesDropdown);
 
           // use the special locked dimension wirer-upper for the locked dims.
@@ -337,4 +337,4 @@
 
 
   $.extend(true, window, { Swirrl: { CubeDimensionsControls: CubeDimensionsControls }});
-})(jQuery);
+})(jQuery);

data/app/assets/javascripts/publish_my_data/grid/60_dataset_cube_grid.js

@@ -123,35 +123,111 @@
       // unsubscribe
       cubeGrid.onCubeDimensionsReady.unsubscribe(setInitialGridStatus);
 
-      $.ajax({
-        url: "http://" +  siteDomain + "/data/" + datasetSlug + "/cube/recommended_dimensions.json",
-        dataType: 'json',
-        success: function(recommendedDimensions){
-
-          // for locked dims, just set the uris
-          for ( var dim in recommendedDimensions.locked_dimensions ) {
-            cubeGrid.setLockedDimensionValue( dim, recommendedDimensions.locked_dimensions[dim] )
-          }
+      if (queryStringHasInitialDimensions()) {
+        var initialDimensions = getDimensionsFromParams();
+        loadInitialDimensions(initialDimensions);
+      } else {
+        // we'll need to load in the default dimensions then
+         $.ajax({
+            url: "http://" +  siteDomain + "/data/" + datasetSlug + "/cube/recommended_dimensions.json",
+            dataType: 'json',
+            success: function(recommendedDimensions){
+              loadInitialDimensions(recommendedDimensions);
+            },
+            error: function(jqXHR, _, _) {
+              setGridError(jqXHR.status);
+            }
+          });
+      }
+    }
 
-          // for the other dimensions, find the appropriate object
-          var columnsDimension = cubeGrid.getDimensionWithUri(recommendedDimensions.columns_dimension);
-          var rowsDimension = cubeGrid.getDimensionWithUri(recommendedDimensions.rows_dimension);
+    /*
 
-          cubeGrid.setColumnsDimension(columnsDimension);
-          cubeGrid.setRowsDimension(rowsDimension);
-          cubeGrid.showCSVDownloadLink();
-        },
-        error: function(jqXHR, _, _) {
-          setGridError(jqXHR.status);
+    The grid viewer will attempt to load initial settings from the query string failing this, it requests default dimensions via ajax.
+
+    Example query string:
+
+    http://127.0.0.1:3000/data/school-attainment?rows_dimension=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefSCQFLevel&columns_dimension=http%3A%2F%2Fdata.opendatascotland.org%2Fdef%2Fstatistical-dimensions%2FrefPeriod&http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefQualificationsAwarded=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2Fconcept%2Fschools%2Fqualifications-awarded%2F5-or-more&http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefSchoolSet=http%3A%2F%2Flinked.glasgow.gov.uk%2Fid%2Furban-assets%2Fschools%2Fschool-set%2Fglasgow&http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefYearGroup=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2Fconcept%2Fschools%2Fyear-group%2Fs4
+
+    or (same thing again, with friendlier formatting)
+
+    http://127.0.0.1:3000/data/school-attainment?
+    rows_dimension=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefSCQFLevel
+   &columns_dimension=http%3A%2F%2Fdata.opendatascotland.org%2Fdef%2Fstatistical-dimensions%2FrefPeriod
+   &http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefQualificationsAwarded=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2Fconcept%2Fschools%2Fqualifications-awarded%2F5-or-more
+   &http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefSchoolSet=http%3A%2F%2Flinked.glasgow.gov.uk%2Fid%2Furban-assets%2Fschools%2Fschool-set%2Fglasgow
+   &http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2FrefYearGroup=http%3A%2F%2Flinked.glasgow.gov.uk%2Fdef%2Fconcept%2Fschools%2Fyear-group%2Fs4
+
+    */
+
+    function getRowsDimensionFromParams(){
+      return params.rows_dimension;
+    }
+
+    function getColsDimensionFromParams(){
+      return params.columns_dimension;
+    }
+
+    function getLockedDimensionsFromParams(){
+      var locked = {};
+      for(var key in params){
+        if (looksLikePredicate(key)){
+          var predicate = decodeURIComponent(key);
+          var val = decodeURIComponent(params[key]);
+          locked[predicate] = val;
         }
-      });
+      }
+      return locked;
+    }
 
+    function looksLikePredicate(candidate){
+      if (candidate === "rows_dimension") return false;
+      if (candidate === "columns_dimension") return false
+      return true; // TODO - assumes that we don't have any other query params probably better to actually look for something that begins http://
+    }
+
+    function getDimensionsFromParams(){
+      var initalDimensions = {};
+      initalDimensions["rows_dimension"] = decodeURIComponent(getRowsDimensionFromParams());
+      initalDimensions["columns_dimension"] = decodeURIComponent(getColsDimensionFromParams());
+      initalDimensions["locked_dimensions"] = getLockedDimensionsFromParams();
+      return initalDimensions;
+    }
+    function queryStringHasInitialDimensions(){
+      return(getColsDimensionFromParams() && getColsDimensionFromParams());
+    }
+
+    function loadInitialDimensions(initalDimensions){
+      // for locked dims, just set the uris
+      for ( var dim in initalDimensions.locked_dimensions ) {
+        cubeGrid.setLockedDimensionValue( dim, initalDimensions.locked_dimensions[dim] )
+      }
+      // for the other dimensions, find the appropriate object
+      var columnsDimension = cubeGrid.getDimensionWithUri(initalDimensions.columns_dimension);
+      var rowsDimension = cubeGrid.getDimensionWithUri(initalDimensions.rows_dimension);
+
+      cubeGrid.setColumnsDimension(columnsDimension);
+      cubeGrid.setRowsDimension(rowsDimension);
+      cubeGrid.showCSVDownloadLink();
+    }
+
+    function decomposeQueryString(){
+      var params = {};
+      var qs = window.location.search.substring(1);
+      var qss = qs.split("&");
+      for (var i=0;i<qss.length;i++) {
+        var q = qss[i].split("=");
+        params[q[0]]=q[1];
+      }
+      return params;
     }
 
     // set initial status
     setTitle('&nbsp;');
     setGridStatus('Initializing grid...', true);
 
+    var params = decomposeQueryString();
+
     var cubeGrid = new Swirrl.CubeGrid(elementSelector, siteDomain, datasetSlug, pageSize);
 
     cubeGrid.onAjaxError.subscribe(function (e, args) {
@@ -184,4 +260,4 @@
 
 
   $.extend(true, window, { Swirrl: { DatasetCubeGrid: DatasetCubeGrid }});
-})(jQuery);
+})(jQuery);

data/app/views/publish_my_data/stripes/_formats.html.haml

@@ -11,7 +11,7 @@
 			.hidden_when_javascript_available
 				- @additional_formats.each do |f|
 					= label(f[:format])
-					.codesmall.click_to_select=f[:link]
+					%code.codesmall.block.click_to_select=f[:link]
 					=link_to "(download #{f[:format]})", f[:link]
 
 :javascript
@@ -19,4 +19,4 @@
 		e.preventDefault();
 		$(e.target).parent().hide();
 		$(e.target).closest(".pmd_row").find(".hidden_when_javascript_available").show();
-	});
+	});

data/app/views/publish_my_data/stripes/_linked_data.html.haml

@@ -25,7 +25,9 @@
 			- if resource.data_graph_uri
 				%p
 					Resources in this dataset are stored a named graph. This graph can be used in SPARQL queries to restrict results to this dataset.
-				= content_tag :kbd, resource.data_graph_uri, class:'click_to_select', style:"font-size:1em; margin-bottom:12px; display:block;"
+
+				= content_tag :code, resource.data_graph_uri, class:'click_to_select block'
+
 				%p
 					For a live example of how to use this, #{link_to_sparql_tool_with_graph(resource.data_graph_uri)}.			
 			- else

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "1.3.19"
+  VERSION = "1.3.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publish_my_data
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.20
   prerelease: 
 platform: ruby
 authors:
@@ -543,7 +543,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4509544715574366370
+      hash: 2450841921704577124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: