Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d10f042
refactor(backend): update to latest
NatalieShaked Apr 24, 2025
194c91a
feat(configurations): updated configurations and naming
NatalieShaked May 4, 2025
fcaebcf
fix(test): tests after configuration changes
NatalieShaked May 6, 2025
86bcdf9
chore: tidied tests
NatalieShaked May 6, 2025
c4a551c
chore: removed unnecessary commented out lines
NatalieShaked May 6, 2025
d56f8fc
chore(configurations): updated husky
NatalieShaked May 6, 2025
bf1a0ad
fix(lint): ignored eslint errors in frontend package
NatalieShaked May 6, 2025
9d76fe7
feat(configurations): added config
NatalieShaked May 6, 2025
bd84b65
ci(configurations): fix pull_request workflow run tests
NatalieShaked May 8, 2025
fd6a198
fix(frontend): build typecheck error
NatalieShaked May 11, 2025
636eea3
fix(backend): openapi lint error
NatalieShaked May 11, 2025
9befde1
chore(backend): updated broken link in in .swcrc file
NatalieShaked May 13, 2025
2015d1f
fix(backend): added lint-ignore file for openapi lint error
NatalieShaked May 13, 2025
0be867c
chore(backend): removed unnecessary use of depContainer
NatalieShaked May 13, 2025
59fd749
chore(backend): removed commented out code
NatalieShaked May 13, 2025
f8f681a
ci(configurations): updated workflows
NatalieShaked May 13, 2025
4e93c2f
fix(common): added lint-ignore file for openapi lint error
NatalieShaked May 13, 2025
9e8fb20
ci(common): updated pull_request
NatalieShaked May 13, 2025
929bc51
ci(common): updated pull_request
NatalieShaked May 13, 2025
5c69f13
ci(common): updated pull_request test versions
NatalieShaked May 13, 2025
f5631fd
ci(common): updated pull_request test name
NatalieShaked May 13, 2025
22a29de
fix: container in catch never initialize
NivGreenstein May 22, 2025
7aaee27
chore(backend): updated schema package
NatalieShaked Jul 7, 2025
3b7fa32
feat(backend): updated the tsconfig
NatalieShaked Aug 11, 2025
8b09a2b
feat(frontend): updated tsconfig
NatalieShaked Aug 11, 2025
573a44f
feat(backend,frontend,common,client): updated packages
NatalieShaked Aug 11, 2025
11ce5b9
fix(backend,frontend): fixed eslint errors
NatalieShaked Aug 11, 2025
7b719ac
feat(backend): declared mock type in folder
NatalieShaked Aug 11, 2025
0fa025c
feat(client): updated packages
NatalieShaked Aug 11, 2025
db06fdc
ci(backend): fix dockerfile error
NatalieShaked Aug 11, 2025
5afc20f
fix(backend,frontend): dockerfiles
NatalieShaked Aug 25, 2025
7471616
fix(configurations): eslint error
NatalieShaked Aug 25, 2025
4daf9d1
fix(configurations): eslint error when running pull request
NatalieShaked Aug 31, 2025
5ee1307
fix(configurations): eslint error when running pull request
NatalieShaked Aug 31, 2025
67def29
fix(configurations): eslint error when running pull request
NatalieShaked Aug 31, 2025
3ed7a42
fix(configurations): eslint error when running pull request
NatalieShaked Aug 31, 2025
4fb0239
fix(configurations): eslint error when running pull request
NatalieShaked Aug 31, 2025
c3e8491
fix(configurations): docker build and prettier
NatalieShaked Aug 31, 2025
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
7 changes: 0 additions & 7 deletions .eslintrc.json

This file was deleted.

1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#prevent git from chaning line endings of sh file to /r/n on windows systems
*.sh text eol=lf
*.* text eol=lf
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -23,6 +23,5 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.


**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: 'enhancement'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
21 changes: 11 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
Make sure you've read the contributing guidelines (CONTRIBUTING.md)
-->

| Question | Answer |
| ---------------- | -------------------------------------------------------------------------- |
| Bug fix | ✔/✖ |
| New feature | ✔/✖ |
| Breaking change | ✔/✖ |
| Deprecations | ✔/✖ |
| Documentation | ✔/✖ |
| Tests added | ✔/✖ |
| Chore | ✔/✖ |
| Question | Answer |
| --------------- | ------ |
| Bug fix | ✔/✖ |
| New feature | ✔/✖ |
| Breaking change | ✔/✖ |
| Deprecations | ✔/✖ |
| Documentation | ✔/✖ |
| Tests added | ✔/✖ |
| Chore | ✔/✖ |

Related issues: #XXX , #XXX ...
Closes #XXX ...

Further information:
Further information:

<!--
Here you can provide more information regarding any of the questions written above.
In addition, you can add screenshots, ask the maintainers questions.
Expand Down
53 changes: 53 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# yaml-language-server: $schema=https://json.schemastore.org/dependabot-2.0.json
version: 2
updates:
# deps
- package-ecosystem: npm
target-branch: 'master'
schedule:
interval: weekly
allow:
- dependency-type: production
directory: /
commit-message:
prefix: 'deps'
groups:
map-colonies:
patterns:
- '@map-colonies/*'
opentelemetry:
patterns:
- '@opentelemetry/*'
patch:
update-types:
- patch
# dev-deps
- package-ecosystem: npm
schedule:
interval: weekly
allow:
- dependency-type: development
directory: /
commit-message:
prefix: 'devdeps'
groups:
map-colonies:
patterns:
- '@map-colonies/*'
opentelemetry:
patterns:
- '@opentelemetry/*'
types:
patterns:
- '@types/*'
dev-patch:
update-types:
- patch

# github deps
- package-ecosystem: github-actions
schedule:
interval: weekly
commit-message:
prefix: 'ci'
directory: '/'
42 changes: 25 additions & 17 deletions .github/workflows/build_and_push.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
name: Build and push artifacts

on:
workflow_dispatch:
push:
tags:
- 'v*'

workflow_dispatch:
inputs:
version:
required: true
type: string
env:
HELM_EXPERIMENTAL_OCI: 1

permissions:
contents: write
pull-requests: write

jobs:
build_and_push:
runs-on: ubuntu-latest
env:
Docker_Repository: ${{ secrets.ACR_URL }}/${{ github.event.repository.name }}:${{ github.ref_name }}
steps:
- uses: actions/checkout@v2
- uses: azure/docker-login@v1
with:
login-server: ${{ secrets.ACR_URL }}
username: ${{ secrets.ACR_PUSH_USER }}
password: ${{ secrets.ACR_PUSH_TOKEN }}
- name: downcase repository
run: |
echo "Docker_Repository=${Docker_Repository,,}" >>${GITHUB_ENV}
- run: docker build . -t ${{ env.Docker_Repository }}
- run: docker push ${{ env.Docker_Repository }}
build_and_push_docker:
uses: MapColonies/shared-workflows/.github/workflows/build-and-push-docker.yaml@v4
secrets: inherit
with:
scope: vector

build_and_push_helm:
uses: MapColonies/shared-workflows/.github/workflows/build-and-push-helm.yaml@v4
secrets: inherit
with:
scope: vector
14 changes: 6 additions & 8 deletions .github/workflows/bump_chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
with:
files: helm/**

# If files in Helm dir changed, init var as yes
# If files in Helm dir changed, init var as yes
- name: Set output if any file(s) in the helm folder change
id: set
if: steps.changed-files-specific.outputs.any_changed == 'true'
run: |
echo "::set-output name=files_changed::yes"
outputs:
files_changed: ${{ steps.set.outputs.files_changed }}
files_changed: ${{ steps.set.outputs.files_changed }}

chart-update:
runs-on: ubuntu-latest
Expand All @@ -58,15 +58,14 @@ jobs:
run: |
echo "New Version: ${{ steps.bump_version.outputs.NEW_VERSION }}"
outputs:
new_version: ${{ steps.bump_version.outputs.NEW_VERSION }}

new_version: ${{ steps.bump_version.outputs.NEW_VERSION }}

build:
name: publish acr
runs-on: ubuntu-latest
environment: prod
needs: chart-update
steps:
steps:
- uses: actions/checkout@v2
name: checkout repo

Expand All @@ -77,7 +76,7 @@ jobs:

- name: login to acr using helm
run: |
helm registry login ${{ secrets.ACR_URL }} --username ${{ secrets.ACR_PUSH_USER }} --password ${{ secrets.ACR_PUSH_TOKEN }}
helm registry login ${{ secrets.ACR_URL }} --username ${{ secrets.ACR_PUSH_USER }} --password ${{ secrets.ACR_PUSH_TOKEN }}

- name: Get Chart name
id: get_chart
Expand All @@ -90,9 +89,8 @@ jobs:
run: |
helm chart save . '${{ secrets.ACR_URL }}/helm/${{ env.CHART }}:${{ needs.chart-update.outputs.new_version }}'
working-directory: ./helm

- name: publish chart to acr
run: |
helm chart push ${{ secrets.ACR_URL }}/helm/${{ env.CHART }}:${{ needs.chart-update.outputs.new_version }}
working-directory: ./helm

2 changes: 1 addition & 1 deletion .github/workflows/publish_package_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
node-version: '20'
- run: npm ci
- run: npx lerna run build --scope '{@map-colonies/detiler-common,@map-colonies/detiler-client}'
- uses: JS-DevTools/npm-publish@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_package_common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
node-version: '20'
- run: npm ci
- run: npx lerna run build --scope=@map-colonies/detiler-common
- uses: JS-DevTools/npm-publish@v3
Expand Down
35 changes: 16 additions & 19 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:

strategy:
matrix:
node: [20.x]
node: [20.x, 22.x]

steps:
- name: Check out TS Project Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand All @@ -30,7 +30,7 @@ jobs:
run: npx lerna run typecheck

- name: Run TS Project linters
uses: wearerequired/lint-action@v1
uses: wearerequired/lint-action@v2
with:
github_token: ${{ secrets.github_token }}
# Enable linters
Expand All @@ -51,7 +51,7 @@ jobs:

steps:
- name: Check out TS Project Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand All @@ -65,31 +65,28 @@ jobs:
run: npx lerna run build

- name: OpenAPI Lint Checks
uses: nwestfall/openapi-action@v1.0.2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
file: ./packages/${{ matrix.package }}/openapi3.yaml
run: npx @redocly/cli lint --format=github-actions ./packages/${{ matrix.package }}/openapi3.yaml

security:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/node@master
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- uses: actions/checkout@master
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/node@master
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

tests:
name: Run Tests
runs-on: ubuntu-latest
strategy:
matrix:
node: [20.x]
node: [20.x, 22.x]

steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand All @@ -106,9 +103,9 @@ jobs:
- name: Run tests
run: npx lerna run test

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Test Reporters
name: Test Reporters ${{ matrix.node }}
path: packages/**/reports/**

build_image:
Expand All @@ -121,7 +118,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: build Docker image
run: docker build -f ./packages/${{ matrix.package }}/Dockerfile -t ${{ matrix.package }}:latest .
4 changes: 2 additions & 2 deletions .github/workflows/release-on-tag-push.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "Publish release on tag push"
name: 'Publish release on tag push'

on:
push:
tags:
- "v*"
- 'v*'

jobs:
publish_release:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
on:
push:
branches:
- master

permissions:
contents: write
pull-requests: write

name: release-please

jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: googleapis/release-please-action@v4
with:
# this assumes that you have created a personal access token
# (PAT) and configured it as a GitHub action secret named
# `MY_RELEASE_PLEASE_TOKEN` (this secret name is not important).
token: ${{ secrets.GH_PAT }}
5 changes: 1 addition & 4 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit $1
npx commitlint --edit ${1}
6 changes: 6 additions & 0 deletions .husky/install.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Skip Husky install in production and CI
if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
process.exit(0);
}
const husky = (await import('husky')).default;
console.log(husky());
4 changes: 1 addition & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- lerna run lint
npx pretty-quick --staged
Loading
Loading