Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ dist
# don't lint libraries
src/libraries/**
*.d.ts
*.js
*.js
# don't lint settings
*.snyk
30 changes: 30 additions & 0 deletions .github/os-git-actions/manual-commit/action.yml
Original file line number Diff line number Diff line change
@@ -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 }}
22 changes: 22 additions & 0 deletions .github/os-git-actions/setup-gpg/action.yml
Original file line number Diff line number Diff line change
@@ -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
39 changes: 39 additions & 0 deletions .github/os-git-actions/signed-commit/action.yml
Original file line number Diff line number Diff line change
@@ -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 }}
44 changes: 44 additions & 0 deletions .github/workflows/dev-pr.yml
Original file line number Diff line number Diff line change
@@ -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
86 changes: 86 additions & 0 deletions .github/workflows/main-push.yml
Original file line number Diff line number Diff line change
@@ -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 }}
6 changes: 4 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* prettier-ignore */
*.css
*.md
*.d.ts
*.d.ts
# don't lint settings
.snyk
5 changes: 5 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
exclude:
global:
- styles/**
- jobs/**
- docs/**
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,9 @@
},
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"sonarlint.connectedMode.project": {
"connectionId": "outsystems",
"projectKey": "OutSystems_outsystems-maps"
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "outsystems-maps",
"version": "1.6.6",
"version": "1.6.7",
"description": "Outsystems Maps",
"license": "BSD-3-Clause",
"scripts": {
Expand Down
14 changes: 6 additions & 8 deletions src/OSFramework/Maps/Configuration/AbstractConfiguration.ts
Original file line number Diff line number Diff line change
@@ -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;
}
}
3 changes: 1 addition & 2 deletions src/OSFramework/Maps/Configuration/IConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
12 changes: 6 additions & 6 deletions src/OSFramework/Maps/Configuration/IConfigurationMarker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion src/OSFramework/Maps/Constants.ts
Original file line number Diff line number Diff line change
@@ -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';
}
Loading
Loading