@lblod/ember-rdfa-editor-lblod-plugins 32.5.1 → 32.5.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 32.5.2
+
+### Patch Changes
+
+- [#593](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/593) [`56039ab`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/56039abb28cb0f78f7fdda7e9a35af603ed427a5) Thanks [@piemonkey](https://github.com/piemonkey)! - Fix inserted text for traffic signals that do not have images
+
+- [#592](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/592) [`641a973`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/641a973b1323404962db1c737274762da0a9c3e6) Thanks [@piemonkey](https://github.com/piemonkey)! - Improve sorting of label filters on 'insert traffic measure' modal
+
 ## 32.5.1
 
 ### Patch Changes

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -19,7 +19,9 @@ import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/p
 import { pagination } from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/pagination';
 import { restartableTask, task, timeout } from 'ember-concurrency';
 import t from 'ember-intl/helpers/t';
-import PowerSelect from 'ember-power-select/components/power-select';
+import PowerSelect, {
+  Select,
+} from 'ember-power-select/components/power-select';
 import PowerSelectMultiple from 'ember-power-select/components/power-select-multiple';
 import { TaskInstance, trackedTask } from 'reactiveweb/ember-concurrency';
 import { trackedFunction } from 'reactiveweb/function';
@@ -151,6 +153,18 @@ export default class RoadsignsModal extends Component<Signature> {
     this.args.closeModal();
   }
 
+  @action
+  doFirstCodeSearch(select: Select) {
+    if (
+      this.searchCodes.isIdle &&
+      !select.searchText &&
+      // @ts-expect-error not part of the public API... (tested on PS 7 and 8)
+      this.searchCodes.lastSuccessful?.args?.[0] !== ''
+    ) {
+      this.searchCodes.perform('');
+    }
+    return true;
+  }
   searchCodes = restartableTask(async (term: string) => {
     const category = this.selectedCategory?.uri;
     const type = this.selectedType?.uri;
@@ -402,9 +416,11 @@ export default class RoadsignsModal extends Component<Signature> {
                   @verticalPosition='below'
                   @searchEnabled={{true}}
                   @search={{this.searchCodes.perform}}
+                  @options={{or this.searchCodes.last.value undefined}}
                   @selected={{this.selectedCode}}
                   @allowClear={{true}}
                   @onChange={{this.changeCode}}
+                  @onOpen={{this.doFirstCodeSearch}}
                   as |option|
                 >
                   {{option.label}}

package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts

@@ -99,14 +99,24 @@ export default class RoadSignsTable extends Component<Signature> {
                         as |signalConcept|
                       }}
                         <div class='au-o-grid__item au-u-1-3'>
-                          <img
-                            src={{signalConcept.image}}
-                            alt={{t
-                              'editor-plugins.roadsign-regulation.table.content.image.alt'
-                              code=signalConcept.code
-                            }}
-                            class='au-c-data-table__image'
-                          />
+                          {{#if signalConcept.image}}
+                            <img
+                              src={{signalConcept.image}}
+                              alt={{t
+                                'editor-plugins.roadsign-regulation.table.content.image.alt'
+                                code=signalConcept.code
+                              }}
+                              class='au-c-data-table__image'
+                            />
+                          {{else}}
+                            <AuPill
+                              @skin='border'
+                              @size='small'
+                              @draft={{true}}
+                            >
+                              {{signalConcept.code}}
+                            </AuPill>
+                          {{/if}}
                         </div>
                       {{/each}}
                     </div>

package/addon/plugins/roadsign-regulation-plugin/queries/traffic-signal-codes.ts

@@ -77,6 +77,9 @@ export default async function queryTrafficSignalCodes(
   const { abortSignal } = options;
   const filterStatement = buildFilters(options);
 
+  // The sorting here is a little weird. This is to handle labels which are normally of the form
+  // 'A1.3b', where the 1.3 should be sorted as a number. There is no enforcement of this format, so
+  // we try to handle cases such as 'weird1.2.3LABEL' in a way that is not too broken.
   const query = /* sparql */ `
     PREFIX mobiliteit: <https://data.vlaanderen.be/ns/mobiliteit#>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -92,8 +95,11 @@ export default async function queryTrafficSignalCodes(
               skos:prefLabel ?label;
               ext:valid ${sparqlEscapeBool(true)}.
       ${filterStatement}
+      BIND(REPLACE(?label, "^(\\\\D+).*", "$1", "i") AS ?firstLetters)
+      BIND(xsd:decimal(REPLACE(?label, "^\\\\D+(\\\\d*\\\\.?\\\\d*).*", "$1", "i")) AS ?number)
+      BIND(REPLACE(?label, "^\\\\D+\\\\d*\\\\.?\\\\d*(.*)", "$1", "i") AS ?secondLetters)
     }
-    ORDER BY ASC(?label)
+    ORDER BY ASC(UCASE(?firstLetters)) ASC(?number) ASC(LCASE(?secondLetters))
   `;
   const queryResult = await executeQuery({ endpoint, query, abortSignal });
   const bindings = queryResult.results.bindings;

package/addon/plugins/roadsign-regulation-plugin/queries/traffic-signal-concept.ts

@@ -35,15 +35,17 @@ export async function queryTrafficSignalConcepts(
       ?type
       ?code
       ?zonality
-      (CONCAT(${sparqlEscapeString(imageBaseUrl ?? '')}, "/files/", ?imageId, "/download") AS ?image)
+      ?image
     WHERE {
       ?uri
         a mobiliteit:Verkeerstekenconcept;
         a ?type;
-        skos:prefLabel ?code;
-        mobiliteit:grafischeWeergave ?imageUri.
+        skos:prefLabel ?code.
 
-      ?imageUri ext:hasFile/mu:uuid ?imageId.
+      OPTIONAL {
+        ?uri mobiliteit:grafischeWeergave/ext:hasFile/mu:uuid ?imageId.
+        BIND(CONCAT(${sparqlEscapeString(imageBaseUrl ?? '')}, "/files/", ?imageId, "/download") AS ?image)
+      }
 
       OPTIONAL {
         ?uri ext:zonality ?zonality.
@@ -65,7 +67,13 @@ export async function queryTrafficSignalConcepts(
   });
   const bindings = queryResult.results.bindings;
   const concepts = TrafficSignalConceptSchema.array().parse(
-    bindings.map(objectify),
+    bindings.map((binding) => {
+      const objectified = objectify(binding);
+      return {
+        ...objectified,
+        image: objectified.image ?? '',
+      };
+    }),
   );
   const conceptsWithCategories = await Promise.all(
     concepts.map(async (concept) => {

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
+import { Select } from 'ember-power-select/components/power-select';
 import { TaskInstance } from 'reactiveweb/ember-concurrency';
 import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 type Option = {
@@ -43,6 +44,7 @@ export default class RoadsignsModal extends Component<Signature> {
     changeZonality(value: Zonality): void;
     handleSearch(event: InputEvent): void;
     closeModal(): void;
+    doFirstCodeSearch(select: Select): boolean;
     searchCodes: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<{
         label: string;
         uri: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "32.5.1",
+  "version": "32.5.2",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",