Skip to content

Commit

Permalink
MERGING release/23.10 into main (#23)
Browse files Browse the repository at this point in the history
* CM-147: use fe-template

* CM-147: workflows added, minor changes

* CM-147: workflows update

* CM-138: User Groups Management implementation (#1)

* CM-139: base project configuration, eslint, main route

* CM-139: basic structure of tasks view

* CM-139: basic view of task traiage

* CM-139: basic view of task triage

* CM-139: task preview improvements

* CM-139: import fix

* CM-138: user groups management page and basic searcher

* CM-138: reducer, actions, fetchTaskGroups, searcher

* CM-138: taskExecutorsPicker, taskGroupPage, taskGroupHeadPanel

* CM-138: fetch task group, clear on unmount

* OTC-138: remove package-lock json

* CM-138: implementation of create/update mutation, executors picker fix

* CM-138: removal of console log

* CM-138: filtering, sorting, searching improvements, executorsPicker fixes

* CM-138: create PERFORM_MUTATION and adjust existing logic, constants fix

* CM-138: name of function changed

* CM-138: TaskExecutorsPicker fixes

* CM-138: component name changed - TaskDetailsPage

* CM-139: add core tasks fe (#2)

* CM-139: add core tasks fe

* CM-143: fix eslint

* CM-139: add styles

* CM-139: address PR comments

* CM-139: remove intl

* CM-144: add my tasks fe (#3)

* CM-144: add my tasks fe

* CM-144: remove unused variables

* CM-139: fix issues from QA (#4)

* CM-139: fix comparing edited and fetch object

* CM-139: fix formatting of taskGroup

* CM-231: Added Admin main menu contribution

* CM-145: make initial policy empty (#7)

* CM-145: make initial policy empty

* CM-145: fix eslint

* CM-138: fix mutation label and action type (#6)

* add-server-deploy-workflow: add file (#9)

* CM-139: change perms on frontend (#8)

* CM-139: fix comparing edited and fetch object

* CM-139: fix formatting of taskGroup

* CM-139: change perms to search tasks

* CM-232: use IDs in mutation label (#11)

* CM-144: fix tasks (#10)

* CM-144: add my tasks fe

* CM-144: remove unused variables

* CM-144: fix tasks

* CM-144: fix eslint

* Update README.md

* CM-230: tasks refactor (#12)

* CM-230: fix modularity of the module

* CM-230: refactor code

* CM-230: refactor code

* CM-230: fix headers

* CM-230: add beneficiary crud tasks

* CM-230: eslint

* CM-230: address pr review

* CM-230: address pr review

* CM-230: fix eslint

* CM-299: show business status on searcher (#13)

* CM-332: fetch tasks only for particular searcher (#14)

* CM-332: fetch tasks only for particular searcher

* CM-332: fix eslint

---------

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-327: change the way how task updates are fetched (#15)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* hotfix: fix parsing schema in task (#16)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-327: fetch task only after it is updated (#18)

* CM-327: change the way how task updates are fetched

* CM-327: make sure task is fetched after it is uploaded

---------

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* hotfix: fix displaying deleted groups (#17)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* add-sonar-ci: add sonar files (#20)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* MERGING RELEASE branches (#19)

* CM-332: fetch tasks only for particular searcher (#14)

* CM-332: fetch tasks only for particular searcher

* CM-332: fix eslint

---------

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-327: change the way how task updates are fetched (#15)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* hotfix: fix parsing schema in task (#16)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* CM-327: fetch task only after it is updated (#18)

* CM-327: change the way how task updates are fetched

* CM-327: make sure task is fetched after it is uploaded

---------

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* hotfix: fix displaying deleted groups (#17)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

* add-sonar-ci: add sonar files (#20)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>

---------

Co-authored-by: olewandowski <olewandowski@soldevelo.com>
Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: Damian Borowiecki <dborowiecki@soldevelo.com>
Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com>
Co-authored-by: Jan <j.dolkowski@soldevelo.com>
Co-authored-by: Dragos DOBRE <dragos.dobre@swisstph.ch>
Co-authored-by: Hiren Soni <65155846+hirensoni913@users.noreply.github.com>
  • Loading branch information
9 people authored Dec 16, 2023
1 parent d0e7e7c commit 6ec7457
Show file tree
Hide file tree
Showing 45 changed files with 3,410 additions and 676 deletions.
12 changes: 12 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
["@babel/preset-env", {
"modules": false
}],
["@babel/preset-react"]
],
"plugins": [
"@babel/plugin-transform-runtime",
"@babel/plugin-proposal-class-properties"
]
}
24 changes: 24 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parser": "babel-eslint",
"extends": [
"standard",
"standard-react"
],
"env": {
"es6": true
},
"plugins": [
"react"
],
"parserOptions": {
"sourceType": "module"
},
"rules": {
// don't force es6 functions to include space before paren
"space-before-function-paren": 0,

// allow specifying true explicitly for boolean props
"react/jsx-boolean-value": 0
}
}

26 changes: 26 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"plugin:react/recommended",
"airbnb"
],
"overrides": [
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
"react/prop-types": "off",
"no-shadow": "off", // disabled due to use of bindActionCreators
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }], // disabled due to naming consistency with other modules
"import/no-unresolved": "off", // disable due to module architecture. For modules most references are marked as unresolved
"max-len": ["error", { "code": 120 }]
}
}
44 changes: 44 additions & 0 deletions .github/workflows/CI_and_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This is a basic workflow to help you get started with Actions

name: Build

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
pull_request:
branches: [ main, develop ]

# 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:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

# 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
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run : yarn install
- name: build
run : yarn build
- name: Check build status
run: |
if [ -d "dist" ]; then
echo "Build successful!"
else
echo "Build failed!"
exit 1
fi
23 changes: 23 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Sonar CI pipeline
on:
push:
branches:
- main
- 'release/**'
- develop
- 'feature/**'
pull_request:
types: [opened, synchronize, reopened]
jobs:
sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/core-mis-test-server-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: CoreMIS Server Deployment
on:
push:
branches:
- develop

jobs:
rebuild-test-server:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2

- name: Set up SSH
run: |
mkdir -p ~/.ssh
echo "${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} >> ~/.ssh/known_hosts
env:
CORE_MIS_DEPLOYMENT_SSH_KEY: ${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }}
CORE_MIS_DEPLOYMENT_USER: ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}
CORE_MIS_DEPLOYMENT_HOST: ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }}

- name: Run Docker Compose
run: |
ssh -o StrictHostKeyChecking=no -T ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022
ssh ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022 << EOF
cd coreMIS/
docker-compose build backend gateway && docker-compose up -d
EOF
30 changes: 30 additions & 0 deletions .github/workflows/eslint_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: ESLint

on:
push:
branches:
- main
- develop
pull_request:
branches:
- main
- develop

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 14

- name: Install dependencies
run: yarn install

- name: Run ESLint
run: npx eslint src
51 changes: 51 additions & 0 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

name: Node.js Package

on:
release:
types: [created]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
- run: yarn install
- run: yarn build

publish-npm:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://registry.npmjs.org/
scope: openimis
- run: yarn install
- run: yarn build
- run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

publish-gpr:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://npm.pkg.github.com/
- run: yarn install
- run: yarn build
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
node_modules

# builds
build
dist
.rpt2_cache

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
.editorconfig

npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn.lock
6 changes: 6 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "all",
"printWidth": 120,
"quoteProps": "preserve",
"arrowParens": "always"
}
Loading

0 comments on commit 6ec7457

Please sign in to comment.