Skip to content

Commit 3cfb3f3

Browse files
authored
Workspace route (#1361)
* initial work * switcher works * adjust middleware * fix new chat * fix azure models * adjust workspace page * fix setup route * remove old code
1 parent 7c855ce commit 3cfb3f3

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

app/[locale]/[workspaceid]/layout.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@ export default function WorkspaceLayout({ children }: WorkspaceLayoutProps) {
7171
}, [])
7272

7373
useEffect(() => {
74-
const isInChat = window?.location?.pathname === "/chat"
75-
76-
if (!selectedWorkspace && !isInChat) {
77-
setLoading(false)
78-
return
79-
}
80-
8174
;(async () => await fetchWorkspaceData(workspaceId))()
8275

8376
setUserInput("")

components/utility/global-state.tsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,20 @@ export const GlobalState: FC<GlobalStateProps> = ({ children }) => {
121121
const [toolInUse, setToolInUse] = useState<string>("none")
122122

123123
useEffect(() => {
124-
const fetchData = async () => {
124+
;(async () => {
125125
const profile = await fetchStartingData()
126126

127127
if (profile) {
128-
const data = await fetchHostedModels(profile)
129-
if (!data) return
128+
const hostedModelRes = await fetchHostedModels(profile)
129+
if (!hostedModelRes) return
130130

131-
setEnvKeyMap(data.envKeyMap)
132-
setAvailableHostedModels(data.hostedModels)
131+
setEnvKeyMap(hostedModelRes.envKeyMap)
132+
setAvailableHostedModels(hostedModelRes.hostedModels)
133133

134-
if (profile["openrouter_api_key"] || data.envKeyMap["openrouter"]) {
134+
if (
135+
profile["openrouter_api_key"] ||
136+
hostedModelRes.envKeyMap["openrouter"]
137+
) {
135138
const openRouterModels = await fetchOpenRouterModels()
136139
if (!openRouterModels) return
137140
setAvailableOpenRouterModels(openRouterModels)
@@ -143,9 +146,7 @@ export const GlobalState: FC<GlobalStateProps> = ({ children }) => {
143146
if (!localModels) return
144147
setAvailableLocalModels(localModels)
145148
}
146-
}
147-
148-
fetchData()
149+
})()
149150
}, [])
150151

151152
const fetchStartingData = async () => {

0 commit comments

Comments
 (0)