Skip to content

Commit

Permalink
Merge pull request #88 from openimis/develop
Browse files Browse the repository at this point in the history
MERGING RELEASE branches
  • Loading branch information
hirensoni913 authored Nov 13, 2023
2 parents c579a9d + a40b038 commit 8965bcf
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Module SonarCloud 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 }}
5 changes: 0 additions & 5 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ jobs:
run: echo $(jq --arg a "$GIT_TAG_NAME" '.version = ($a)' package.json) > package.json
- run: yarn install
- run: yarn build
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

publish-npm:
needs: build
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
"dependencies": {
"@material-ui/lab": "^4.0.0-alpha.60"
}
}
}
2 changes: 1 addition & 1 deletion src/components/UserSearcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class UserSearcher extends Component {
errorItems={errorUsers}
contributionKey={USER_SEARCHER_CONTRIBUTION_KEY}
tableTitle={formatMessageWithValues(intl, "admin.user", "userSummaries", {
count: usersPageInfo.totalCount?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","),
count: usersPageInfo.totalCount?.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,"),
})}
fetch={this.fetch}
rowIdentifier={(r) => r.uuid}
Expand Down

0 comments on commit 8965bcf

Please sign in to comment.