Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: remove StyleProps type to eliminate code duplication #1800

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions agenta-web/src/components/AppSelector/AppSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {useState, useEffect, useMemo} from "react"
import {PlusOutlined} from "@ant-design/icons"
import {Input, Modal, ConfigProvider, theme, Card, Button, notification, Divider} from "antd"
import AppCard from "./AppCard"
import {Template, GenericObject} from "@/lib/Types"
import {Template, GenericObject, StyleProps} from "@/lib/Types"
import {useAppTheme} from "../Layout/ThemeContextProvider"
import TipsAndFeatures from "./TipsAndFeatures"
import Welcome from "./Welcome"
Expand All @@ -22,10 +22,6 @@ import {LlmProvider, getAllProviderLlmKeys} from "@/lib/helpers/llmProviders"
import ResultComponent from "../ResultComponent/ResultComponent"
import {dynamicContext} from "@/lib/helpers/dynamic"

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
container: ({themeMode}: StyleProps) => ({
marginTop: 10,
Expand Down
5 changes: 1 addition & 4 deletions agenta-web/src/components/AppSelector/TipsAndFeatures.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ import {BulbFilled} from "@ant-design/icons"
import {Space} from "antd"
import {useAppTheme} from "../Layout/ThemeContextProvider"
import {MDXProvider} from "@mdx-js/react"
import {StyleProps} from "@/lib/Types"

import slide1 from "../../welcome-highlights/tip1.mdx"
import slide2 from "../../welcome-highlights/tip2.mdx"
import {createUseStyles} from "react-jss"

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
container: ({themeMode}: StyleProps) => ({
backgroundColor: themeMode === "dark" ? "#000" : "rgba(0,0,0,0.03)",
Expand Down
5 changes: 1 addition & 4 deletions agenta-web/src/components/AppSelector/Welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import React from "react"
import {useAppTheme} from "../Layout/ThemeContextProvider"
import {createUseStyles} from "react-jss"
import {CheckCircleFilled, ClockCircleOutlined} from "@ant-design/icons"

type StyleProps = {
themeMode: "dark" | "light"
}
import {StyleProps} from "@/lib/Types"

const useStyles = createUseStyles({
head: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import {AppstoreAddOutlined, CodeOutlined} from "@ant-design/icons"
import {Col, Modal, Row, Typography} from "antd"
import React from "react"
import {createUseStyles} from "react-jss"

type StyleProps = {
themeMode: "dark" | "light"
}
import {StyleProps} from "@/lib/Types"

const useStyles = createUseStyles({
modal: {
Expand Down
5 changes: 1 addition & 4 deletions agenta-web/src/components/AppSelector/modals/MaxAppModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import {AppstoreAddOutlined, CodeOutlined} from "@ant-design/icons"
import {Col, Modal, Row, Typography} from "antd"
import React from "react"
import {createUseStyles} from "react-jss"

type StyleProps = {
themeMode: "dark" | "light"
}
import {StyleProps} from "@/lib/Types"

const useStyles = createUseStyles({
modal: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import React, {useEffect, useRef} from "react"
import {createUseStyles} from "react-jss"
import YouTube, {YouTubeProps} from "react-youtube"
import {isDemo} from "@/lib/helpers/utils"

type StyleProps = {
themeMode: "dark" | "light"
}
import {StyleProps} from "@/lib/Types"

const useStyles = createUseStyles({
modal: ({themeMode}: StyleProps) => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Button, Spin, Statistic, Table, Typography} from "antd"
import {useRouter} from "next/router"
import {useEffect, useState} from "react"
import {ColumnsType} from "antd/es/table"
import {Evaluation, GenericObject} from "@/lib/Types"
import {Evaluation, GenericObject, StyleProps} from "@/lib/Types"
import {DeleteOutlined} from "@ant-design/icons"
import {EvaluationFlow, EvaluationType} from "@/lib/enums"
import {createUseStyles} from "react-jss"
Expand Down Expand Up @@ -41,10 +41,6 @@ interface EvaluationListTableDataType {
variant_revision_ids: string[]
}

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
container: {
marginBottom: 20,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import {useAppTheme} from "@/components/Layout/ThemeContextProvider"
import {Evaluation, Variant} from "@/lib/Types"
import {Evaluation, Variant, StyleProps} from "@/lib/Types"
import {Typography} from "antd"
import React from "react"
import {createUseStyles} from "react-jss"
import {VARIANT_COLORS} from "."

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
root: ({themeMode}: StyleProps) => ({
flex: 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Button, Spin, Statistic, Table, Typography} from "antd"
import {useRouter} from "next/router"
import {useEffect, useState} from "react"
import {ColumnsType} from "antd/es/table"
import {EvaluationResponseType} from "@/lib/Types"
import {EvaluationResponseType, StyleProps} from "@/lib/Types"
import {DeleteOutlined} from "@ant-design/icons"
import {EvaluationFlow, EvaluationType} from "@/lib/enums"
import {createUseStyles} from "react-jss"
Expand Down Expand Up @@ -47,10 +47,6 @@ export interface HumanEvaluationListTableDataType {
variantNames: string[]
}

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
container: {
marginBottom: 20,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react"
import {GenericObject, JSSTheme, Parameter, Variant} from "@/lib/Types"
import {GenericObject, JSSTheme, Parameter, Variant, StyleProps} from "@/lib/Types"
import {fetchVariants} from "@/services/api"
import {createNewEvaluation} from "@/services/human-evaluations/api"
import {isDemo} from "@/lib/helpers/utils"
Expand All @@ -16,10 +16,6 @@ import EvaluationErrorModal from "../Evaluations/EvaluationErrorModal"
import {dynamicComponent} from "@/lib/helpers/dynamic"
import {useLoadTestsetsList} from "@/services/testsets/api"

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles((theme: JSSTheme) => ({
evaluationContainer: {
border: "1px solid lightgrey",
Expand Down
4 changes: 2 additions & 2 deletions agenta-web/src/components/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import moonIcon from "@/media/night.png"
import sunIcon from "@/media/sun.png"
import {useProfileData} from "@/contexts/profile.context"
import {ThemeProvider} from "react-jss"
import {StyleProps as MainStyleProps} from "@/lib/Types"

const {Content, Footer} = Layout

type StyleProps = {
themeMode: "dark" | "light"
interface StyleProps extends MainStyleProps {
footerHeight: number
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import AlertPopup from "@/components/AlertPopup/AlertPopup"
import {useAppTheme} from "../../Layout/ThemeContextProvider"
import {ChatMessage, ChatRole, GenericObject, testset} from "@/lib/Types"
import {ChatMessage, ChatRole, GenericObject, testset, StyleProps} from "@/lib/Types"
import {removeKeys, renameVariables} from "@/lib/helpers/utils"
import {
createNewTestset,
Expand Down Expand Up @@ -29,10 +29,6 @@ import {useLocalStorage, useUpdateEffect} from "usehooks-ts"
import ChatInputs from "@/components/ChatInputs/ChatInputs"
import _ from "lodash"

type StyleProps = {
themeMode: "dark" | "light"
}

const useStyles = createUseStyles({
footer: {
display: "flex",
Expand Down
14 changes: 9 additions & 5 deletions agenta-web/src/components/Playground/Views/TestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ import React, {useContext, useEffect, useRef, useState} from "react"
import {Button, Input, Card, Row, Col, Space, Form, Modal} from "antd"
import {CaretRightOutlined, CloseCircleOutlined, PlusOutlined} from "@ant-design/icons"
import {callVariant} from "@/services/api"
import {ChatMessage, ChatRole, GenericObject, JSSTheme, Parameter, Variant} from "@/lib/Types"
import {
ChatMessage,
ChatRole,
GenericObject,
JSSTheme,
Parameter,
Variant,
StyleProps,
} from "@/lib/Types"
import {batchExecute, randString, removeKeys} from "@/lib/helpers/utils"
import LoadTestsModal from "../LoadTestsModal"
import AddToTestSetDrawer from "../AddToTestSetDrawer/AddToTestSetDrawer"
Expand Down Expand Up @@ -30,10 +38,6 @@ const promptRevision: any = dynamicService("promptVersioning/api")
dayjs.extend(relativeTime)
dayjs.extend(duration)

type StyleProps = {
themeMode: "dark" | "light"
}

const {TextArea} = Input
const LOADING_TEXT = "Loading..."

Expand Down
4 changes: 0 additions & 4 deletions agenta-web/src/components/SecondaryButton/SecondaryButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ type SecondaryBtnProps = {
onClick: () => void
}

type StyleProps = {
themeMode: "dark" | "light"
}

const SecondaryButton: React.FC<SecondaryBtnProps> = ({children, ...props}) => {
const {appTheme} = useAppTheme()

Expand Down
4 changes: 4 additions & 0 deletions agenta-web/src/lib/Types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,7 @@ export type PaginationQuery = {
page: number
pageSize: number
}

export type StyleProps = {
themeMode: "dark" | "light"
}
Loading