ROU-4431: Migrate OS Maps into ODC Maps v1.6.7 (#149) (#150)

* Update asset version to 1.6.6 Updated asset version to 1.6.6. * ROU-4222: DrawCircle AddOn does not pass coordinates when editing a shape (#132) * Fix issue with Leaflet OnDrawingChange event * Remove unnecessary arguments * Fix OnDrawChange event for Google Maps * Remove unnecessary arguments and comments * Add comments * Fix eslint errors * Fix Code smell * Removed repeated code * Add shape types * Update ShapeProviderEvent.ts * ROU-4283 - [OSMaps] - Leaflet and Google Maps - DrawCircle AddOn does not pass coordinates when editing a shape (#133) * - fix coords sended on the coordinates parameter of triggerOnDrawingChangeEvent; * - change the return location on draging end (draw marker); --------- * Update Images.css Includes the changes made in ROU-4361 in order to replace the base 64 for the CSS vars → --map-container-image-google and --map-container-image-leaflet * Revert "Update Images.css" This reverts commit 96154f3. * Update Images.css Includes the changes made in ROU-4361 in order to replace the base 64 for the CSS vars → --map-container-image-google and --map-container-image-leaflet * Update Map.css Added CSS class .runtime-staticMap-container-hide * Update Map.css * Increase Maps version to 1.6.7 * Adding git action * Adding workflow to generate documentation in dev * Changes in workflows * Create main-push.yml * Changing workflow name * Update dev-pr.yml * Moving actions into folder * Chaning workflow to use new folder * Adding types to events * Missing parameter, when not passed structure * Missing parameter * Initial changes * Lint changes * Changing input from value to propertyValue * Improving variable name * Fixing sonarcloud findings * Sonar cloud feedback * More sonarcloud feedback * Changing the way addresses are converted * Removing the apiKey parameter * Adding sonarcloud lint * Fix auto merge problem * Add function to easily check if a number is valid * Explicitly set type of size as number * Validating that height and width are bigger than 0 * Updated Version 1.6.8 and added .snyk file Updated Version 1.6.8 and added .snyk file * ROU-4431: Migrate OS Maps into ODC Maps v1.6.7 (#147) * Update asset version to 1.6.6 Updated asset version to 1.6.6. * ROU-4222: DrawCircle AddOn does not pass coordinates when editing a shape (#132) * Fix issue with Leaflet OnDrawingChange event * Remove unnecessary arguments * Fix OnDrawChange event for Google Maps * Remove unnecessary arguments and comments * Add comments * Fix eslint errors * Fix Code smell * Removed repeated code * Add shape types * Update ShapeProviderEvent.ts * ROU-4283 - [OSMaps] - Leaflet and Google Maps - DrawCircle AddOn does not pass coordinates when editing a shape (#133) * - fix coords sended on the coordinates parameter of triggerOnDrawingChangeEvent; * - change the return location on draging end (draw marker); --------- * Update Images.css Includes the changes made in ROU-4361 in order to replace the base 64 for the CSS vars → --map-container-image-google and --map-container-image-leaflet * Revert "Update Images.css" This reverts commit 96154f3. * Update Images.css Includes the changes made in ROU-4361 in order to replace the base 64 for the CSS vars → --map-container-image-google and --map-container-image-leaflet * Update Map.css Added CSS class .runtime-staticMap-container-hide * Update Map.css * Increase Maps version to 1.6.7 * Adding git action * Adding workflow to generate documentation in dev * Changes in workflows * Create main-push.yml * Changing workflow name * Update dev-pr.yml * Moving actions into folder * Chaning workflow to use new folder * Adding types to events * Missing parameter, when not passed structure * Missing parameter * Initial changes * Lint changes * Changing input from value to propertyValue * Improving variable name * Fixing sonarcloud findings * Sonar cloud feedback * More sonarcloud feedback * Changing the way addresses are converted * Removing the apiKey parameter * Adding sonarcloud lint * Fix auto merge problem * Add function to easily check if a number is valid * Explicitly set type of size as number * Validating that height and width are bigger than 0 * Fix duplicated methods on Circle --------- --------- Co-authored-by: gbnm <goncalo.martins@outsystems.com> Co-authored-by: Giuliana Silva <108938618+OS-giulianasilva@users.noreply.github.com> Co-authored-by: João Ferreira <60441552+JoaoFerreira-FrontEnd@users.noreply.github.com> Co-authored-by: OUTSYSTEMS\fmj <joao.maneul.ferreira@outsystems.com> Co-authored-by: rug <rmfgoncalves@gmail.com>
OutSystems · Dec 14, 2023 · 206ba5a · 206ba5a
1 parent 56e5081
commit 206ba5a
Show file tree

Hide file tree

Showing 167 changed files with 1,281 additions and 949 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,4 +5,6 @@ dist
 # don't lint libraries
 src/libraries/**
 *.d.ts
-*.js
+*.js
+# don't lint settings
+*.snyk
diff --git a/.github/os-git-actions/manual-commit/action.yml b/.github/os-git-actions/manual-commit/action.yml
@@ -0,0 +1,30 @@
+name: 'manual-git-commit'
+description: 'Runs the git command to commit'
+inputs:
+    branch:
+        description: 'Branch where to commit.'
+        required: true
+        default: ''
+    message:
+        description: 'Commit message.'
+        required: true
+        default: ''
+    newFiles:
+        description: 'Defines if a `git add.` should be made or not.'
+        required: false
+        default: false
+
+runs:
+    using: composite
+    steps:
+        - name: Add new files (if needed)
+          shell: bash
+          if: ${{ inputs.newFiles }}
+          run: |
+              git add .
+
+        - name: Manual git commit
+          shell: bash
+          run: |
+              git commit -m "${{ inputs.message }}"
+              git push origin ${{ inputs.branch }}
diff --git a/.github/os-git-actions/setup-gpg/action.yml b/.github/os-git-actions/setup-gpg/action.yml
@@ -0,0 +1,22 @@
+name: 'setup-gpg'
+description: 'Prepare to get following commits signed'
+inputs:
+    gpgPriv:
+        description: 'GPG Private key'
+        required: true
+        default: ''
+    gpgPassPhrase:
+        description: 'GPG passphrase'
+        required: false
+        default: '""'
+
+runs:
+    using: composite
+    steps:
+        - name: Import and load GPG key
+          uses: crazy-max/ghaction-import-gpg@v6
+          with:
+              gpg_private_key: ${{ inputs.gpgPriv }}
+              passphrase: ${{ inputs.gpgPassPhrase }}
+              git_user_signingkey: true
+              git_commit_gpgsign: true
diff --git a/.github/os-git-actions/signed-commit/action.yml b/.github/os-git-actions/signed-commit/action.yml
@@ -0,0 +1,39 @@
+name: 'signed-gpg-commit'
+description: 'Prepare and sign the commit signed'
+inputs:
+    branch:
+        description: 'Branch where to commit.'
+        required: true
+        default: ''
+    message:
+        description: 'Commit message.'
+        required: true
+        default: ''
+    newFiles:
+        description: 'Defines if a `git add.` should be made or not.'
+        required: false
+        default: false
+    gpgPriv:
+        description: 'GPG Private key'
+        required: true
+        default: ''
+    gpgPassPhrase:
+        description: 'GPG passphrase'
+        required: false
+        default: '""'
+
+runs:
+    using: composite
+    steps:
+        - name: Setup GPG to sign commits
+          uses: ./.github/setup-gpg/
+          with:
+              gpgPriv: ${{ inputs.gpgPriv }}
+              gpgPassPhrase: ${{ inputs.gpgPassPhrase }}
+
+        - name: Perform git commit
+          uses: ./.github/manual-commit/
+          with:
+              branch: ${{ inputs.branch }}
+              message: ${{ inputs.message }}
+              newFiles: ${{ inputs.newFiles }}
diff --git a/.github/workflows/dev-pr.yml b/.github/workflows/dev-pr.yml
@@ -0,0 +1,44 @@
+name: DEV_PR
+on:
+    # Triggers the workflow on push events but only for the "dev" branch.
+    pull_request:
+        branches: ['dev']
+
+    workflow_dispatch:
+
+jobs:
+    eslint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: ./
+        steps:
+            - name: Checkout branch dev
+              uses: actions/checkout@v2
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: '16.x'
+
+            - name: Install project dependencies
+              run: npm install
+
+            - name: Run lint
+              run: npm run lint
+
+    compile-code:
+        needs: eslint
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout branch dev
+              uses: actions/checkout@v2
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: '16.x'
+
+            - name: Install project dependencies
+              run: npm install
+
+            - name: Compile code
+              run: npm run build
diff --git a/.github/workflows/main-push.yml b/.github/workflows/main-push.yml
@@ -0,0 +1,86 @@
+# This is a basic workflow to help you get started with Actions
+
+name: MAIN_PUSH
+
+# Controls when the action will run.
+on:
+    # Triggers the workflow on push or pull request events but only for the dev branch
+    push:
+        branches: ['main']
+
+    # Allows you to run this workflow manually from the Actions tab
+    workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+    eslint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: ./
+        steps:
+            - name: Checkout branch main
+              uses: actions/checkout@v2
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: '16.x'
+
+            - name: Install project dependencies
+              run: npm install
+
+            - name: Run lint
+              run: npm run lint
+
+    compile-code:
+        needs: eslint
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout branch dev
+              uses: actions/checkout@v2
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: '16.x'
+
+            - name: Install project dependencies
+              run: npm install
+
+            - name: Compile code
+              run: npm run build
+
+    documentation:
+        needs: compile-code
+        runs-on: ubuntu-latest
+
+        # Steps represent a sequence of tasks that will be executed as part of the job
+        steps:
+            # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+            - name: Checkout branch main
+              uses: actions/checkout@v3
+              with:
+                  ref: dev
+                  token: ${{ secrets.PAT }}
+
+            - name: Install graphviz
+              run: sudo apt install -y graphviz
+
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+                  cache: 'npm'
+
+            - name: Install project dependencies
+              run: npm install
+
+            - name: Generate documentation
+              run: npm run docs
+
+            - name: Sign and commit documentation to branch dev
+              uses: ./.github/os-git-actions/signed-commit/
+              with:
+                  branch: main
+                  message: 'Update documentation [skip ci]'
+                  newFiles: true
+                  gpgPriv: ${{ secrets.GPG_SIGN_KEY }}
+                  gpgPassPhrase: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,5 @@
-/* prettier-ignore */
+*.css
 *.md
-*.d.ts
+*.d.ts
+# don't lint settings
+.snyk
diff --git a/.snyk b/.snyk
@@ -0,0 +1,5 @@
+exclude:
+ global:
+   - styles/**
+   - jobs/**
+   - docs/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -27,5 +27,9 @@
 	},
 	"[jsonc]": {
 		"editor.defaultFormatter": "vscode.json-language-features"
+	},
+	"sonarlint.connectedMode.project": {
+		"connectionId": "outsystems",
+		"projectKey": "OutSystems_outsystems-maps"
 	}
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "outsystems-maps",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "Outsystems Maps",
   "license": "BSD-3-Clause",
   "scripts": {

diff --git a/src/OSFramework/Maps/Configuration/AbstractConfiguration.ts b/src/OSFramework/Maps/Configuration/AbstractConfiguration.ts
@@ -1,18 +1,16 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 namespace OSFramework.Maps.Configuration {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     export abstract class AbstractConfiguration implements IConfiguration {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
-        constructor(config: any) {
+        constructor(config: unknown) {
+            const _localConfig = config as unknown[];
             let key;
-            for (key in config) {
-                if (config[key] !== undefined) {
-                    this[key] = config[key];
+            for (key in _localConfig) {
+                if (_localConfig[key] !== undefined) {
+                    this[key] = _localConfig[key];
                 }
             }
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        public abstract getProviderConfig(): any;
+        public abstract getProviderConfig(): unknown;
     }
 }
diff --git a/src/OSFramework/Maps/Configuration/IConfiguration.ts b/src/OSFramework/Maps/Configuration/IConfiguration.ts
@@ -8,7 +8,6 @@ namespace OSFramework.Maps.Configuration {
         /**
          * Method responsible for the translation of configuration from OS to Provider
          */
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        getProviderConfig(): any;
+        getProviderConfig(): unknown;
     }
 }
diff --git a/src/OSFramework/Maps/Configuration/IConfigurationMarker.ts b/src/OSFramework/Maps/Configuration/IConfigurationMarker.ts
@@ -5,11 +5,11 @@ namespace OSFramework.Maps.Configuration {
      * Defines the basic structure for Map objects
      */
     export interface IConfigurationMarker extends IConfiguration {
-        allowDrag: boolean;
-        iconHeight: number;
-        iconUrl: string;
-        iconWidth: number;
-        location: string;
-        title: string;
+        allowDrag?: boolean;
+        iconHeight?: number;
+        iconUrl?: string;
+        iconWidth?: number;
+        location?: string;
+        title?: string;
     }
 }
diff --git a/src/OSFramework/Maps/Constants.ts b/src/OSFramework/Maps/Constants.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 namespace OSFramework.Maps.Constants {
     /* OutSystems Maps Version */
-    export const OSMapsVersion = '1.6.6';
+    export const OSMapsVersion = '1.6.7';
 }