histomicsui 1.8.1.dev49__tar.gz → 1.8.1.dev51__tar.gz

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.8.1.dev49
+Version: 1.8.1.dev51
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/histomicsui/web_client/utilities/allowedGroups.js

@@ -32,6 +32,21 @@ function getAllowedGroups(annotation) {
     return filtered.length ? filtered : null;
 }
 
+/**
+ * Combine the `allowed_groups` restrictions of several annotations.
+ *
+ * Unrestricted annotations don't constrain the result. If any annotation is restricted, the
+ * result is the intersection of the restricted annotations' allowed groups, which may be empty.
+ *
+ * @param {AnnotationModel[]} annotations The annotations to check.
+ * @returns {string[]|null} The groups allowed by every annotation, or null if none are
+ *                          restricted.
+ */
+function getCommonAllowedGroups(annotations) {
+    const restrictions = _.uniq(annotations).map(getAllowedGroups).filter((allowed) => allowed);
+    return restrictions.length ? _.intersection(...restrictions) : null;
+}
+
 /**
  * Ensure that every group in an `allowed_groups` restriction exists as a persisted style group.
  * Create any that are missing by copying the style of the default group.
@@ -64,4 +79,4 @@ function ensureAllowedGroupsExist(styles, allowed, defaultGroupId) {
 }
 
 export default getAllowedGroups;
-export {ensureAllowedGroupsExist};
+export {ensureAllowedGroupsExist, getCommonAllowedGroups};

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/histomicsui/web_client/views/popover/AnnotationContextMenu.js

@@ -1,7 +1,7 @@
 import $ from 'jquery';
 
 import StyleCollection from '../../collections/StyleCollection';
-import getAllowedGroups, {ensureAllowedGroupsExist} from '../../utilities/allowedGroups';
+import {ensureAllowedGroupsExist, getCommonAllowedGroups} from '../../utilities/allowedGroups';
 import View from '../View';
 
 import template from '../../templates/popover/annotationContextMenu.pug';
@@ -108,11 +108,11 @@ const AnnotationContextMenu = View.extend({
         }
     },
     _getAnnotationGroups() {
-        // restrict to the allowed groups of the annotation that owns the selected/right-clicked
-        // element, not whichever annotation happens to be active in the Annotations panel
-        const referenceElement = this.collection.at(0);
-        const referenceAnnotation = (referenceElement && referenceElement.originalAnnotation) || this.parentView.activeAnnotation;
-        const allowed = getAllowedGroups(referenceAnnotation);
+        let annotations = this.collection.map((element) => element.originalAnnotation).filter((a) => a);
+        if (!annotations.length && this.parentView.activeAnnotation) {
+            annotations = [this.parentView.activeAnnotation];
+        }
+        const allowed = getCommonAllowedGroups(annotations);
         this._ensureAllowedGroupsExist(allowed);
         let groups = this.styles.map((style) => style.id);
         if (allowed) {

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.8.1.dev49
+Version: 1.8.1.dev51
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/histomicsui.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "1.8.0",
-  "distance": 49,
-  "node": "gd3ad1987fc20edbe84c706214a2d88a87503c730",
+  "distance": 51,
+  "node": "g563acaa11615900458ee6b2bcb8a5ed4f7efe0ec",
   "dirty": false,
   "branch": "master",
   "node_date": "2026-11-03"

{histomicsui-1.8.1.dev49 → histomicsui-1.8.1.dev51}/tests/web_client_specs/allowedGroupsSpec.js

@@ -279,6 +279,48 @@ girderTest.promise.done(function () {
             });
         });
 
+        describe('context menu offers the intersection of restrictions across a multi-selection', function () {
+            var first = {};
+            var second = {};
+            var unrestricted = {};
+
+            it('creates annotations with overlapping restrictions', function () {
+                createAnnotation('restricted annotation 1 for intersection', {
+                    allowed_groups: ['groupM', 'groupN']
+                }, [rectangleElement(80, 80)], first);
+            });
+
+            it('creates the second restricted annotation', function () {
+                createAnnotation('restricted annotation 2 for intersection', {
+                    allowed_groups: ['groupN', 'groupO']
+                }, [rectangleElement(90, 90)], second);
+            });
+
+            it('creates an unrestricted annotation', function () {
+                createAnnotation('unrestricted annotation for intersection', {}, [rectangleElement(100, 100)], unrestricted);
+            });
+
+            it('offers only groups allowed by every selected element\'s annotation', function () {
+                var bodyView = huiTest.app.bodyView;
+                bodyView._resetSelection();
+                bodyView._selectElement(first.annotation.elements().first());
+                bodyView._selectElement(second.annotation.elements().first());
+                expect(bodyView.contextMenu._getAnnotationGroups()).toEqual(['groupN']);
+
+                bodyView._selectElement(unrestricted.annotation.elements().first());
+                expect(bodyView.contextMenu._getAnnotationGroups()).toEqual(['groupN']);
+            });
+
+            it('offers no groups when the restrictions are disjoint', function () {
+                var bodyView = huiTest.app.bodyView;
+                first.annotation.get('annotation').attributes = {allowed_groups: ['groupM']};
+                bodyView._resetSelection();
+                bodyView._selectElement(first.annotation.elements().first());
+                bodyView._selectElement(second.annotation.elements().first());
+                expect(bodyView.contextMenu._getAnnotationGroups()).toEqual([]);
+            });
+        });
+
         describe('#3/#5: live metadata updates without reselecting or reloading', function () {
             var result = {};
             var drawWidget;