From 45af0d631aefa7af2541a80b30a73970fb9b2ec8 Mon Sep 17 00:00:00 2001 From: Andrew Nowak Date: Fri, 1 Mar 2024 19:09:21 +0000 Subject: [PATCH 01/10] hold alt to exclude, shift to include bylines --- .../gr-image-metadata/gr-image-metadata.html | 4 ++- .../gr-image-metadata/gr-image-metadata.js | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html index 11fb29cdbe..9ae8d0d31a 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html @@ -322,7 +322,9 @@ {{ctrl.metadata.byline}} + ng-click="ctrl.searchWithModifiers($event, 'by', ctrl.metadata.byline)" + aria-label="Search images by {{ctrl.metadata.byline}} byline" + title="Hold alt to exclude or hold shift to include {{ctrl.metadata.byline}}">{{ctrl.metadata.byline}} Unknown (click ✎ to add) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js index 6cf4f31079..a9fe0a413b 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js @@ -14,6 +14,8 @@ import '../../services/image-list'; import '../../services/label'; import { List } from 'immutable'; +import { fieldFilter} from '../../search/query-filter'; + export const module = angular.module('gr.imageMetadata', [ 'gr.image.service', 'kahuna.edits.service', @@ -24,6 +26,8 @@ export const module = angular.module('gr.imageMetadata', [ module.controller('grImageMetadataCtrl', [ '$rootScope', '$scope', + '$state', + '$stateParams', '$window', 'editsService', 'mediaApi', @@ -38,6 +42,8 @@ module.controller('grImageMetadataCtrl', [ function ($rootScope, $scope, + $state, + $stateParams, $window, editsService, mediaApi, @@ -508,6 +514,34 @@ module.controller('grImageMetadataCtrl', [ return totalAdditionalMetadataCount == 0; }; + + function updateQueryWithModifiers(field, byline, alt, shift, prevQuery) { + if (alt && prevQuery) { + return `${prevQuery} -${fieldFilter(field, byline)}`; + } + if (alt) { + return `-${fieldFilter(field, byline)}`; + } + if (shift && prevQuery) { + return `${prevQuery} ${fieldFilter(field, byline)}`; + } + return fieldFilter(field, byline); + } + + + ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { + const alt = event.getModifierState('Alt'); + const shift = event.getModifierState('Shift'); + if (alt || shift) { + $event.preventDefault(); + const nonFree = ctrl.srefNonfree(); + + return $state.go('search.results', { + query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), + nonFree: nonFree + }); + } + }; }; } ]); From afbb9838f1e4d25cac3b8d58d70321b2d4e72ed8 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Sat, 2 Mar 2024 01:52:35 +0000 Subject: [PATCH 02/10] That's what Andrew meant - a variable --- .../components/gr-image-metadata/gr-image-metadata.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js index a9fe0a413b..b6a3e182b0 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js @@ -515,17 +515,17 @@ module.controller('grImageMetadataCtrl', [ return totalAdditionalMetadataCount == 0; }; - function updateQueryWithModifiers(field, byline, alt, shift, prevQuery) { + function updateQueryWithModifiers(field, fieldValue, alt, shift, prevQuery) { if (alt && prevQuery) { - return `${prevQuery} -${fieldFilter(field, byline)}`; + return `${prevQuery} -${fieldFilter(field, fieldValue)}`; } if (alt) { - return `-${fieldFilter(field, byline)}`; + return `-${fieldFilter(field, fieldValue)}`; } if (shift && prevQuery) { - return `${prevQuery} ${fieldFilter(field, byline)}`; + return `${prevQuery} ${fieldFilter(field, fieldValue)}`; } - return fieldFilter(field, byline); + return fieldFilter(field, fieldValue); } From 799a821e52551f55499749d0b07bed73cd8f5c7e Mon Sep 17 00:00:00 2001 From: Mateusz Date: Sat, 2 Mar 2024 02:13:47 +0000 Subject: [PATCH 03/10] Tooltips would be too repetitive and annoying. And too long. --- .../js/components/gr-image-metadata/gr-image-metadata.html | 1 - 1 file changed, 1 deletion(-) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html index 9ae8d0d31a..e8540ff698 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html @@ -324,7 +324,6 @@ {{ctrl.metadata.byline}} Unknown (click ✎ to add) From 24cb6e182284f9f62e5e063009803a221e299edb Mon Sep 17 00:00:00 2001 From: Mateusz Date: Sat, 2 Mar 2024 02:44:12 +0000 Subject: [PATCH 04/10] Add to simple fields... ...and fix byline I broke in previous commit, yeah, I dont know how to pretend I haven't --- .../components/gr-image-metadata/gr-image-metadata.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html index e8540ff698..8320721627 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html @@ -104,6 +104,7 @@
{{ctrl.metadata.title}}
@@ -112,6 +113,7 @@
{{ctrl.metadata.title}}
@@ -323,7 +325,7 @@ {{ctrl.metadata.byline}} Unknown (click ✎ to add) @@ -371,6 +373,7 @@ {{ctrl.metadata.credit}} @@ -401,6 +404,7 @@ {{ctrl.metadata[prop]}} {{ctrl.metadata.copyright}} @@ -560,6 +565,7 @@
{{ctrl.extraInfo.uploadedBy | stripEmailDomain}}
From ddb931d995ffb5dc6e4fa7ef67a941ef272de642 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 8 Mar 2024 00:01:30 +0100 Subject: [PATCH 05/10] Add it to Additional metadata (both usefulMetadata and fieldAliases) --- .../js/components/gr-image-metadata/gr-image-metadata.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html index 8320721627..c4717cf8f8 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html @@ -646,6 +646,7 @@
{{key | spaceWords}}
{{value}}
@@ -654,6 +655,7 @@
{{key}}
{{metadata.value}}
From 53e8cfbdecd145b031d2c568d774bb8159d58903 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 8 Mar 2024 01:00:48 +0100 Subject: [PATCH 06/10] =?UTF-8?q?Add=20to=20all=20pills=20in=20Info=20pane?= =?UTF-8?q?l=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …this UGLY repetition of js bits will need to be removed --- .../js/edits/list-editor-info-panel.html | 1 + kahuna/public/js/edits/list-editor.js | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/kahuna/public/js/edits/list-editor-info-panel.html b/kahuna/public/js/edits/list-editor-info-panel.html index 9fcf8c4e1f..81208af2fa 100644 --- a/kahuna/public/js/edits/list-editor-info-panel.html +++ b/kahuna/public/js/edits/list-editor-info-panel.html @@ -8,6 +8,7 @@ library_add diff --git a/kahuna/public/js/edits/list-editor.js b/kahuna/public/js/edits/list-editor.js index cf86f91f9d..74f8579fe0 100644 --- a/kahuna/public/js/edits/list-editor.js +++ b/kahuna/public/js/edits/list-editor.js @@ -7,6 +7,7 @@ import '../services/image-list'; import '../util/storage'; import '../search/query-filter'; +import { fieldFilter} from '../search/query-filter'; export var listEditor = angular.module('kahuna.edits.listEditor', [ 'kahuna.search.filters.query', @@ -17,6 +18,8 @@ export var listEditor = angular.module('kahuna.edits.listEditor', [ listEditor.controller('ListEditorCtrl', [ '$rootScope', '$scope', + '$state', + '$stateParams', '$window', '$timeout', 'imageLogic', @@ -24,6 +27,8 @@ listEditor.controller('ListEditorCtrl', [ 'storage', function($rootScope, $scope, + $state, + $stateParams, $window, $timeout, imageLogic, @@ -147,6 +152,34 @@ listEditor.controller('ListEditorCtrl', [ $scope.$on('$destroy', function() { updateListener(); }); + function updateQueryWithModifiers(field, fieldValue, alt, shift, prevQuery) { + if (alt && prevQuery) { + return `${prevQuery} -${fieldFilter(field, fieldValue)}`; + } + if (alt) { + return `-${fieldFilter(field, fieldValue)}`; + } + if (shift && prevQuery) { + return `${prevQuery} ${fieldFilter(field, fieldValue)}`; + } + return fieldFilter(field, fieldValue); + } + + + ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { + const alt = event.getModifierState('Alt'); + const shift = event.getModifierState('Shift'); + if (alt || shift) { + $event.preventDefault(); + const nonFree = ctrl.srefNonfree(); + + return $state.go('search.results', { + query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), + nonFree: nonFree + }); + } + }; + }; }]); From bdfd1757e7f44d28d57611d2539b8caa18148b83 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 8 Mar 2024 01:02:01 +0100 Subject: [PATCH 07/10] =?UTF-8?q?Add=20to=20Label=20pills=20on=20thumbnail?= =?UTF-8?q?s=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …I don’t like the hardcoding of 'label', but elementName is missing (bug?) --- kahuna/public/js/edits/list-editor-compact.html | 1 + 1 file changed, 1 insertion(+) diff --git a/kahuna/public/js/edits/list-editor-compact.html b/kahuna/public/js/edits/list-editor-compact.html index 1851bbcdf2..326ae0e8d3 100644 --- a/kahuna/public/js/edits/list-editor-compact.html +++ b/kahuna/public/js/edits/list-editor-compact.html @@ -8,6 +8,7 @@ {{element}} From ce1d636095fa048164e6bf0b5dc2772a5bba5413 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 8 Mar 2024 03:29:48 +0100 Subject: [PATCH 08/10] =?UTF-8?q?Add=20to=20Collections=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …yet another repetition, will remove once I know how --- .../gr-image-metadata/gr-image-metadata.html | 1 + kahuna/public/js/preview/image.html | 1 + kahuna/public/js/preview/image.js | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html index c4717cf8f8..ffe0d8c7bd 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html @@ -841,6 +841,7 @@ ng-repeat="collection in ctrl.singleImage.data.collections" ng-switch-default> {{collection.data.path.join(' ▸ ')}} diff --git a/kahuna/public/js/preview/image.html b/kahuna/public/js/preview/image.html index 02ed16870c..285c010118 100644 --- a/kahuna/public/js/preview/image.html +++ b/kahuna/public/js/preview/image.html @@ -79,6 +79,7 @@ gr-tooltip-position="top"> {{::collection.data.description}} diff --git a/kahuna/public/js/preview/image.js b/kahuna/public/js/preview/image.js index 7983968c18..86c60b6421 100644 --- a/kahuna/public/js/preview/image.js +++ b/kahuna/public/js/preview/image.js @@ -17,6 +17,7 @@ import '../components/gr-add-label/gr-add-label'; import '../components/gr-archiver-status/gr-archiver-status'; import '../components/gr-syndication-icon/gr-syndication-icon'; import {graphicImageBlurService} from "../services/graphic-image-blur"; +import { fieldFilter} from '../search/query-filter'; export var image = angular.module('kahuna.preview.image', [ 'gr.image.service', @@ -34,6 +35,8 @@ export var image = angular.module('kahuna.preview.image', [ image.controller('uiPreviewImageCtrl', [ '$scope', + '$state', + '$stateParams', 'inject$', '$rootScope', '$window', @@ -45,6 +48,8 @@ image.controller('uiPreviewImageCtrl', [ 'graphicImageBlurService', function ( $scope, + $state, + $stateParams, inject$, $rootScope, $window, @@ -131,6 +136,34 @@ image.controller('uiPreviewImageCtrl', [ return $window._clientConfig.imagePreviewFlagAlertCopy; } }; + + function updateQueryWithModifiers(field, byline, alt, shift, prevQuery) { + if (alt && prevQuery) { + return `${prevQuery} -${fieldFilter(field, byline)}`; + } + if (alt) { + return `-${fieldFilter(field, byline)}`; + } + if (shift && prevQuery) { + return `${prevQuery} ${fieldFilter(field, byline)}`; + } + return fieldFilter(field, byline); + } + + + ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { + const alt = event.getModifierState('Alt'); + const shift = event.getModifierState('Shift'); + if (alt || shift) { + $event.preventDefault(); + const nonFree = ctrl.srefNonfree(); + + return $state.go('search.results', { + query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), + nonFree: nonFree + }); + } + }; }; }]); From e618211597b6ad497ad5a1a436485670b3ed4eae Mon Sep 17 00:00:00 2001 From: Andrew Nowak Date: Fri, 12 Apr 2024 15:40:52 +0100 Subject: [PATCH 09/10] collections: make chip read collection and not suppliersCollection --- media-api/app/lib/querysyntax/QuerySyntax.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/media-api/app/lib/querysyntax/QuerySyntax.scala b/media-api/app/lib/querysyntax/QuerySyntax.scala index 1f5abd2930..2770e5e9ba 100644 --- a/media-api/app/lib/querysyntax/QuerySyntax.scala +++ b/media-api/app/lib/querysyntax/QuerySyntax.scala @@ -34,7 +34,8 @@ class QuerySyntax(val input: ParserInput) extends Parser with ImageFields { DateConstraintMatch | DateRangeMatch ~> Match | AtMatch | FileTypeMatch ~> Match | - ScopedMatch ~> Match | HashMatch | CollectionRule | + CollectionRule | + ScopedMatch ~> Match | HashMatch | AnyMatch } @@ -83,7 +84,7 @@ class QuerySyntax(val input: ParserInput) extends Parser with ImageFields { ) )} - def CollectionRule = rule { '~' ~ ExactMatchValue ~> ( + def CollectionRule = rule { ("~" | "collection:") ~ ExactMatchValue ~> ( collection => Match( HierarchyField, Phrase(collection.string.toLowerCase) @@ -120,7 +121,6 @@ class QuerySyntax(val input: ParserInput) extends Parser with ImageFields { "supplier" | "specialInstructions" | "title" | - "collection" | "keyword" | "label" | "croppedBy" | @@ -134,7 +134,6 @@ class QuerySyntax(val input: ParserInput) extends Parser with ImageFields { case "illustrator" => "credit" case "uploader" => "uploadedBy" case "label" => "labels" - case "collection" => "suppliersCollection" case "subject" => "subjects" case "location" => "subLocation" case "by" | "photographer" => "byline" From 768ad9ea023a0aed09428162ae0e3208cb92d6ce Mon Sep 17 00:00:00 2001 From: Andrew Nowak Date: Fri, 12 Apr 2024 16:33:23 +0100 Subject: [PATCH 10/10] make searchWithModifiers reusable --- .../gr-image-metadata/gr-image-metadata.js | 110 +++++++----------- kahuna/public/js/edits/list-editor.js | 37 +----- kahuna/public/js/preview/image.js | 38 +----- kahuna/public/js/search/query-filter.js | 31 +++++ 4 files changed, 85 insertions(+), 131 deletions(-) diff --git a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js index b6a3e182b0..fbccf1b0ec 100644 --- a/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js +++ b/kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js @@ -12,9 +12,9 @@ import { editOptions, overwrite } from '../../util/constants/editOptions'; import '../../services/image-accessor'; import '../../services/image-list'; import '../../services/label'; -import { List } from 'immutable'; +import '../../search/query-filter'; -import { fieldFilter} from '../../search/query-filter'; +import { List } from 'immutable'; export const module = angular.module('gr.imageMetadata', [ 'gr.image.service', @@ -26,8 +26,6 @@ export const module = angular.module('gr.imageMetadata', [ module.controller('grImageMetadataCtrl', [ '$rootScope', '$scope', - '$state', - '$stateParams', '$window', 'editsService', 'mediaApi', @@ -38,12 +36,9 @@ module.controller('grImageMetadataCtrl', [ 'inject$', 'labelService', 'storage', - - + 'searchWithModifiers', function ($rootScope, $scope, - $state, - $stateParams, $window, editsService, mediaApi, @@ -53,7 +48,8 @@ module.controller('grImageMetadataCtrl', [ imageAccessor, inject$, labelService, - storage) { + storage, + searchWithModifiers) { let ctrl = this; @@ -64,14 +60,14 @@ module.controller('grImageMetadataCtrl', [ ctrl.metadataUpdatedByTemplate = []; ctrl.$onInit = () => { - $scope.$watchCollection('ctrl.selectedImages', function() { + $scope.$watchCollection('ctrl.selectedImages', function () { ctrl.singleImage = singleImage(); ctrl.selectedLabels = selectedLabels(); ctrl.usageRights = selectedUsageRights(); inject$($scope, Rx.Observable.fromPromise(selectedUsageCategory(ctrl.usageRights)), ctrl, 'usageCategory'); ctrl.rawMetadata = rawMetadata(); ctrl.metadata = displayMetadata(); - ctrl.metadata.dateTaken = ctrl.displayDateTakenMetadata(); + ctrl.metadata.dateTaken = ctrl.displayDateTakenMetadata(); ctrl.newPeopleInImage = ""; ctrl.newKeywords = ""; ctrl.extraInfo = extraInfo(); @@ -82,7 +78,7 @@ module.controller('grImageMetadataCtrl', [ }); const freeUpdateListener = $rootScope.$on('images-updated', - (e, updatedImages) => updateHandler(updatedImages)); + (e, updatedImages) => updateHandler(updatedImages)); const updateHandler = (updatedImages) => { ctrl.selectedImages = new List(updatedImages); @@ -90,18 +86,20 @@ module.controller('grImageMetadataCtrl', [ ctrl.hasMultipleValues = (val) => Array.isArray(val) && val.length > 1; - ctrl.displayDateTakenMetadata = function() { + ctrl.displayDateTakenMetadata = function () { let dateTaken = ctrl.metadata.dateTaken ? new Date(ctrl.metadata.dateTaken) : undefined; - if (dateTaken) { dateTaken.setSeconds(0, 0); } + if (dateTaken) { + dateTaken.setSeconds(0, 0); + } return dateTaken; }; - ctrl.credits = function(searchText) { + ctrl.credits = function (searchText) { return ctrl.metadataSearch('credit', searchText); }; ctrl.metadataSearch = (field, q) => { - return mediaApi.metadataSearch(field, { q }).then(resource => { + return mediaApi.metadataSearch(field, {q}).then(resource => { return resource.data.map(d => d.key); }); }; @@ -110,11 +108,11 @@ module.controller('grImageMetadataCtrl', [ ctrl.descriptionOptions = editOptions; - ctrl.updateDescriptionField = function() { + ctrl.updateDescriptionField = function () { ctrl.updateMetadataField('description', ctrl.metadata.description); }; - ctrl.updateLocationField = function(data, value) { + ctrl.updateLocationField = function (data, value) { Object.keys(value).forEach(key => { if (value[key] === undefined) { delete value[key]; @@ -126,7 +124,7 @@ module.controller('grImageMetadataCtrl', [ ctrl.updateMetadataField = function (field, value) { var imageArray = Array.from(ctrl.selectedImages); if (field === 'dateTaken') { - value = value.toISOString(); + value = value.toISOString(); } if (field === 'peopleInImage') { ctrl.addPersonToImages(imageArray, value); @@ -144,7 +142,7 @@ module.controller('grImageMetadataCtrl', [ ); }; - ctrl.updateDomainMetadataField = function(name, field, value) { + ctrl.updateDomainMetadataField = function (name, field, value) { return editsService.updateDomainMetadataField(ctrl.singleImage, name, field, value) .then((updatedImage) => { if (updatedImage) { @@ -246,7 +244,7 @@ module.controller('grImageMetadataCtrl', [ .map(([key, value]) => { let fieldAlias = ctrl.fieldAliases.find(_ => _.alias === key); if (fieldAlias && fieldAlias.displayInAdditionalMetadata === true) { - return [fieldAlias.label, { value, alias: fieldAlias.alias}]; + return [fieldAlias.label, {value, alias: fieldAlias.alias}]; } }) .filter(_ => _ !== undefined)); @@ -256,7 +254,7 @@ module.controller('grImageMetadataCtrl', [ ctrl.domainMetadata = ctrl.domainMetadataSpecs .filter(domainMetadataSpec => domainMetadataSpec.fields.length > 0) .reduce((acc, domainMetadataSpec) => { - let domainMetadata = { ...domainMetadataSpec }; + let domainMetadata = {...domainMetadataSpec}; if (ctrl.singleImage.data.metadata) { const imageDomainMetadata = ctrl.singleImage.data.metadata.domainMetadata ? ctrl.singleImage.data.metadata.domainMetadata : {}; @@ -290,7 +288,7 @@ module.controller('grImageMetadataCtrl', [ field.selectOptions = field.options .filter(option => option) .map(option => { - return { value: option, text: option }; + return {value: option, text: option}; }); } @@ -338,7 +336,7 @@ module.controller('grImageMetadataCtrl', [ ctrl.hasLocationInformation = hasLocationInformation; function singleImage() { - if (ctrl.selectedImages.size === 1){ + if (ctrl.selectedImages.size === 1) { return ctrl.selectedImages.first(); } } @@ -377,9 +375,12 @@ module.controller('grImageMetadataCtrl', [ function rawMetadata() { return selectedMetadata().map((values) => { switch (values.size) { - case 0: return undefined; - case 1: return values.first(); - default: return Array.from(values); + case 0: + return undefined; + case 1: + return values.first(); + default: + return Array.from(values); } }).toObject(); } @@ -387,8 +388,10 @@ module.controller('grImageMetadataCtrl', [ function displayMetadata() { return selectedMetadata().map((values) => { switch (values.size) { - case 1: return values.first(); - default: return undefined; + case 1: + return values.first(); + default: + return undefined; } }).toObject(); } @@ -398,9 +401,12 @@ module.controller('grImageMetadataCtrl', [ const properties = imageList.getSetOfProperties(info); return properties.map((values) => { switch (values.size) { - case 0: return undefined; - case 1: return values.first(); - default: return Array.from(values); + case 0: + return undefined; + case 1: + return values.first(); + default: + return Array.from(values); } }).toObject(); } @@ -427,11 +433,11 @@ module.controller('grImageMetadataCtrl', [ ctrl.removeImageFromCollection = (collection) => { ctrl.removingCollection = collection; collections.removeImageFromCollection(collection, ctrl.singleImage) - .then(() => ctrl.removingCollection = false); + .then(() => ctrl.removingCollection = false); }; - $scope.$on('$destroy', function() { - freeUpdateListener(); + $scope.$on('$destroy', function () { + freeUpdateListener(); }); ctrl.onMetadataTemplateSelected = (metadata, usageRights, collection, leasesWithConfig) => { @@ -504,44 +510,18 @@ module.controller('grImageMetadataCtrl', [ }; ctrl.isDomainMetadataEmpty = (key) => { - return ctrl.domainMetadata.find(obj => obj.name === key ).fields.every(field => field.value === undefined ); + return ctrl.domainMetadata.find(obj => obj.name === key).fields.every(field => field.value === undefined); }; ctrl.isAdditionalMetadataEmpty = () => { const totalAdditionalMetadataCount = Object.keys(ctrl.metadata).filter(key => ctrl.isUsefulMetadata(key)).length + - Object.keys(ctrl.additionalMetadata).length + - Object.keys(ctrl.identifiers).length; + Object.keys(ctrl.additionalMetadata).length + + Object.keys(ctrl.identifiers).length; return totalAdditionalMetadataCount == 0; }; - function updateQueryWithModifiers(field, fieldValue, alt, shift, prevQuery) { - if (alt && prevQuery) { - return `${prevQuery} -${fieldFilter(field, fieldValue)}`; - } - if (alt) { - return `-${fieldFilter(field, fieldValue)}`; - } - if (shift && prevQuery) { - return `${prevQuery} ${fieldFilter(field, fieldValue)}`; - } - return fieldFilter(field, fieldValue); - } - - - ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { - const alt = event.getModifierState('Alt'); - const shift = event.getModifierState('Shift'); - if (alt || shift) { - $event.preventDefault(); - const nonFree = ctrl.srefNonfree(); - - return $state.go('search.results', { - query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), - nonFree: nonFree - }); - } - }; + ctrl.searchWithModifiers = searchWithModifiers; }; } ]); diff --git a/kahuna/public/js/edits/list-editor.js b/kahuna/public/js/edits/list-editor.js index 74f8579fe0..c26f84e547 100644 --- a/kahuna/public/js/edits/list-editor.js +++ b/kahuna/public/js/edits/list-editor.js @@ -7,7 +7,6 @@ import '../services/image-list'; import '../util/storage'; import '../search/query-filter'; -import { fieldFilter} from '../search/query-filter'; export var listEditor = angular.module('kahuna.edits.listEditor', [ 'kahuna.search.filters.query', @@ -18,22 +17,20 @@ export var listEditor = angular.module('kahuna.edits.listEditor', [ listEditor.controller('ListEditorCtrl', [ '$rootScope', '$scope', - '$state', - '$stateParams', '$window', '$timeout', 'imageLogic', 'imageList', 'storage', + 'searchWithModifiers', function($rootScope, $scope, - $state, - $stateParams, $window, $timeout, imageLogic, imageList, - storage) { + storage, + searchWithModifiers) { var ctrl = this; ctrl.$onInit = () => { @@ -152,34 +149,8 @@ listEditor.controller('ListEditorCtrl', [ $scope.$on('$destroy', function() { updateListener(); }); - function updateQueryWithModifiers(field, fieldValue, alt, shift, prevQuery) { - if (alt && prevQuery) { - return `${prevQuery} -${fieldFilter(field, fieldValue)}`; - } - if (alt) { - return `-${fieldFilter(field, fieldValue)}`; - } - if (shift && prevQuery) { - return `${prevQuery} ${fieldFilter(field, fieldValue)}`; - } - return fieldFilter(field, fieldValue); - } - - - ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { - const alt = event.getModifierState('Alt'); - const shift = event.getModifierState('Shift'); - if (alt || shift) { - $event.preventDefault(); - const nonFree = ctrl.srefNonfree(); - - return $state.go('search.results', { - query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), - nonFree: nonFree - }); - } - }; + ctrl.searchWithModifiers = searchWithModifiers; }; }]); diff --git a/kahuna/public/js/preview/image.js b/kahuna/public/js/preview/image.js index 86c60b6421..7909ff5d14 100644 --- a/kahuna/public/js/preview/image.js +++ b/kahuna/public/js/preview/image.js @@ -17,7 +17,7 @@ import '../components/gr-add-label/gr-add-label'; import '../components/gr-archiver-status/gr-archiver-status'; import '../components/gr-syndication-icon/gr-syndication-icon'; import {graphicImageBlurService} from "../services/graphic-image-blur"; -import { fieldFilter} from '../search/query-filter'; +import '../search/query-filter'; export var image = angular.module('kahuna.preview.image', [ 'gr.image.service', @@ -35,8 +35,6 @@ export var image = angular.module('kahuna.preview.image', [ image.controller('uiPreviewImageCtrl', [ '$scope', - '$state', - '$stateParams', 'inject$', '$rootScope', '$window', @@ -46,10 +44,9 @@ image.controller('uiPreviewImageCtrl', [ 'imageAccessor', 'storage', 'graphicImageBlurService', + 'searchWithModifiers', function ( $scope, - $state, - $stateParams, inject$, $rootScope, $window, @@ -58,7 +55,8 @@ image.controller('uiPreviewImageCtrl', [ labelService, imageAccessor, storage, - graphicImageBlurService) { + graphicImageBlurService, + searchWithModifiers) { var ctrl = this; ctrl.$onInit = () => { @@ -137,33 +135,7 @@ image.controller('uiPreviewImageCtrl', [ } }; - function updateQueryWithModifiers(field, byline, alt, shift, prevQuery) { - if (alt && prevQuery) { - return `${prevQuery} -${fieldFilter(field, byline)}`; - } - if (alt) { - return `-${fieldFilter(field, byline)}`; - } - if (shift && prevQuery) { - return `${prevQuery} ${fieldFilter(field, byline)}`; - } - return fieldFilter(field, byline); - } - - - ctrl.searchWithModifiers = ($event, fieldName, fieldValue) => { - const alt = event.getModifierState('Alt'); - const shift = event.getModifierState('Shift'); - if (alt || shift) { - $event.preventDefault(); - const nonFree = ctrl.srefNonfree(); - - return $state.go('search.results', { - query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), - nonFree: nonFree - }); - } - }; + ctrl.searchWithModifiers = searchWithModifiers; }; }]); diff --git a/kahuna/public/js/search/query-filter.js b/kahuna/public/js/search/query-filter.js index aeafcb017b..04de18c597 100644 --- a/kahuna/public/js/search/query-filter.js +++ b/kahuna/public/js/search/query-filter.js @@ -21,6 +21,37 @@ export function fieldFilter(field, value) { return `${field}:${valueMaybeQuoted}`; } +queryFilters.factory('searchWithModifiers', + ['$state', '$stateParams', 'storage', + function($state, $stateParams, storage) { + function updateQueryWithModifiers(field, fieldValue, alt, shift, prevQuery) { + if (alt && prevQuery) { + return `${prevQuery} -${fieldFilter(field, fieldValue)}`; + } + if (alt) { + return `-${fieldFilter(field, fieldValue)}`; + } + if (shift && prevQuery) { + return `${prevQuery} ${fieldFilter(field, fieldValue)}`; + } + return fieldFilter(field, fieldValue); + } + + return ($event, fieldName, fieldValue) => { + const alt = $event.getModifierState('Alt'); + const shift = $event.getModifierState('Shift'); + if (alt || shift) { + $event.preventDefault(); + const nonFree = storage.getJs("isNonFree", true) ? true : undefined; + + return $state.go('search.results', { + query: updateQueryWithModifiers(fieldName, fieldValue, alt, shift, $stateParams.query), + nonFree: nonFree + }); + } + }; + }]); + queryFilters.filter('queryFilter', function() { return (value, field) => fieldFilter(field, value); });