Skip to content

Commit 90307e5

Browse files
committed
Merge branch 'develop'
2 parents 28eb01e + bebec9e commit 90307e5

38 files changed

+994
-1683
lines changed

.github/workflows/cache-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121

2222
- name: Cleanup cache
2323
run: |

.github/workflows/linters.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Install Node.JS
2828
uses: actions/setup-node@v6
2929

3030
- name: Cache modules
31-
uses: actions/cache@v4
31+
uses: actions/cache@v5
3232
with:
3333
path: ./node_modules
3434
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/setup-node@v6
3939

4040
- name: Checkout code
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4242

4343
- name: Get version
4444
id: get_version

.github/workflows/repo-labels-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Run Labeler
3030
uses: crazy-max/ghaction-github-labeler@v5

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
npx lint-staged
2+
npm run type-check

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.html
2+
*.svg
3+
!public/upload*.html
4+
build

.prettierrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 79 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,102 @@
1-
# Development
1+
# Contributing Guide
22

3-
To explore the source code, start with [src/App.tsx](./src/App.tsx).
3+
Welcome! There are many ways to contribute, including submitting bug
4+
reports, improving documentation, submitting feature requests, reviewing
5+
new submissions, or contributing code that can be incorporated into the
6+
project.
47

5-
## How to run
8+
## Review process
69

7-
After having cloned the Rentgen repository, run the following commands at the root directory:
10+
For any **significant** changes please create a new GitHub issue and
11+
enhancements that you wish to make. Describe the feature you would like
12+
to see, why you need it, and how it will work. Discuss your ideas
13+
transparently and get community feedback before proceeding.
14+
15+
Small changes can directly be crafted and submitted to the GitHub
16+
Repository as a Pull Request. This requires creating a **repo fork** using
17+
[instruction](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
18+
19+
## Initial setup for local development
20+
21+
### Install Git
22+
23+
Please follow
24+
[instruction](https://docs.github.com/en/get-started/quickstart/set-up-git).
25+
26+
### Clone the repo
27+
28+
Open terminal and run these commands:
29+
30+
```bash
31+
git clone [email protected]:myuser/data-rentgen-ui.git
32+
33+
cd data-rentgen-ui
34+
```
35+
36+
### Setup environment
37+
38+
To install all necessary dependencies, run these commands:
839

940
```bash
1041
npm ci
42+
npm run pre-commit-install
43+
```
44+
45+
# How to
46+
47+
## Run development server
48+
49+
```bash
1150
npm run dev
1251
```
1352

14-
These commands will install dependencies and launch the dev server, by going to localhost:3000 you can go to the Rentgen UI interface.
53+
### Create pull request
54+
55+
Commit your changes:
56+
57+
```bash
58+
git commit -m "Commit message"
59+
git push
60+
```
61+
62+
Then open Github interface and [create pull request](https://docs.github.com/en/get-started/quickstart/contributing-to-projects#making-a-pull-request).
63+
Please follow guide from PR body template.
1564

16-
## How to format code
65+
After pull request is created, it get a corresponding number, e.g. 123
66+
(`pr_number`).
1767

18-
Run the following command at the root directory:
68+
## Release Process
69+
70+
Note: this is only for repo maintainers
71+
72+
0. Checkout to ``develop`` branch and update it to the actual state
1973

2074
```bash
21-
npm run prettier-format
75+
git checkout develop
76+
git pull -p
2277
```
2378

24-
## How to run linters
79+
1. Merge ``develop`` branch to ``master``, **WITHOUT** squashing
2580

26-
Run the following command at the root directory:
81+
```bash
82+
git checkout master
83+
git pull
84+
git merge develop
85+
git push
86+
```
87+
88+
2. Add git tag to the latest commit in ``master`` branch
2789

2890
```bash
29-
npm run lint
91+
git tag "$VERSION"
92+
git push origin "$VERSION"
3093
```
3194

32-
## How to install pre-commit hooks
95+
VERSION should be the same as for backend.
96+
97+
3. Update version in ``develop`` branch **after release**:
3398

3499
```bash
35-
npm run pre-commit-install
100+
sed -i "s#\"version\": \"[[:digit:]]\.[[:digit:]]\.[[:digit:]]\"#\"version\": \"$VERSION\"#" package.json package-lock.json
101+
npm i
36102
```

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2024-2025 MTS PJSC. All rights reserved.
1+
Copyright 2024-present MTS PJSC. All rights reserved.
22

33
Apache License
44
Version 2.0, January 2004

assets/icons/syncmaster.svg

Lines changed: 80 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)