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

Dev #31

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Dev #31

Show file tree
Hide file tree
Changes from all 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
34 changes: 31 additions & 3 deletions .reflame.config.jsonc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
// 3
// 5
// This is a JSON with Comments file.
// It's basically JSON, with the addition of comments, and looser syntax
// (trailing commas!).
// Reflame uses this to identify your app.
"appId": "01GVH35S71FJP26W72V3K7CB2N", // prod
// "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork
// "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod
"appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork
// "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev
// This is what shows up in the browser's tab bar.
"title": "highlight.io",
Expand All @@ -25,24 +25,52 @@
],
"environments": {
"production": {
"REACT_APP_FIREBASE_CONFIG_OBJECT": "{ apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68', authDomain: 'auth.highlight.run', databaseURL: 'https://highlight-f5c5b.firebaseio.com', projectId: 'highlight-f5c5b', storageBucket: 'highlight-f5c5b.appspot.com', messagingSenderId: '263184175068', appId: '1:263184175068:web:f8190c20320087d1c6c919',}",
"REACT_APP_COMMIT_SHA": {
"type": "expression",
"value": "Reflame.gitCommitSha"
},
"REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io",
"REACT_APP_ONPREM": "false",
"REACT_APP_FRONTEND_URI": {
"type": "expression",
"value": "window.location.origin"
},
"REACT_APP_FRONTEND_ORG": "1jdkoe52",
"REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run",
"REACT_APP_AUTH_MODE": "firebase",
"SLACK_CLIENT_ID": "1354469824468.1868913469441",
"REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f",
"CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063",
"DISCORD_CLIENT_ID": "1024079182013149185",
"REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525",
"HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY",
"LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d",
"DEMO_PROJECT_ID": "1344"
},
"development": {
"REACT_APP_FIREBASE_CONFIG_OBJECT": "{ apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68', authDomain: 'auth.highlight.run', databaseURL: 'https://highlight-f5c5b.firebaseio.com', projectId: 'highlight-f5c5b', storageBucket: 'highlight-f5c5b.appspot.com', messagingSenderId: '263184175068', appId: '1:263184175068:web:f8190c20320087d1c6c919',}",
"REACT_APP_COMMIT_SHA": {
"type": "expression",
"value": "Reflame.gitCommitSha"
},
"REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io",
"REACT_APP_ONPREM": "false",
"REACT_APP_FRONTEND_URI": {
"type": "expression",
"value": "window.location.origin"
},
"REACT_APP_FRONTEND_ORG": "1jdkoe52",
"REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run",
"REACT_APP_AUTH_MODE": "firebase",
"SLACK_CLIENT_ID": "1354469824468.1868913469441",
"REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f",
"CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063",
"DISCORD_CLIENT_ID": "1024079182013149185",
"REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525",
"HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY",
"LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d",
"DEMO_PROJECT_ID": "1344"
},
},
"defaultEnvironment": "production",
Expand Down
2 changes: 1 addition & 1 deletion e2e/hono/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const layout = (
traceId: string,
spanId: string,
) => html`
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<title>Hono API Tester</title>
Expand Down
4 changes: 2 additions & 2 deletions e2e/remix/app/entry.server.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ export default function handleRequest(
responseStatusCode,
responseHeaders,
remixContext,
)
)
: handleBrowserRequest(
request,
responseStatusCode,
responseHeaders,
remixContext,
)
)
}

function handleBotRequest(
Expand Down
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<base href="/" />
Expand Down
26 changes: 10 additions & 16 deletions frontend/src/components/CustomColumnPopover/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,11 @@ export const CustomColumnPopover = <T,>({
])

const defaultColumnOptions = useMemo(() => {
const seletedColumnHash = selectedColumns.reduce(
(acc, column) => {
acc[column.id] = column
const seletedColumnHash = selectedColumns.reduce((acc, column) => {
acc[column.id] = column

return acc
},
{} as Record<string, SerializedColumn>,
)
return acc
}, {} as Record<string, SerializedColumn>)

const defaultColumnHash = {
...seletedColumnHash,
Expand Down Expand Up @@ -165,14 +162,11 @@ export const CustomColumnPopover = <T,>({
}, [data, debouncedQuery, standardColumns])

const allColumnsHash = useMemo(() => {
return [...selectedColumns, ...columnOptions].reduce(
(acc, column) => {
acc[column.id] = column

return acc
},
{} as Record<string, SerializedColumn>,
)
return [...selectedColumns, ...columnOptions].reduce((acc, column) => {
acc[column.id] = column

return acc
}, {} as Record<string, SerializedColumn>)
}, [selectedColumns, columnOptions])

const handleColumnValueChange = (updatedValue: string[]) => {
Expand All @@ -192,7 +186,7 @@ export const CustomColumnPopover = <T,>({
{o.id}
</Text>
),
}))
}))

return (
<ComboboxSelect
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ export const Header: React.FC<Props> = ({ fullyIntegrated }) => {
</Menu.Item>
)
},
)}
)}
<Divider className="mb-0 mt-1" />
<Link
to="/new"
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/Search/SearchForm/SearchForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const SEARCH_OPERATORS = [
...CONTAINS_OPERATOR,
...MATCHES_OPERATOR,
] as const
export type SearchOperator = (typeof SEARCH_OPERATORS)[number]
export type SearchOperator = typeof SEARCH_OPERATORS[number]

type Creatable = {
label: string
Expand Down Expand Up @@ -414,7 +414,7 @@ export const Search: React.FC<{
? getVisibleValues(
activePart,
(defaultValueOptions ?? []).concat(values ?? []),
)
)
: getVisibleKeys(query, activePart, keys)

// Show operators when we have an exact match for a key
Expand Down Expand Up @@ -455,7 +455,7 @@ export const Search: React.FC<{
({
name: operator,
type: 'Operator',
}) as SearchResult,
} as SearchResult),
)
}

Expand Down Expand Up @@ -849,7 +849,7 @@ export const Search: React.FC<{
? setAiMode(true)
: navigate(
`/w/${workspaceId}/harold-ai`,
)
)
}
store={comboboxStore}
>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/hooks/useFeatureFlag/useFeatureFlag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export const isFeatureOn = async function (
(config.project
? projectId
: config.workspace
? workspaceId
: adminId) ?? 'demo',
? workspaceId
: adminId) ?? 'demo',
config.percent,
)
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ const AuthenticationRoleRouter = () => {
<AuthContextProvider
value={{
role: authRole,
admin: isLoggedIn ? (adminData ?? undefined) : undefined,
admin: isLoggedIn ? adminData ?? undefined : undefined,
workspaceRole: adminRole || undefined,
isAuthLoading,
isLoggedIn,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Alerts/AlertGraph/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const AlertGraph: React.FC<Props> = ({
intervalWidth: thresholdValue,
thresholdCondition,
intervalSeconds: thresholdWindow,
}
}
: undefined
}
thresholdSettings={{
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Alerts/AlertPage/AlertHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ export const AlertHeader: React.FC<Props> = ({
? {
state: 'Paused',
color: 'secondary',
}
}
: {
state: 'Enabled',
color: 'success',
}
}
}, [disabled])

return (
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/pages/Alerts/SessionAlert/SessionAlertPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,37 +279,37 @@ export const SessionAlertPage = () => {
exclude_rules: excludeRules
? formStore.getValue(
formStore.names.excludeRules,
) || []
) || []
: [],
user_properties: tracksUserProperties
? (
formStore.getValue(
formStore.names.userProperties,
) || []
).map((userProperty: any) => {
).map((userProperty: any) => {
const [id, name, value] =
userProperty.split(SEPARATOR, 3)
return {
id,
value,
name,
}
})
})
: [],
track_properties: tracksSessionProperties
? (
formStore.getValue(
formStore.names.trackProperties,
) || []
).map((trackProperty: any) => {
).map((trackProperty: any) => {
const [id, name, value] =
trackProperty.split(SEPARATOR, 3)
return {
id,
value,
name,
}
}) || []
}) || []
: [],
type: alertType,
}
Expand Down Expand Up @@ -547,13 +547,13 @@ const SessionAlertForm = ({
? []
: (userSuggestionsApiResponse?.property_suggestion || []).map(
(suggestion) => getPropertiesOption(suggestion),
)
)

const trackPropertiesSuggestions = trackSuggestionsLoading
? []
: (trackSuggestionsApiResponse?.property_suggestion || []).map(
(suggestion) => getPropertiesOption(suggestion),
)
)

const identifierSuggestions = identifierSuggestionsLoading
? []
Expand All @@ -568,7 +568,7 @@ const SessionAlertForm = ({
),
id: suggestion,
}),
)
)

const handleUserPropertiesSearch = (query = '') => {
refetchUserSuggestions({ query, project_id: project_id })
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Auth/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import SvgHighlightLogoOnLight from '@icons/HighlightLogoOnLight'
import { AuthBody, AuthError, AuthFooter, AuthHeader } from '@pages/Auth/Layout'
import useLocalStorage from '@rehooks/local-storage'
import { auth } from '@util/auth'
import firebase from 'firebase/compat/app'
import type firebase from 'firebase/compat/app'
import React, { useCallback, useEffect } from 'react'
import { Link, useLocation, useNavigate } from 'react-router-dom'

Expand Down Expand Up @@ -142,7 +142,7 @@ export const SignIn: React.FC<Props> = ({ setResolver }) => {
<Heading level="h4">
{workspaceInvite
? `You're invited to join ‘${workspaceInvite.workspace_name}’`
: 'Welcome back.'}
: 'Welcoasd!!'}
</Heading>
{AUTH_MODE !== 'oauth' ? (
<Text>
Expand Down
Loading
Loading