Skip to content

Commit 0b4d4ed

Browse files
rsbhpaanSinghCoder
andauthored
fix(sdk): update apsara v1 button props (#869)
* feat: update v1 button props * refactor: change css vars according to new version --------- Co-authored-by: paanSinghCoder <gaurav3017@gmail.com>
1 parent 670bf36 commit 0b4d4ed

File tree

9 files changed

+257
-28
lines changed

9 files changed

+257
-28
lines changed

sdks/js/packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"devDependencies": {
6262
"@jest/globals": "^29.7.0",
6363
"@radix-ui/react-icons": "^1.3.0",
64-
"@raystack/apsara": "^0.25.0",
64+
"@raystack/apsara": "^0.30.1",
6565
"@raystack/eslint-config": "workspace:^",
6666
"@raystack/frontier-tsconfig": "workspace:^",
6767
"@size-limit/preset-small-lib": "^8.2.6",
@@ -104,7 +104,7 @@
104104
"yup": "^1.2.0"
105105
},
106106
"peerDependencies": {
107-
"@raystack/apsara": ">=0.23.0",
107+
"@raystack/apsara": ">=0.30.0",
108108
"react": "^18.2.0"
109109
},
110110
"peerDependenciesMeta": {

sdks/js/packages/core/react/components/organization/api-keys/add.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ export const AddServiceAccount = () => {
220220
<Separator />
221221
<Flex justify="end" className={styles.addDialogFormBtnWrapper}>
222222
<Button
223-
variant="primary"
223+
variant="solid"
224+
color="accent"
224225
size="normal"
225226
type="submit"
226227
data-test-id="frontier-sdk-add-service-account-btn"

sdks/js/packages/core/react/components/organization/api-keys/columns.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const getColumns = ({
2323
}}
2424
style={{
2525
textDecoration: 'none',
26-
color: 'var(--rs-color-text-base-primary)'
26+
color: 'var(--rs-color-foreground-base-primary)'
2727
}}
2828
>
2929
{getValue()}

sdks/js/packages/core/react/components/organization/api-keys/delete.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,17 @@ export const DeleteServiceAccount = () => {
7979
gap={'medium'}
8080
>
8181
<Button
82-
variant="secondary"
82+
variant="outline"
83+
color="neutral"
8384
size="normal"
8485
data-test-id="frontier-sdk-delete-service-account-cancel-btn"
8586
onClick={onCancel}
8687
>
8788
Cancel
8889
</Button>
8990
<Button
90-
variant="danger"
91+
variant="solid"
92+
color="danger"
9193
size="normal"
9294
data-test-id="frontier-sdk-delete-service-account-confirm-btn"
9395
loading={isLoading}

sdks/js/packages/core/react/components/organization/api-keys/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ const NoServiceAccounts = ({
4040
primaryAction={
4141
<Button
4242
data-test-id="frontier-sdk-new-service-account-btn"
43-
variant="secondary"
43+
variant="outline"
44+
color="neutral"
4445
onClick={() => navigate({ to: '/api-keys/add' })}
4546
>
4647
Create new service account
@@ -152,7 +153,8 @@ const ServiceAccountsTable = ({
152153
<Skeleton height={'32px'} width={'64px'} />
153154
) : (
154155
<Button
155-
variant="primary"
156+
variant="solid"
157+
color="accent"
156158
data-test-id="frontier-sdk-add-service-account-btn"
157159
onClick={() => navigate({ to: '/api-keys/add' })}
158160
>

sdks/js/packages/core/react/components/organization/api-keys/service-user/delete.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,17 @@ export const DeleteServiceAccountKey = () => {
9191
gap={'medium'}
9292
>
9393
<Button
94-
variant="secondary"
94+
variant="outline"
95+
color="neutral"
9596
size="normal"
9697
data-test-id="frontier-sdk-revoke-service-account-key-cancel-btn"
9798
onClick={onCancel}
9899
>
99100
Cancel
100101
</Button>
101102
<Button
102-
variant="danger"
103+
variant="solid"
104+
color="danger"
103105
size="normal"
104106
data-test-id="frontier-sdk-revoke-service-account-key-confirm-btn"
105107
loading={isLoading}

sdks/js/packages/core/react/components/organization/api-keys/service-user/index.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ const Headings = ({
5050
<Flex justify={'between'}>
5151
<Text size={6}>{name}</Text>
5252
<Button
53-
variant={'secondary'}
53+
variant="outline"
54+
color="neutral"
5455
onClick={openProjectsPage}
5556
data-test-id="frontier-sdk-service-account-manage-access-open-btn"
5657
>
@@ -118,7 +119,8 @@ const ServiceUserTokenItem = ({
118119
{token?.title}
119120
</Text>
120121
<Button
121-
variant="secondary"
122+
variant="outline"
123+
color="neutral"
122124
size={'small'}
123125
data-test-id={`frontier-sdk-service-account-token-revoke-btn`}
124126
onClick={onRevokeClick}
@@ -139,7 +141,7 @@ const ServiceUserTokenItem = ({
139141
{encodedToken}
140142
</Text>
141143
{isCopied ? (
142-
<CheckCircledIcon color="var(--rs-color-text-success-primary)" />
144+
<CheckCircledIcon color="var(--rs-color-foreground-success-primary)" />
143145
) : (
144146
<CopyIcon
145147
onClick={onCopy}

sdks/js/packages/core/react/components/organization/project/members/remove.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ export const RemoveProjectMember = () => {
8484
<Flex justify="end" style={{ padding: 'var(--pd-16)' }} gap="medium">
8585
<Button
8686
size="normal"
87-
variant="secondary"
87+
color="neutral"
88+
variant="outline"
8889
onClick={() => navigate({ to: '/members' })}
8990
data-test-id="frontier-sdk-remove-project-member-cancel-btn"
9091
disabled={isLoading}
@@ -93,7 +94,8 @@ export const RemoveProjectMember = () => {
9394
</Button>
9495
<Button
9596
size="normal"
96-
variant="danger"
97+
color="danger"
98+
variant="solid"
9799
onClick={onConfirm}
98100
data-test-id="frontier-sdk-remove-project-member-confirm-btn"
99101
disabled={isLoading}

0 commit comments

Comments
 (0)