add defaultCropType param

guardian · Oct 28, 2024 · a6d84f1 · a6d84f1
1 parent 50a5220
commit a6d84f1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/kahuna/public/js/crop/controller.js b/kahuna/public/js/crop/controller.js
@@ -50,6 +50,7 @@ crop.controller('ImageCropCtrl', [
       const allCropOptions = cropSettings.getCropOptions();
 
       const storageCropType = cropSettings.getCropType();
+      const storageDefaultCropType = cropSettings.getDefaultCropType();
 
       const cropOptionDisplayValue = cropOption => cropOption.ratioString
         ? `${cropOption.key} (${cropOption.ratioString})`
@@ -63,7 +64,7 @@ crop.controller('ImageCropCtrl', [
           disabled: storageCropType && storageCropType !== option.key
         }));
 
-      ctrl.cropType = storageCropType || defaultCrop.key;
+      ctrl.cropType = storageCropType || storageDefaultCropType ||defaultCrop.key;
 
       ctrl.image = image;
       ctrl.optimisedImageUri = optimisedImageUri;

diff --git a/kahuna/public/js/crop/index.js b/kahuna/public/js/crop/index.js
@@ -18,7 +18,7 @@ crop.config(['$stateProvider',
              function($stateProvider) {
 
     $stateProvider.state('crop', {
-        url: '/images/:imageId/crop?cropType&customRatio&shouldShowCropGuttersIfApplicable',
+        url: '/images/:imageId/crop?cropType&customRatio&shouldShowCropGuttersIfApplicable&defaultCropType',
         template: cropTemplate,
         controller: 'ImageCropCtrl',
         controllerAs: 'ctrl',

diff --git a/kahuna/public/js/image/index.js b/kahuna/public/js/image/index.js
@@ -23,7 +23,7 @@ image.config(['$stateProvider',
               function($stateProvider) {
 
     $stateProvider.state('image', {
-        url: '/images/:imageId?crop?cropType&customRatio&shouldShowCropGuttersIfApplicable',
+        url: '/images/:imageId?crop?cropType&customRatio&shouldShowCropGuttersIfApplicable&defaultCropType',
         template: imageTemplate,
         controller: 'ImageCtrl',
         controllerAs: 'ctrl',

diff --git a/kahuna/public/js/search/index.js b/kahuna/public/js/search/index.js
@@ -73,7 +73,7 @@ search.config(['$stateProvider', '$urlMatcherFactoryProvider',
     $stateProvider.state('search', {
         // FIXME [1]: This state should be abstract, but then we can't navigate to
         // it, which we need to do to access it's deeper / remembered chile state
-        url: '/?cropType&customRatio&shouldShowCropGuttersIfApplicable',
+        url: '/?cropType&customRatio&shouldShowCropGuttersIfApplicable&defaultCropType',
         template: searchTemplate,
         deepStateRedirect: {
             // Inject a transient $stateParams for the results state

diff --git a/kahuna/public/js/util/crop.js b/kahuna/public/js/util/crop.js
@@ -5,6 +5,7 @@ import { landscape, portrait, video, square, freeform, cropOptions } from './con
 const CROP_TYPE_STORAGE_KEY = 'cropType';
 const CUSTOM_CROP_STORAGE_KEY = 'customCrop';
 const SHOULD_SHOW_CROP_GUTTERS_IF_APPLICABLE_STORAGE_KEY = 'shouldShowCropGuttersIfApplicable';
+const CROP_DEFAULT_TYPE_STORAGE_KEY = 'defaultCropType';
 
 const customCrop = (label, xRatio, yRatio) => {
   return { key:label, ratio: xRatio / yRatio, ratioString: `${xRatio}:${yRatio}`};
@@ -53,6 +54,14 @@ cropUtil.factory('cropSettings', ['storage', function(storage) {
     }
   };
 
+  const setDefaultCropType = (defaultCropType) => {
+    if (isValidCropType(defaultCropType)) {
+      storage.setJs(CROP_DEFAULT_TYPE_STORAGE_KEY, defaultCropType, true);
+    } else {
+      storage.clearJs(CROP_DEFAULT_TYPE_STORAGE_KEY);
+    }
+  };
+
   const setCustomCrop = customRatio => {
     const parsedRatio = parseRatio(customRatio);
     if (parsedRatio) {
@@ -70,7 +79,7 @@ cropUtil.factory('cropSettings', ['storage', function(storage) {
     );
   };
 
-  function set({cropType, customRatio, shouldShowCropGuttersIfApplicable}) {
+  function set({cropType, customRatio, shouldShowCropGuttersIfApplicable, defaultCropType}) {
     // set customRatio first in case cropType relies on a custom crop
     if (customRatio) {
       setCustomCrop(customRatio);
@@ -80,6 +89,10 @@ cropUtil.factory('cropSettings', ['storage', function(storage) {
       setCropType(cropType);
     }
 
+    if (defaultCropType) {
+      setDefaultCropType(defaultCropType)
+    }
+
     if (shouldShowCropGuttersIfApplicable) {
       setShouldShowCropGuttersIfApplicable(shouldShowCropGuttersIfApplicable);
     }
@@ -94,11 +107,19 @@ cropUtil.factory('cropSettings', ['storage', function(storage) {
     }
   }
 
+  function getDefaultCropType() {
+    const defaultCropType = storage.getJs(CROP_DEFAULT_TYPE_STORAGE_KEY, true);
+
+    if (isValidCropType(defaultCropType)) {
+      return defaultCropType;
+    }
+  }
+
   function shouldShowCropGuttersIfApplicable() {
     return storage.getJs(SHOULD_SHOW_CROP_GUTTERS_IF_APPLICABLE_STORAGE_KEY, true);
   }
 
-  return { set, getCropType, getCropOptions, shouldShowCropGuttersIfApplicable };
+  return { set, getCropType, getCropOptions, shouldShowCropGuttersIfApplicable, getDefaultCropType };
 }]);
 
 cropUtil.filter('asCropType', function() {