avoid a while loop to prevent infinite loop

gisaia · Nov 26, 2024 · d79b1f9 · d79b1f9
1 parent 8fc6502
commit d79b1f9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/services/visualize.service.ts b/src/app/services/visualize.service.ts
@@ -76,9 +76,9 @@ export class VisualizeService {
       /** Fetch all elements between {} in the template. */
       const regex = new RegExp(/{([^}]+)}/g);
       const fields = [];
-      let match;
-      while ((match = regex.exec(urlTemplate)) !== null) {
-        fields.push(match[1]);
+      const matches = [...urlTemplate.matchAll(regex)];
+      if (!!matches) {
+        matches.filter(m => !!m && Array.isArray(m) && m.length > 1).forEach(m => fields.push(m[1]));
       }
       if (fields) {
         return fields