Skip to content

Commit 8facd76

Browse files
authored
Chore: Remove patch to handle url with dot (#1708)
1 parent 8982a6f commit 8facd76

File tree

6 files changed

+14
-33
lines changed

6 files changed

+14
-33
lines changed

web/client/src/library/components/editor/EditorPreview.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ export default function EditorPreview({
5151
const [activeTabIndex, setActiveTabIndex] = useState(-1)
5252

5353
const modelExtensions = useSQLMeshModelExtensions(tab.file.path, model => {
54-
navigate(
55-
`${EnumRoutes.IdeDocsModels}/${ModelSQLMeshModel.encodeName(model.name)}`,
56-
)
54+
navigate(`${EnumRoutes.IdeDocsModels}/${model.name}`)
5755
})
5856

5957
const tabs: string[] = useMemo(

web/client/src/library/pages/docs/Content.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@ export default function Content(): JSX.Element {
1515
const navigate = useNavigate()
1616

1717
const models = useStoreContext(s => s.models)
18-
const model = isNil(modelName)
19-
? undefined
20-
: models.get(ModelSQLMeshModel.decodeName(modelName))
18+
const model = isNil(modelName) ? undefined : models.get(modelName)
2119

2220
function handleClickModel(modelName: string): void {
2321
const model = models.get(modelName)
2422

2523
if (isNil(model)) return
2624

27-
navigate(
28-
EnumRoutes.IdeDocsModels + '/' + ModelSQLMeshModel.encodeName(model.name),
29-
)
25+
navigate(EnumRoutes.IdeDocsModels + '/' + model.name)
3026
}
3127

3228
function handleError(error: ErrorIDE): void {

web/client/src/library/pages/docs/Docs.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Outlet, useLocation, useParams } from 'react-router-dom'
22
import { useEffect, useState } from 'react'
3-
import { isArrayNotEmpty } from '@utils/index'
3+
import { isArrayNotEmpty, isNil } from '@utils/index'
44
import { useStoreContext } from '@context/context'
55
import { ModelSQLMeshModel } from '@models/sqlmesh-model'
66
import Container from '@components/container/Container'
@@ -21,10 +21,7 @@ export default function PageDocs(): JSX.Element {
2121
const filtered = Array.from(models.entries()).reduce(
2222
(acc: ModelSQLMeshModel[], [key, model]) => {
2323
if (model.name === key) return acc
24-
if (
25-
modelName == null ||
26-
model.name !== ModelSQLMeshModel.decodeName(modelName)
27-
) {
24+
if (isNil(modelName) || model.name !== modelName) {
2825
acc.push(model)
2926
}
3027

@@ -63,11 +60,7 @@ export default function PageDocs(): JSX.Element {
6360
size={EnumSize.lg}
6461
searchBy="index"
6562
displayBy="name"
66-
to={model =>
67-
`${EnumRoutes.IdeDocsModels}/${ModelSQLMeshModel.encodeName(
68-
model.name,
69-
)}`
70-
}
63+
to={model => `${EnumRoutes.IdeDocsModels}/${model.name}`}
7164
isFullWidth={true}
7265
/>
7366
)}

web/client/src/library/pages/docs/SourceList.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ export default function SourceList({
6161
className={clsx('text-sm font-normal')}
6262
>
6363
<NavLink
64-
to={`${EnumRoutes.IdeDocsModels}/${ModelSQLMeshModel.encodeName(
65-
model.name,
66-
)}`}
64+
to={`${EnumRoutes.IdeDocsModels}/${model.name}`}
6765
className={({ isActive }) =>
6866
clsx(
6967
'block px-2 overflow-hidden whitespace-nowrap overflow-ellipsis py-1 rounded-md w-full hover:bg-primary-10',

web/client/src/models/sqlmesh-model.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export interface InitialSQLMeshModel extends Model {
66
lineage?: Record<string, Lineage>
77
}
88

9-
const REPLACE_DOT_SYMBOL = '@'
10-
119
export class ModelSQLMeshModel<
1210
T extends InitialSQLMeshModel = InitialSQLMeshModel,
1311
> extends ModelInitial<T> {
@@ -70,12 +68,4 @@ export class ModelSQLMeshModel<
7068
}
7169
}
7270
}
73-
74-
static encodeName(modelName: string): string {
75-
return modelName.replaceAll('.', REPLACE_DOT_SYMBOL)
76-
}
77-
78-
static decodeName(modelName: string): string {
79-
return modelName.replaceAll(REPLACE_DOT_SYMBOL, '.')
80-
}
8171
}

web/client/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ export default defineConfig({
3737
? {}
3838
: {
3939
proxy: {
40-
'/api': 'http://api:8000',
40+
'/api': {
41+
target: 'http://api:8000',
42+
},
43+
'/docs': {
44+
target: 'http://app:8001',
45+
rewrite: path => '/',
46+
},
4147
},
4248
},
4349
preview: {

0 commit comments

Comments
 (0)