Skip to content

Commit 80437d1

Browse files
avoidikavoidik
authored
Merge branch 'yugabyte:master' into master
2 parents 3f3f705 + 2a679d7 commit 80437d1

File tree

19 files changed

+296
-224
lines changed

19 files changed

+296
-224
lines changed

‎docs/assets/scss/_yb_kapa_modal_styling.scss‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,4 @@
11
// Kapa modal Styling, used in JS.
2-
.mantine-SegmentedControl-label {
3-
color: #4E5F6D;
4-
font-size: 13px;
5-
font-style: normal;
6-
font-weight: 400;
7-
line-height: 16px;
8-
display: flex;
9-
padding: 4px 12px 4px 8px;
10-
align-items: center;
11-
height: 24px;
12-
gap: 4px;
13-
}
14-
15-
.mantine-Image-imageWrapper img {
2+
.mantine-Image-root img {
163
border-radius: 0;
174
}
18-
19-
.mantine-SegmentedControl-root span {
20-
display: none;
21-
}
22-
23-
.mantine-SegmentedControl-root {
24-
padding: 0;
25-
overflow: visible;
26-
}
27-
28-
.mantine-SegmentedControl-controlActive {
29-
gap: 4px;
30-
background: #fff;
31-
}
32-
33-
.mantine-SegmentedControl-control:not(:last-child) label:before {
34-
content: "";
35-
width: 24px;
36-
height: 24px;
37-
background: url(/icons/ai-icon.svg) center no-repeat;
38-
display: inline-block;
39-
filter: grayscale(1) brightness(1.2);
40-
}
41-
42-
.mantine-SegmentedControl-control:not(:last-child).mantine-SegmentedControl-controlActive label:before {
43-
filter: none;
44-
}
45-
46-
.mantine-SegmentedControl-control:not(:last-child).mantine-SegmentedControl-controlActive label {
47-
background: linear-gradient(273deg, #ED35EC 5.14%, #ED35C5 38.93%, #7879F1 48.17%, #5E60F0 98.9%);
48-
background-clip: text;
49-
-webkit-background-clip: text;
50-
-webkit-text-fill-color: transparent;
51-
font-weight: 600;
52-
}
53-
54-
.mantine-SegmentedControl-control:last-child.mantine-SegmentedControl-controlActive label {
55-
color: #2B59C3;
56-
font-weight: 600;
57-
}
58-
59-
.mantine-SegmentedControl-controlActive {
60-
border-radius: 8px;
61-
box-shadow: 0 0 0 1px #7879F1;
62-
}
63-
64-
.mantine-SegmentedControl-controlActive label {
65-
border-radius: 8px;
66-
border: 0;
67-
font-size: 13px;
68-
font-style: normal;
69-
font-weight: 600;
70-
line-height: 16px;
71-
display: flex;
72-
gap: 4px
73-
}
74-
75-
.mantine-SegmentedControl-control:last-child label {
76-
padding: 4px 12px;
77-
}

‎docs/layouts/partials/hooks/body-end.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@
7474
data-query-input-text-color="#0b1117"
7575
data-query-input-placeholder-text-color="#6d7c88"
7676
data-query-input-border-color="#d7dee4"
77-
data-switch-border="1px solid #cbccfb"
78-
data-switch-border-radius="8px"
79-
data-switch-bg-color="#F0F4F7"
77+
data-switch-bg-color="#fff"
78+
data-switch-color="#7879f1"
8079
data-example-question-button-height="36px"
8180
data-example-question-button-border="1px solid #d7dee4"
8281
data-example-question-button-border-radius="8px"

‎docs/src/algolia-search.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import algoliasearch from 'algoliasearch';
4646
const style = document.createElement('style');
4747

4848
// Original (Unminified) file located in `docs/assets/scss/_yb_kapa_modal_styling.scss`.
49-
style.textContent = `.mantine-SegmentedControl-label{color:#4e5f6d;font-size:13px;font-style:normal;font-weight:400;line-height:16px;display:flex;padding:4px 12px 4px 8px;align-items:center;height:24px;gap: 4px}.mantine-Image-imageWrapper img{border-radius:0}.mantine-SegmentedControl-root span{display:none}.mantine-SegmentedControl-root{padding:0;overflow:visible}.mantine-SegmentedControl-controlActive{gap:4px;background:#fff;border-radius:8px;box-shadow:0 0 0 1px #7879f1}.mantine-SegmentedControl-control:not(:last-child) label:before{content:"";width:24px;height:24px;background:url(/icons/ai-icon.svg) center no-repeat;display:inline-block;filter:grayscale(1) brightness(1.2)}.mantine-SegmentedControl-control:not(:last-child).mantine-SegmentedControl-controlActive label:before{filter:none}.mantine-SegmentedControl-control:not(:last-child).mantine-SegmentedControl-controlActive label{background:linear-gradient(273deg,#ed35ec 5.14%,#ed35c5 38.93%,#7879f1 48.17%,#5e60f0 98.9%);background-clip:text;-webkit-background-clip:text;-webkit-text-fill-color:transparent;font-weight:600}.mantine-SegmentedControl-control:last-child.mantine-SegmentedControl-controlActive label{color:#2b59c3;font-weight:600}.mantine-SegmentedControl-controlActive label{border-radius:8px;border:0;font-size:13px;font-style:normal;font-weight:600;line-height:16px;display:flex;gap:4px}.mantine-SegmentedControl-control:last-child label {padding: 4px 12px;}`;
49+
style.textContent = `.mantine-Image-root{border-radius:0}`;
5050

5151
shadowRoot.appendChild(style);
5252
}

‎managed/src/main/java/com/yugabyte/yw/models/InstanceType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class InstanceType extends Model {
7272
"m3.", "c5.", "c5d.", "c4.", "c3.", "i3.", "m4.", "m5.", "m5a.", "m6i.", "m6a.", "m7i.",
7373
"m7a.", "c6i.", "c6a.", "c7a.", "c7i.");
7474
private static final List<String> GRAVITON_AWS_INSTANCE_PREFIXES_SUPPORTED =
75-
ImmutableList.of("m6g.", "c6gd.", "c6g.", "t4g.");
75+
ImmutableList.of("m6g.", "c6gd.", "c6g.", "t4g.", "r6g.", "r7g.", "r8g.");
7676
private static final List<String> CLOUD_AWS_INSTANCE_PREFIXES_SUPPORTED =
7777
ImmutableList.of(
7878
"m3.", "c5.", "c5d.", "c4.", "c3.", "i3.", "t2.", "t3.", "t4g.", "m6i.", "m5.");

‎managed/src/main/resources/openapi/paths/_index.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
x-yba-api-authz:
204204
- requiredPermission:
205205
resourceType: other
206-
action: read
206+
action: SUPER_ADMIN_ACTIONS
207207
resourceLocation:
208208
path: customers
209209
sourceType: endpoint
@@ -244,7 +244,7 @@
244244
x-yba-api-authz:
245245
- requiredPermission:
246246
resourceType: other
247-
action: read
247+
action: SUPER_ADMIN_ACTIONS
248248
resourceLocation:
249249
path: customers
250250
sourceType: endpoint
@@ -295,7 +295,7 @@
295295
x-yba-api-authz:
296296
- requiredPermission:
297297
resourceType: other
298-
action: read
298+
action: SUPER_ADMIN_ACTIONS
299299
resourceLocation:
300300
path: customers
301301
sourceType: endpoint
@@ -324,7 +324,7 @@
324324
x-yba-api-authz:
325325
- requiredPermission:
326326
resourceType: other
327-
action: read
327+
action: SUPER_ADMIN_ACTIONS
328328
resourceLocation:
329329
path: customers
330330
sourceType: endpoint
@@ -365,7 +365,7 @@
365365
x-yba-api-authz:
366366
- requiredPermission:
367367
resourceType: other
368-
action: read
368+
action: SUPER_ADMIN_ACTIONS
369369
resourceLocation:
370370
path: customers
371371
sourceType: endpoint
@@ -406,7 +406,7 @@
406406
x-yba-api-authz:
407407
- requiredPermission:
408408
resourceType: other
409-
action: read
409+
action: SUPER_ADMIN_ACTIONS
410410
resourceLocation:
411411
path: customers
412412
sourceType: endpoint

‎managed/src/main/resources/openapi/paths/continuousbackups.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
x-yba-api-authz:
6262
- requiredPermission:
6363
resourceType: other
64-
action: read
64+
action: SUPER_ADMIN_ACTIONS
6565
resourceLocation:
6666
path: customers
6767
sourceType: endpoint
@@ -102,7 +102,7 @@
102102
x-yba-api-authz:
103103
- requiredPermission:
104104
resourceType: other
105-
action: read
105+
action: SUPER_ADMIN_ACTIONS
106106
resourceLocation:
107107
path: customers
108108
sourceType: endpoint
@@ -153,7 +153,7 @@
153153
x-yba-api-authz:
154154
- requiredPermission:
155155
resourceType: other
156-
action: read
156+
action: SUPER_ADMIN_ACTIONS
157157
resourceLocation:
158158
path: customers
159159
sourceType: endpoint
@@ -182,7 +182,7 @@
182182
x-yba-api-authz:
183183
- requiredPermission:
184184
resourceType: other
185-
action: read
185+
action: SUPER_ADMIN_ACTIONS
186186
resourceLocation:
187187
path: customers
188188
sourceType: endpoint

‎managed/src/main/resources/openapi/paths/isolatedbackups.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
x-yba-api-authz:
3434
- requiredPermission:
3535
resourceType: other
36-
action: read
36+
action: SUPER_ADMIN_ACTIONS
3737
resourceLocation:
3838
path: customers
3939
sourceType: endpoint
@@ -74,7 +74,7 @@
7474
x-yba-api-authz:
7575
- requiredPermission:
7676
resourceType: other
77-
action: read
77+
action: SUPER_ADMIN_ACTIONS
7878
resourceLocation:
7979
path: customers
8080
sourceType: endpoint

0 commit comments

Comments
 (0)