Skip to content

Commit

Permalink
Merge branch 'main' into cleanup/package.json-webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
jainlokesh318 authored Dec 4, 2023
2 parents f7a4dae + 4ef0b57 commit 29653fc
Showing 8 changed files with 32 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .githooks/commit-msg
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ npx prettier --write .
npm run re:format

# Define your commit message convention (e.g., starts with "feature:", "fix:", etc.)
commit_regex="^(Merge branch|feat|fix|chore|docs|style|refactor|test|enhancement).+"
commit_regex="^(Merge branch|feat|fix|chore|docs|style|refactor|test|enhancement):.+"

if ! echo "$commit_msg" | grep -Ei "$commit_regex" ; then
echo "Aborting commit. Your commit message does not follow the conventional format."
28 changes: 14 additions & 14 deletions .github/workflows/release-new-version.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Release a new hyperswitch version

# on:
# schedule:
# - cron: "30 14 * * 0-4" # Run workflow at 8 PM IST every Sunday-Thursday
on:
schedule:
- cron: "30 14 * * 0-4" # Run workflow at 8 PM IST every Sunday-Thursday

# workflow_dispatch:
workflow_dispatch:

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
# cancel-in-progress: true
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
pull_request_target:
types:
- closed
# on:
# pull_request_target:
# types:
# - closed

env:
# Allow more retries for network requests in cargo (downloading crates) and
@@ -30,9 +30,9 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
# with:
# fetch-depth: 0
# token: ${{ secrets.AUTO_RELEASE_PAT }}
with:
fetch-depth: 0
token: ${{ secrets.AUTO_RELEASE_PAT }}

- name: Install Rust
uses: dtolnay/rust-toolchain@master
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CHANGELOG.md
21 changes: 12 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# Changelog

All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.

---
- - -

## 1.0.4 (2023-12-04)

### Bug Fixes

## 1.1.0 (2023-11-29)
- Dead code removal ([#52](https://github.com/juspay/hyperswitch-control-center/pull/52)) ([`eebee65`](https://github.com/juspay/hyperswitch-control-center/commit/eebee659a8326aa32ebcbe2d06c21e8487bea377))
- Remove CHANGELOG.md ([#53](https://github.com/juspay/hyperswitch-control-center/pull/53)) ([`6978bf6`](https://github.com/juspay/hyperswitch-control-center/commit/6978bf6814fb856c67a0fe409638982239c1af80))

### Features
### Miscellaneous Tasks

- Add-release-new-version-action ([`880a10e`](https://github.com/juspay/hyperswitch-control-center/commit/880a10e0695284bb76a6e4cf156774a8a6e0fb01))
- Add change log template ([`9475c4a`](https://github.com/juspay/hyperswitch-control-center/commit/9475c4a2863c12110a4f8bf2826fa68cdba7ab09))
- Remove dead code ([#50](https://github.com/juspay/hyperswitch-control-center/pull/50)) ([`0133ff1`](https://github.com/juspay/hyperswitch-control-center/commit/0133ff13a7e915c4c796bd98fbaf92400690531a))

**Full Changelog:** [`v1.0.2...v1.1.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.0.2...v1.1.0)
**Full Changelog:** [`v1.0.3...v1.0.4`](https://github.com/juspay/hyperswitch-control-center/compare/v1.0.3...v1.0.4)

---
- - -

Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rescript-euler-dashboard",
"version": "1.0.2",
"name": "hyperswitch-dashboard",
"version": "1.0.3",
"main": "index.js",
"author": "Shiva Nandan <[email protected]>",
"license": "MIT",
12 changes: 0 additions & 12 deletions src/screens/HyperSwitch/HSwitchUtils.res
Original file line number Diff line number Diff line change
@@ -227,18 +227,6 @@ let getBrowswerDetails = () => {
}
}

let getLabelToCountryMapper = primary_business_details => {
primary_business_details->Array.reduce(Js.Dict.empty(), (
acc,
currentDetail: HSwitchSettingTypes.businessEntity,
) => {
let labelsYet = acc->Js.Dict.get(currentDetail.country)->Belt.Option.getWithDefault([])
labelsYet->Array.push(currentDetail.business)
acc->Js.Dict.set(currentDetail.country, labelsYet)
acc
})
}

module BackgroundImageWrapper = {
@react.component
let make = (
50 changes: 0 additions & 50 deletions src/screens/HyperSwitch/UserManagement/HSwitchUserRoleEntity.res
Original file line number Diff line number Diff line change
@@ -31,10 +31,6 @@ type roleColTypes =
| Description
| ActiveUsers

let defaultColumnsForRole = [Role, Description, CreatedBy, CreatedOn, ActiveUsers]

let allColumnsForRole = [Role, Description, CreatedBy, CreatedOn, ActiveUsers]

let itemToObjMapperForUser = dict => {
{
user_id: getString(dict, "user_id", ""),
@@ -74,18 +70,6 @@ let itemToObjMapperForRole = dict => {
}
}

let getHeadingForRole = colType => {
switch colType {
| Role => Table.makeHeaderInfo(~key="role", ~title="Role name", ~showSort=true, ())
| Description =>
Table.makeHeaderInfo(~key="description", ~title="Description", ~showSort=true, ())
| CreatedBy => Table.makeHeaderInfo(~key="created_by", ~title="Created By", ~showSort=true, ())
| CreatedOn => Table.makeHeaderInfo(~key="created_on", ~title="Created On", ~showSort=true, ())
| ActiveUsers =>
Table.makeHeaderInfo(~key="activeUsers", ~title="Active Users", ~showSort=true, ())
}
}

let roleToVariantMapper = role => {
switch role->Js.String2.toUpperCase {
| "ADMIN" => Admin
@@ -149,32 +133,10 @@ let getCellForUser = (data: userTableTypes, colType: userColTypes): Table.cell =
}
}

let getCellForRole = (data: roleTableTypes, colType: roleColTypes): Table.cell => {
let role = data.role_id->roleToVariantMapper
switch colType {
| Role =>
CustomCell(
<div
className={`w-fit font-semibold text-sm px-3 py-1 rounded-full border-1 ${role->getCssMapperForRole}`}>
{data.role_id->Js.String2.toUpperCase->React.string}
</div>,
"",
)
| Description => Text(data.role_id)
| CreatedBy => Text(data.role_id)
| CreatedOn => Date(data.role_id)
| ActiveUsers => Text(data.role_id)
}
}

let getUserData: Js.Json.t => array<userTableTypes> = json => {
getArrayDataFromJson(json, itemToObjMapperForUser)
}

let getRoleData: Js.Json.t => array<roleTableTypes> = json => {
getArrayDataFromJson(json, itemToObjMapperForRole)
}

let userEntity = EntityType.makeEntity(
~uri="",
~getObjects=getUserData,
@@ -186,15 +148,3 @@ let userEntity = EntityType.makeEntity(
~getShowLink={userId => `/users/${userId.user_id}?state=user`},
(),
)

// let roleEntity = EntityType.makeEntity(
// ~uri="",
// ~getObjects=getRoleData,
// ~defaultColumns=defaultColumnsForRole,
// ~allColumns=allColumnsForRole,
// ~getHeading=getHeadingForRole,
// ~getCell=getCellForRole,
// ~dataKey="",
// ~getShowLink={roleId => `/users/${roleId.role_id}?state=role`},
// (),
// )

0 comments on commit 29653fc

Please sign in to comment.