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

MERGING release/24.04 into main #51

Closed
wants to merge 60 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
cecd947
CM-147: use fe-template
olewandowski1 Jun 21, 2023
d2c0c64
CM-147: workflows added, minor changes
olewandowski1 Jun 21, 2023
15162dc
CM-147: workflows update
olewandowski1 Jun 21, 2023
71d904b
CM-138: User Groups Management implementation (#1)
olewandowski1 Jun 27, 2023
4ef4687
CM-139: add core tasks fe (#2)
jdolkowski Jul 6, 2023
7fc2d92
CM-144: add my tasks fe (#3)
jdolkowski Jul 7, 2023
04ec909
CM-139: fix issues from QA (#4)
jdolkowski Jul 11, 2023
85aed05
CM-231: Added Admin main menu contribution
dborowiecki Jul 12, 2023
3b576c2
Merge pull request #5 from openimis/feature/CM-231
olewandowski1 Jul 12, 2023
8ba3944
CM-145: make initial policy empty (#7)
jdolkowski Jul 14, 2023
15ef4cc
CM-138: fix mutation label and action type (#6)
jdolkowski Jul 14, 2023
e941edf
add-server-deploy-workflow: add file (#9)
jdolkowski Jul 17, 2023
beb3e3e
CM-139: change perms on frontend (#8)
jdolkowski Jul 18, 2023
b212763
CM-232: use IDs in mutation label (#11)
olewandowski1 Jul 24, 2023
887a834
CM-144: fix tasks (#10)
jdolkowski Jul 25, 2023
03df9ff
Update README.md
jdolkowski Jul 26, 2023
48a3ca8
CM-230: tasks refactor (#12)
jdolkowski Aug 14, 2023
8e96e77
CM-299: show business status on searcher (#13)
sniedzielski Sep 5, 2023
a47bfcc
CM-332: fetch tasks only for particular searcher (#14)
jdolkowski Sep 28, 2023
342d5b9
CM-327: change the way how task updates are fetched (#15)
jdolkowski Sep 29, 2023
2afa1f3
hotfix: fix parsing schema in task (#16)
jdolkowski Oct 4, 2023
7a947c4
CM-327: fetch task only after it is updated (#18)
jdolkowski Oct 5, 2023
17d24b1
hotfix: fix displaying deleted groups (#17)
jdolkowski Oct 5, 2023
bc6393d
add-sonar-ci: add sonar files (#20)
jdolkowski Oct 18, 2023
f89cc05
MERGING RELEASE branches (#19)
dragos-dobre Oct 18, 2023
aa7dbc1
Merge pull request #21 from openimis/develop
hirensoni913 Nov 13, 2023
6e9d776
Merge pull request #22 from openimis/release/23.10
hirensoni913 Nov 13, 2023
4469596
CM-417 Include previous state in task definition (#24)
malinowskikam Jan 10, 2024
08502ea
CM-396: export tasks searcher
sniedzielski Jan 10, 2024
563f745
Merge pull request #25 from openimis/feature/CM-396
jdolkowski Jan 12, 2024
4c5f4ab
CM-473: adjust to business_data logic (#26)
jdolkowski Jan 19, 2024
483ba93
add json_ext (#27)
jdolkowski Jan 19, 2024
da5ea91
Hotfix add json ext (#28)
jdolkowski Jan 19, 2024
55ec622
CM-457: conditionaly display task data (#29)
jdolkowski Jan 25, 2024
1fba3ca
hotfix-task-display (#30)
jdolkowski Jan 26, 2024
f9fa968
CM-458: adjust tasks to work with deduplication (#31)
jdolkowski Jan 29, 2024
a122c5e
hotfix-resolve-task: change initial state of additional data (#32)
jdolkowski Jan 29, 2024
2f910d9
CM-487: task update (#33)
jdolkowski Feb 9, 2024
f0f6b68
hotfix: task source optional (#34)
jdolkowski Feb 12, 2024
25bdb11
CM-549: allow to fetch task using mutiple entity ids (#36)
jdolkowski Feb 20, 2024
cb3066b
CM-722: allow to add task source to task group (#35)
jdolkowski Feb 27, 2024
7afa658
hotfix: task sources (#37)
jdolkowski Feb 28, 2024
acd59c6
Hotfix task sources (#38)
jdolkowski Feb 28, 2024
f894602
C-719: Remove business status display (#39)
dborowiecki Mar 11, 2024
5159e73
CM-728: remove iso parse (#40)
jdolkowski Mar 21, 2024
a03fc6d
CM-762: fix group task tab (#42)
jdolkowski Mar 22, 2024
35f989e
CM-750: fix task filtering (#41)
jdolkowski Mar 22, 2024
26cbdc1
Merge pull request #43 from openimis/develop
delcroip Mar 28, 2024
4f3bee9
CM-703: Replace Hyphen for no changes - the same as initial value
sniedzielski Apr 5, 2024
85b4cb3
Merge pull request #44 from openimis/feature/CM-703
jdolkowski Apr 5, 2024
fb80c9e
CM-703: Replace Hyphen for no changes - the same as initial value (#45)
delcroip Apr 12, 2024
b7040f3
CM-749: add task date created (#47)
jdolkowski Apr 24, 2024
3dc4769
CM-880: added searcher for all tasks with special permission
sniedzielski Apr 24, 2024
f2cd580
CM-880: added adjustments for filtering all tasks
sniedzielski Apr 24, 2024
0a16121
CM-880: minor UI adjustments
sniedzielski Apr 24, 2024
3a4f124
CM-880: added picker for source and task type
sniedzielski Apr 24, 2024
4966854
Merge pull request #48 from openimis/feature/CM-880
jdolkowski Apr 24, 2024
1082b0c
CM-880: changed wrong translated label
sniedzielski Apr 25, 2024
9876f51
Merge pull request #49 from openimis/hotfix/task-all
jdolkowski Apr 25, 2024
1cd31e4
Merge pull request #46 from openimis/develop
delcroip Apr 25, 2024
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
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
Loading