Skip to content

Commit

Permalink
Merge branch 'main' into update-dependabot
Browse files Browse the repository at this point in the history
  • Loading branch information
programmiri authored Aug 22, 2024
2 parents 1b9d8a0 + 55084e1 commit bbac2e5
Show file tree
Hide file tree
Showing 9 changed files with 444 additions and 2,427 deletions.
6 changes: 3 additions & 3 deletions coral/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
]
},
"dependencies": {
"@aivenio/aquarium": "1.66.0",
"@hookform/resolvers": "^3.6.0",
"@aivenio/aquarium": "1.74.0",
"@hookform/resolvers": "^3.9.0",
"@monaco-editor/react": "^4.6.0",
"@tanstack/react-query": "^4.29.5",
"@types/react-syntax-highlighter": "^15.5.13",
Expand All @@ -64,7 +64,7 @@
},
"devDependencies": {
"@tanstack/react-query-devtools": "^4.29.6",
"@testing-library/dom": "^10.0.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/react-hooks": "^8.0.1",
Expand Down
2,801 changes: 411 additions & 2,390 deletions coral/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions coral/src/app/components/__snapshots__/Form.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports[`Form <PasswordInput> should render <PasswordInput> 1`] = `
>
<input
aria-required="false"
class="block w-full rounded-sm disabled:cursor-not-allowed disabled:border-default disabled:bg-default typography-small text-default disabled:text-muted-2x placeholder:text-muted-2x focus:outline-none px-3 py-3 border border-default hover:border-intense focus:border-info-default"
class="block w-full rounded-sm disabled:cursor-not-allowed disabled:border-default disabled:bg-default typography-small text-default disabled:text-inactive placeholder:text-inactive focus:outline-none px-3 py-3 border border-default hover:border-intense focus:border-info-default"
id="test-id"
name="password"
type="password"
Expand Down Expand Up @@ -74,7 +74,7 @@ exports[`Form <TextInput> should render <TextInput> 1`] = `
>
<input
aria-required="false"
class="block w-full rounded-sm disabled:cursor-not-allowed disabled:border-default disabled:bg-default typography-small text-default disabled:text-muted-2x placeholder:text-muted-2x focus:outline-none px-3 py-3 border border-default hover:border-intense focus:border-info-default"
class="block w-full rounded-sm disabled:cursor-not-allowed disabled:border-default disabled:bg-default typography-small text-default disabled:text-inactive placeholder:text-inactive focus:outline-none px-3 py-3 border border-default hover:border-intense focus:border-info-default"
id="test-id"
name="formFieldsCustomName"
type="text"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exports[`InternalLinkButton renders different styles based on selected Aquarium'
exports[`InternalLinkButton renders different styles based on selected Aquarium's Button props shows a secondary button based on props 1`] = `
<div>
<a
class="Aquarium-Button Aquarium-Button.Secondary text-primary-intense bg-body ring-1 ring-primary-80 ring-inset active:bg-primary-muted-3x active:ring-primary-90 active:text-primary-intense focus-visible:ring-2 focus-visible:ring-primary-90 focus-visible:text-primary-intense hover:bg-primary-muted-3x hover:ring-primary-90 hover:text-primary-intense disabled:bg-body disabled:text-primary-muted-2x disabled:ring-primary-40 inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 px-4 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Secondary text-primary-intense bg-body ring-1 ring-primary-80 ring-inset active:bg-primary-active active:ring-primary-90 active:text-primary-intense focus-visible:ring-2 focus-visible:ring-primary-90 focus-visible:text-primary-intense hover:bg-primary-hover hover:ring-primary-90 hover:text-primary-intense disabled:bg-body disabled:text-primary-inactive disabled:ring-primary-40 inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 px-4 icon-stroke-2"
href="/test/url"
>
My nice link
Expand Down
1 change: 0 additions & 1 deletion coral/src/app/features/components/filters/SearchFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function SearchFilter({
</Label>

<SearchInput
type={"search"}
aria-label={placeholder}
aria-labelledby={labelId}
aria-describedby={descriptionId}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
Topics
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: grid; grid-template-columns: repeat(4, minmax(0, 1fr));"
Expand Down Expand Up @@ -130,7 +130,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
My team's pending requests
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: grid; grid-template-columns: repeat(4, minmax(0, 1fr));"
Expand Down Expand Up @@ -243,7 +243,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
My team's approved requests
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
class="Aquarium-NativeSelect"
Expand All @@ -267,7 +267,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
class="Aquarium-NativeSelectBase relative block"
>
<span
class="absolute right-0 inset-y-0 mr-4 text-muted-2x flex ml-3 pointer-events-none typography-default-strong mt-4"
class="absolute right-0 inset-y-0 mr-4 text-inactive flex ml-3 pointer-events-none typography-default-strong mt-4"
>
<svg
aria-hidden="true"
Expand All @@ -292,7 +292,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
</svg>
</span>
<select
class="block w-full rounded-sm appearance-none disabled:cursor-not-allowed typography-small text-default placeholder:text-muted-2x focus:outline-none px-3 py-3 disabled:border-default disabled:bg-default disabled:text-muted-2x border border-default hover:border-intense focus:border-info-default"
class="block w-full rounded-sm appearance-none disabled:cursor-not-allowed typography-small text-default placeholder:text-inactive focus:outline-none px-3 py-3 disabled:border-default disabled:bg-default disabled:text-inactive border border-default hover:border-intense focus:border-info-default"
id="react-aria-:r0:"
>
<option
Expand Down Expand Up @@ -343,7 +343,7 @@ exports[`Dashboard.tsx renders correct DOM according to data received from getRe
My team's topics per environment
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; justify-content: center; align-content: center; flex-wrap: wrap; min-height: 250px;"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
Topic details
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; gap: 160px;"
Expand Down Expand Up @@ -73,7 +73,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
Topic owner
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
class="typography-default text-default"
Expand Down Expand Up @@ -147,7 +147,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
Cluster details
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
class="visually-hidden"
Expand Down Expand Up @@ -286,7 +286,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
Subscriptions
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; gap: 160px;"
Expand Down Expand Up @@ -327,7 +327,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
href="/topic/aivendemotopic/subscribe?env=1"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
style="display: flex; justify-content: center; align-items: center; flex-direction: row; gap: 8px;"
Expand Down Expand Up @@ -371,7 +371,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
href="/topic/aivendemotopic/subscriptions"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
class="typography-small-strong text-primary-80"
Expand All @@ -396,7 +396,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
Schemas
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; justify-content: space-around; flex-direction: column;"
Expand All @@ -419,7 +419,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
href="/topic/aivendemotopic/request-schema"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
style="display: flex; justify-content: center; align-items: center; flex-direction: row; gap: 8px;"
Expand Down Expand Up @@ -463,7 +463,7 @@ exports[`TopicOverview with promotion banner renders correct DOM according to da
href="/topic/aivendemotopic/schema"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
class="typography-small-strong text-primary-80"
Expand Down Expand Up @@ -500,7 +500,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
Topic details
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; gap: 160px;"
Expand Down Expand Up @@ -553,7 +553,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
Topic owner
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
class="typography-default text-default"
Expand All @@ -579,7 +579,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
Cluster details
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
class="visually-hidden"
Expand Down Expand Up @@ -718,7 +718,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
Subscriptions
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; gap: 160px;"
Expand Down Expand Up @@ -759,7 +759,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
href="/topic/aivendemotopic/subscribe?env=1"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
style="display: flex; justify-content: center; align-items: center; flex-direction: row; gap: 8px;"
Expand Down Expand Up @@ -803,7 +803,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
href="/topic/aivendemotopic/subscriptions"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
class="typography-small-strong text-primary-80"
Expand All @@ -828,7 +828,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
Schemas
</div>
<div
class="typography-caption text-grey-70"
class="typography-caption text-default"
>
<div
style="display: flex; justify-content: space-around; flex-direction: column;"
Expand All @@ -851,7 +851,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
href="/topic/aivendemotopic/request-schema"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
style="display: flex; justify-content: center; align-items: center; flex-direction: row; gap: 8px;"
Expand Down Expand Up @@ -895,7 +895,7 @@ exports[`TopicOverview without promotion banner renders correct DOM according to
href="/topic/aivendemotopic/schema"
>
<button
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-intense-2x focus-visible:text-primary-intense-2x hover:text-primary-intense-2x disabled:text-primary-muted-2x inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
class="Aquarium-Button Aquarium-Button.Ghost text-primary-intense active:text-primary-active focus-visible:text-primary-active hover:text-primary-active disabled:text-primary-inactive inline-block border-0 rounded-sm transition whitespace-nowrap focus:outline-none relative text-center typography-default-strong py-3 icon-stroke-2"
>
<div
class="typography-small-strong text-primary-80"
Expand Down
4 changes: 2 additions & 2 deletions coral/src/app/features/topics/request/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ function generateTopicNameDescription(
);
}
} else {
if (topicPrefix && topicPrefix.length > 0) {
if (topicPrefix && topicPrefix.length > 0 && topicPrefix[0].length > 0) {
desc.unshift(
`Prefix name with: ${generateNamePatternString(topicPrefix)}.`
);
}

if (topicSuffix && topicSuffix.length > 0) {
if (topicSuffix && topicSuffix.length > 0 && topicSuffix[0].length > 0) {
desc.unshift(
`Suffix name with: ${generateNamePatternString(topicSuffix)}.`
);
Expand Down
5 changes: 1 addition & 4 deletions coral/src/app/layout/main-navigation/MainNavigationLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ function MainNavigationLink(props: MainNavigationLinkProps) {
</Link>
)}
{notifications > 0 && (
<Box.Flex
alignItems="center"
color={"var(--aquarium-colors-primary-80)"}
>
<Box.Flex alignItems="center" color={"primary-80"}>
<Box.Flex height={"fit"}>
<TabBadge value={notifications} />
</Box.Flex>
Expand Down

0 comments on commit bbac2e5

Please sign in to comment.