Skip to content

Commit

Permalink
Merge branch 'main' into enhancement/subSteps
Browse files Browse the repository at this point in the history
  • Loading branch information
JeevaRamu0104 authored Dec 12, 2023
2 parents bf42d53 + 6c3f3cf commit 8504908
Show file tree
Hide file tree
Showing 165 changed files with 643 additions and 7,084 deletions.
15 changes: 4 additions & 11 deletions .githooks/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,10 @@ echo
commit_regex="^(Merge branch|(feat|fix|chore|refactor|docs|test|style|enhancement):).+"


if git log --show-signature -n 1 | grep -q 'gpg:'; then
if ! echo "$commit_msg" | grep -Ei "$commit_regex" ; then
echo "Aborting commit. Your commit message does not follow the conventional format."
echo "The commit message should begin with one of the following keywords followed by a colon: 'feat', 'fix', 'chore', 'refactor', 'docs', 'test' or 'style'. For example, it should be formatted like this: 'feat: <subject> - <description>'"
exit 1
fi
else
echo "~~~~**** Error: Commit Signature Missing. ****~~~~"
echo "Please make sure to sign your commits. You can sign your commit by using the '-S' option with 'git commit'."
echo "Example: git commit -S -m 'Your commit message'"
echo "Signing commits is crucial for verifying contributions. Consult GitHub's documentation on commit signature verification for guidance: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits"

if ! echo "$commit_msg" | grep -Ei "$commit_regex" ; then
echo "Aborting commit. Your commit message does not follow the conventional format."
echo "The commit message should begin with one of the following keywords followed by a colon: 'feat', 'fix', 'chore', 'refactor', 'docs', 'test' or 'style'. For example, it should be formatted like this: 'feat: <subject> - <description>'"
exit 1
fi

Expand Down
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,44 @@ All notable changes to this project will be documented in this file. See [conven

- - -

## 1.5.0 (2023-12-11)

### Features

- Refunds search based on refunds id ([#83](https://github.com/juspay/hyperswitch-control-center/pull/83)) ([`f5363b4`](https://github.com/juspay/hyperswitch-control-center/commit/f5363b4ac3547232bd637884bd8a9fad85056608))
- Identity file changes in Codebase. ([#89](https://github.com/juspay/hyperswitch-control-center/pull/89)) ([`9e3aec7`](https://github.com/juspay/hyperswitch-control-center/commit/9e3aec7f7434cf4610db50a716653e73693aec94))
- Webhook Section Update - In Connector Preview ([#90](https://github.com/juspay/hyperswitch-control-center/pull/90)) ([`07a2cf1`](https://github.com/juspay/hyperswitch-control-center/commit/07a2cf1d5f36541e69dcf701c38fce33697f0df0))

### Bug Fixes

- Recoil value for feature flag updated ([#85](https://github.com/juspay/hyperswitch-control-center/pull/85)) ([`d7bb46e`](https://github.com/juspay/hyperswitch-control-center/commit/d7bb46e26c766ab8b43488ff42c6a0ad4eb21864))
- Added configure return url after business profile ([#82](https://github.com/juspay/hyperswitch-control-center/pull/82)) ([`ade63aa`](https://github.com/juspay/hyperswitch-control-center/commit/ade63aa8177d6269e02ac0db4f6e63867511b661))
- SDK Processing - Go to payments not working fix ([#88](https://github.com/juspay/hyperswitch-control-center/pull/88)) ([`f45d8dd`](https://github.com/juspay/hyperswitch-control-center/commit/f45d8dd6016f859b76013364c83c0758e5a42114))

### Refactors

- Common file for all identity functions ([#86](https://github.com/juspay/hyperswitch-control-center/pull/86)) ([`6ad715f`](https://github.com/juspay/hyperswitch-control-center/commit/6ad715fb11da557f4f07ff35e8f616b69684ff0c))

**Full Changelog:** [`v1.4.0...v1.5.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.4.0...v1.5.0)

- - -


## 1.4.0 (2023-12-08)

### Features

- New connector addition Helcim ([#80](https://github.com/juspay/hyperswitch-control-center/pull/80)) ([`0e59c4a`](https://github.com/juspay/hyperswitch-control-center/commit/0e59c4a6e80fe9d03c8f289810f7796e3da23cb1))

### Bug Fixes

- Hide connector sr ([#81](https://github.com/juspay/hyperswitch-control-center/pull/81)) ([`0880fd8`](https://github.com/juspay/hyperswitch-control-center/commit/0880fd8757f46236caff8783eb3154ec88b286c2))

**Full Changelog:** [`v1.3.1...v1.4.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.3.1...v1.4.0)

- - -


## 1.3.1 (2023-12-07)

### Bug Fixes
Expand Down
22 changes: 22 additions & 0 deletions public/hyperswitch/Gateway/HELCIM.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 12 additions & 6 deletions public/hyperswitch/icons/solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let make = (
endDateArr->Belt.Array.get(i)->Belt.Option.getWithDefault(x),
))

input.onChange(newArr->NestedDropdown.formToArray)
input.onChange(newArr->Identity.anyTypeToReactEvent)
}

let showCalendars = React.useMemo1(() => {
Expand Down
9 changes: 4 additions & 5 deletions src/components/Base64ImageInputWithDnD.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
external toReactEvent: 'a => ReactEvent.Form.t = "%identity"
external strToDomImg: string => Webapi.Dom.Image.t = "%identity"
@send external drawImage: (Webapi.Canvas.Canvas2d.t, 'a, int, int) => unit = "drawImage"
@send external toDataURL: 'a => string = "toDataURL"
Expand Down Expand Up @@ -57,7 +56,7 @@ let make = (
)
let clearImage = _evt => {
setFilename(_ => "")
input.onChange(""->toReactEvent)
input.onChange(""->Identity.stringToFormReactEvent)
}
let onChange = evt => {
let target = ReactEvent.Form.target(evt)
Expand All @@ -76,7 +75,7 @@ let make = (
let target = ReactEvent.Form.target(e)
let data = target["result"]
setIsNewUpload(_ => true)
input.onChange(toReactEvent(data))
input.onChange(data->Identity.anyTypeToReactEvent)
}
}
}
Expand Down Expand Up @@ -106,7 +105,7 @@ let make = (
context->drawImage(img, 0, 0)
toDataURL(canvas)
}
input.onChange(a->toReactEvent)
input.onChange(a->Identity.stringToFormReactEvent)
}
<div
onDragOver={ev => {
Expand All @@ -129,7 +128,7 @@ let make = (
let target = ReactEvent.Form.target(e)
let data = target["result"]
setIsNewUpload(_ => true)
input.onChange(toReactEvent(data))
input.onChange(data->Identity.anyTypeToReactEvent)
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/components/BreadCrumb.res
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
external jsonToarr: Js.Json.t => array<'a> = "%identity"

type status = Active | Disabled | Completed

type breadCrumb_options = {
Expand Down
3 changes: 1 addition & 2 deletions src/components/ButtonGroupIp.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
external strToFormEvent: Js.String.t => ReactEvent.Form.t = "%identity"
open SelectBox
@react.component
let make = (
Expand All @@ -9,7 +8,7 @@ let make = (
~isSeparate=false,
~buttonSize=?,
) => {
let onChange = str => input.onChange(str->strToFormEvent)
let onChange = str => input.onChange(str->Identity.stringToFormReactEvent)
let buttonState = {isDisabled ? Button.Disabled : Button.Normal}

let buttons =
Expand Down
9 changes: 1 addition & 8 deletions src/components/CsvFileUpload.res
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
external toReactEvent: 'a => ReactEvent.Form.t = "%identity"
type t

type formData
external formDataToStr: t => string = "%identity"

external toString: 't => string = "%identity"
external toRef: 'a => 't = "%identity"
@new external formData: unit => t = "FormData"

@send external append: (t, string, 'a) => unit = "append"
@send external delete: (t, string) => unit = "delete"
@send external get: (t, string) => 'k = "get"
Expand All @@ -28,7 +21,7 @@ let make = (
setFilenameVal(_ => "")
onFileUpload(None)

input.onChange(""->toReactEvent)
input.onChange(""->Identity.stringToFormReactEvent)
}

let onChange = evt => {
Expand Down
15 changes: 6 additions & 9 deletions src/components/CsvInputField.res
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
external toReactEvent: 'a => ReactEvent.Form.t = "%identity"
external jsonToarr: Js.Json.t => array<'a> = "%identity"
external arrToReactEvent: array<string> => ReactEvent.Form.t = "%identity"
external strToReactEvent: string => ReactEvent.Form.t = "%identity"

module FilenameSaver = {
@react.component
let make = (~input: ReactFinalForm.fieldRenderPropsInput, ~fileName) => {
React.useEffect1(() => {
let reactEvFilename = fileName->toReactEvent
let reactEvFilename = fileName->Identity.anyTypeToReactEvent
input.onChange(reactEvFilename)
None
}, [fileName])
Expand Down Expand Up @@ -110,12 +107,12 @@ let make = (
let clearCsv = _evt => {
setFilename(_ => "")
setKey(pre => pre + 1)
input.onChange(arrToReactEvent([]))
input.onChange(Identity.arrofStringToReactEvent([]))
}
let clearData = _ev => {
setFilename(_ => "")
setKey(pre => pre + 1)
input.onChange(strToReactEvent(""))
input.onChange(Identity.stringToFormReactEvent(""))
}

let toast = (message, toastType) => {
Expand Down Expand Up @@ -164,7 +161,7 @@ let make = (
})

if errorLines->Js.Array2.length === 0 {
input.onChange(toReactEvent(res))
input.onChange(res->Identity.anyTypeToReactEvent)
toast("File Uploaded Successfully", ToastSuccess)
}

Expand All @@ -175,7 +172,7 @@ let make = (
}

| None => {
input.onChange(toReactEvent(res))
input.onChange(res->Identity.anyTypeToReactEvent)
toast("File Uploaded Successfully", ToastSuccess)
}
}
Expand All @@ -188,7 +185,7 @@ let make = (
}
| _ =>
setIsNewUpload(_ => true)
input.onChange(toReactEvent(csv))
input.onChange(csv->Identity.anyTypeToReactEvent)
toast("File Uploaded Successfully", ToastSuccess)
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/components/CustomCharts/HighchartBarChart.res
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
external objToJson: {..} => Js.Json.t = "%identity"

module RawBarChart = {
@react.component
let make = (~options: Js.Json.t) => {
Expand Down Expand Up @@ -59,7 +57,7 @@ module HighBarChart1D = {
},
"series": barSeries,
"legend": {"enabled": false},
}->objToJson
}->Identity.genericObjectOrRecordToJson
barOption
}, (barSeries, gridLineColor))
if barSeries->Js.Array2.length > 0 {
Expand Down
3 changes: 1 addition & 2 deletions src/components/CustomCharts/HighchartHorizontalBarChart.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
external objToJson: 'a => Js.Json.t = "%identity"
module RawHBarChart = {
@react.component
let make = (~options: Js.Json.t) => {
Expand Down Expand Up @@ -159,7 +158,7 @@ let make = (
enabled: false,
},
}
defaultOptions->objToJson
defaultOptions->Identity.genericTypeToJson
}, (barChartData, theme))

<RawHBarChart options=barOption />
Expand Down
3 changes: 1 addition & 2 deletions src/components/CustomCharts/HighchartPieChart.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
external objToJson: 'a => Js.Json.t = "%identity"
%%raw(`require("./highcharts.css")`)
module RawPieChart = {
@react.component
Expand Down Expand Up @@ -106,7 +105,7 @@ let make = (
backgroundColor: theme === Dark ? "#202124" : "white",
},
}
defaultOptions->objToJson
defaultOptions->Identity.genericTypeToJson
}, (pieSeriesData, theme))

<RawPieChart options=barOption />
Expand Down
Loading

0 comments on commit 8504908

Please sign in to comment.