From e2262741085425b6bdd85200d7310a7daf14067f Mon Sep 17 00:00:00 2001 From: alecarn <133774929+alecarn@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:39:45 -0400 Subject: [PATCH] 1.15.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Insert accent hashtag (#1258) * premier_test_ajout_hastags * insert_accent_to_the_keywords_in_order_to_use_hashtag_and(-) --------- Co-authored-by: karengeo (cherry picked from commit cf74db75a940a6ee73f634181e3a75e30cc16e16) * Corriger le parseInt qui ajuste normalement les attributs en integer (#1257) * Corriger le parseInt qui ajuste normalement les attributs en integer * Make condition a function (cherry picked from commit 1d807d63f73fd4f74f12953cc70f56fe5ecd4289) * fix(draw): drawing circle crash whole drawing component. (#1273) (cherry picked from commit 3998dccb9007a5fb4a2a98be492cca428417b5a0) * chore(Package): run the build once * 1.15.3 --------- Co-authored-by: MSPKarengeo <90481471+MSPKarengeo@users.noreply.github.com> Co-authored-by: Michael Lane Co-authored-by: Pierre-Étienne Lord <7397743+pelord@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++++ angular.json | 3 ++- package-lock.json | 4 ++-- package.json | 12 ++++++------ packages/auth/package.json | 6 +++--- packages/common/package.json | 6 +++--- .../entity/entity-table/entity-table.component.ts | 14 +++++++++++--- packages/context/package.json | 12 ++++++------ packages/core/package.json | 4 ++-- packages/core/src/lib/config/version.ts | 4 ++-- packages/geo/package.json | 8 ++++---- packages/geo/src/lib/draw/draw/draw.component.ts | 2 ++ .../geo/src/lib/search/shared/sources/source.ts | 2 +- packages/integration/package.json | 6 +++--- packages/utils/package.json | 2 +- 15 files changed, 57 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ba94d11ce..0c8626e2c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.15.3](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.15.2...1.15.3) (2023-06-12) + + +### Bug Fixes + +* **draw:** drawing circle crash whole drawing component. ([#1273](https://github.com/infra-geo-ouverte/igo2-lib/issues/1273)) ([e3ee3b5](https://github.com/infra-geo-ouverte/igo2-lib/commit/e3ee3b593e4afde201fc601373478aa8cf8556a3)) + + + ## [1.15.2](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.15.1...1.15.2) (2023-05-16) diff --git a/angular.json b/angular.json index 8e6c50d143..e84b21ffe9 100644 --- a/angular.json +++ b/angular.json @@ -516,6 +516,7 @@ "cache": { "enabled": false, "environment": "all" - } + }, + "analytics": false } } diff --git a/package-lock.json b/package-lock.json index 2b3eb551a9..6959cede70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@igo/demo", - "version": "1.15.2", + "version": "1.15.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@igo/demo", - "version": "1.15.2", + "version": "1.15.3", "hasInstallScript": true, "license": "MIT", "workspaces": [ diff --git a/package.json b/package.json index 1cac2ec23f..232afe7579 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "workspaces": [ "./packages/*" ], - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "license": "MIT", @@ -64,12 +64,12 @@ "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", "changelog-current": "conventional-changelog -p angular -r 2", "publish": "gulp prepublishOnly && npm publish ./dist/utils && npm publish ./dist/core && npm publish ./dist/common && npm publish ./dist/auth && npm publish ./dist/geo && npm publish ./dist/context && npm publish ./dist/integration", - "preversion.linux": "rimraf ./dist && npm run build.all && npm run test.all", - "version.linux": "gulp bumpVersion && npm run build.libs && npm run changelog && git add -u", - "postversion.linux": "git push && git push --tags && npm run publish && npm run ghpages", - "preversion": "rimraf ./dist && npm run build.all && npm run test.all", - "version": "gulp bumpVersion && npm run build.libs && npm run changelog && git add -u", + "preversion": "npm run test.all", + "preversion.linux": "npm run test.all", + "version": "gulp bumpVersion && rimraf ./dist && npm run build.all && npm run changelog && git add -u", + "version.linux": "gulp bumpVersion && rimraf ./dist && npm run build.all && npm run changelog && git add -u", "postversion": "git push && git push --tags && npm run publish && npm run ghpages.win", + "postversion.linux": "git push && git push --tags && npm run publish && npm run ghpages", "preghpages": "gulp core:bundleLocale && npm run build.ghpages && echo \"include: ['_default.json', '_contexts.json', '_base.json']\" > dist/ghpages/_config.yml", "ghpages": "VERSION=$(node -p -e \"require('./package.json').version\") && npx ngh --dir=dist/ghpages --no-silent=false --message=$VERSION", "postghpages": "rimraf ./dist/ghpages", diff --git a/packages/auth/package.json b/packages/auth/package.json index 142069cc85..38ea047b06 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/auth", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -26,8 +26,8 @@ "@angular/forms": "^14.3.0", "@angular/material": "^14.2.7", "@angular/router": "^14.3.0", - "@igo2/core": "^1.15.2", - "@igo2/utils": "^1.15.2", + "@igo2/core": "^1.15.3", + "@igo2/utils": "^1.15.3", "rxjs": "^7.5.6", "@azure/msal-angular": "^2.4.1", "@azure/msal-browser": "^2.28.1" diff --git a/packages/common/package.json b/packages/common/package.json index 035172283e..0284bc5e3d 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/common", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -18,8 +18,8 @@ "@angular/core": "^14.3.0", "@angular/material": "^14.2.7", "@angular/platform-browser": "^14.3.0", - "@igo2/core": "^1.15.2", - "@igo2/utils": "^1.15.2", + "@igo2/core": "^1.15.3", + "@igo2/utils": "^1.15.3", "scroll-into-view-if-needed": "^2.2.20", "typy": "^3.3.0" }, diff --git a/packages/common/src/lib/entity/entity-table/entity-table.component.ts b/packages/common/src/lib/entity/entity-table/entity-table.component.ts index c72d60fd82..dcc16b3f44 100644 --- a/packages/common/src/lib/entity/entity-table/entity-table.component.ts +++ b/packages/common/src/lib/entity/entity-table/entity-table.component.ts @@ -328,7 +328,7 @@ export class EntityTableComponent implements OnInit, OnChanges, OnDestroy { let formControlValue = item[key]; column.domainValues.forEach(option => { - if (typeof formControlValue === 'string' && /^\d+$/.test(formControlValue)) { + if (this.isStringValidNumber(formControlValue)) { formControlValue = parseInt(formControlValue); } if (option.value === formControlValue || option.id === formControlValue) { @@ -677,7 +677,7 @@ export class EntityTableComponent implements OnInit, OnChanges, OnDestroy { value = entity?.properties[this.getColumnKeyWithoutPropertiesTag(column.linkColumnForce)]; } else { column.domainValues.forEach(option => { - if (typeof value === 'string' && /^\d+$/.test(value)) { + if (this.isStringValidNumber(value)) { value = parseInt(value); } if (option.value === value || option.id === value) { @@ -692,7 +692,7 @@ export class EntityTableComponent implements OnInit, OnChanges, OnDestroy { value = entity?.properties[this.getColumnKeyWithoutPropertiesTag(column.linkColumnForce)]; } else { column.domainValues.forEach(option => { - if (typeof value === 'string' && /^\d+$/.test(value)) { + if (this.isStringValidNumber(value)) { value = parseInt(value); } if (option.value === value || option.id === value) { @@ -839,4 +839,12 @@ export class EntityTableComponent implements OnInit, OnChanges, OnDestroy { } return column; } + /** + * Check if string is a valid number + * @param value string + * @returns boolean + */ + private isStringValidNumber(value: string): boolean { + return typeof value === 'string' && /^\d+$/.test(value) && (value.length > 1 && value.charAt(0) !== '0'); + } } diff --git a/packages/context/package.json b/packages/context/package.json index ec6078322d..02dcdd9058 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/context", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -20,11 +20,11 @@ "@angular/forms": "^14.3.0", "@angular/material": "^14.2.7", "@angular/platform-browser": "^14.3.0", - "@igo2/auth": "^1.15.2", - "@igo2/common": "^1.15.2", - "@igo2/core": "^1.15.2", - "@igo2/utils": "^1.15.2", - "@igo2/geo": "^1.15.2", + "@igo2/auth": "^1.15.3", + "@igo2/common": "^1.15.3", + "@igo2/core": "^1.15.3", + "@igo2/utils": "^1.15.3", + "@igo2/geo": "^1.15.3", "ol": "^7.3.0", "rxjs": "^7.5.6" }, diff --git a/packages/core/package.json b/packages/core/package.json index 6f58ddc3a3..9dcfc67615 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/core", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -23,7 +23,7 @@ "@angular/core": "^14.3.0", "@angular/platform-browser": "^14.3.0", "@angular/router": "^14.3.0", - "@igo2/utils": "^1.15.2", + "@igo2/utils": "^1.15.3", "rxjs": "^7.5.6", "ngx-indexed-db": "^11.0.2", "ngx-toastr": "^15.0.0" diff --git a/packages/core/src/lib/config/version.ts b/packages/core/src/lib/config/version.ts index d7c1c24081..ef41dbbafe 100644 --- a/packages/core/src/lib/config/version.ts +++ b/packages/core/src/lib/config/version.ts @@ -4,6 +4,6 @@ export interface Version { } export const version: Version = { - lib: '1.15.2', - releaseDate: 1684264792382 + lib: '1.15.3', + releaseDate: 1686590809688 }; diff --git a/packages/geo/package.json b/packages/geo/package.json index 6d92fe74ac..1c96c58919 100644 --- a/packages/geo/package.json +++ b/packages/geo/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/geo", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -30,9 +30,9 @@ "@angular/forms": "^14.3.0", "@angular/material": "^14.2.7", "@angular/platform-browser": "^14.3.0", - "@igo2/common": "^1.15.2", - "@igo2/core": "^1.15.2", - "@igo2/utils": "^1.15.2", + "@igo2/common": "^1.15.3", + "@igo2/core": "^1.15.3", + "@igo2/utils": "^1.15.3", "flexsearch": "0.7.21", "ol": "^7.3.0", "proj4": "^2.8.0", diff --git a/packages/geo/src/lib/draw/draw/draw.component.ts b/packages/geo/src/lib/draw/draw/draw.component.ts index 0c1f43784b..e5800222a4 100644 --- a/packages/geo/src/lib/draw/draw/draw.component.ts +++ b/packages/geo/src/lib/draw/draw/draw.component.ts @@ -877,6 +877,7 @@ export class DrawComponent implements OnInit, OnDestroy { feature.get('drawingStyle').stroke, feature.get('offsetX'), feature.get('offsetY'), + this.map.projection, this.icon ); }, @@ -1347,6 +1348,7 @@ export class DrawComponent implements OnInit, OnDestroy { feature.get('drawingStyle').stroke, feature.get('offsetX'), feature.get('offsetY'), + this.map.projection, this.icon ); }); diff --git a/packages/geo/src/lib/search/shared/sources/source.ts b/packages/geo/src/lib/search/shared/sources/source.ts index abd560f2e0..91db4f4be8 100644 --- a/packages/geo/src/lib/search/shared/sources/source.ts +++ b/packages/geo/src/lib/search/shared/sources/source.ts @@ -214,7 +214,7 @@ export class SearchSource { * @param hashtag hashtag from query */ getHashtagsValid(term: string, settingsName: string): string[] { - const hashtags = term.match(/(#[A-Za-z+]+)/g); + const hashtags = term.match(/(#[A-Za-zÀ-ÿ-+]+)/g); if (!hashtags) { return undefined; } diff --git a/packages/integration/package.json b/packages/integration/package.json index 510a2fff0a..a60ec89012 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/integration", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"], @@ -16,8 +16,8 @@ "peerDependencies": { "@angular/common": "^14.3.0", "@angular/core": "^14.3.0", - "@igo2/geo": "1.15.2", - "@igo2/context": "1.15.2", + "@igo2/geo": "1.15.3", + "@igo2/context": "1.15.3", "rxjs": "^7.5.6" }, "dependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index d330fbf942..74198f1013 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@igo2/utils", - "version": "1.15.2", + "version": "1.15.3", "description": "IGO Library", "author": "IGO Community", "keywords": ["igo"],