@friggframework/devtools 2.0.0-next.42 → 2.0.0-next.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/management-ui/src/App.jsx +1 -85
  2. package/management-ui/src/hooks/useFrigg.jsx +1 -215
  3. package/package.json +6 -6
package/management-ui/src/App.jsx CHANGED
@@ -1,68 +1,14 @@
1
1
  import React from 'react'
2
- <<<<<<< HEAD
3
- <<<<<<< HEAD
4
2
  import { BrowserRouter as Router } from 'react-router-dom'
5
3
  import AppRouter from './components/AppRouter'
6
- =======
7
- <<<<<<< HEAD
8
- import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
9
- import Layout from './components/Layout'
10
- import Dashboard from './pages/Dashboard'
11
- import Integrations from './pages/Integrations'
12
- import IntegrationDiscovery from './pages/IntegrationDiscovery'
13
- import IntegrationConfigure from './pages/IntegrationConfigure'
14
- import IntegrationTest from './pages/IntegrationTest'
15
- import Environment from './pages/Environment'
16
- import Users from './pages/Users'
17
- import ConnectionsEnhanced from './pages/ConnectionsEnhanced'
18
- import Simulation from './pages/Simulation'
19
- <<<<<<< HEAD
20
- <<<<<<< HEAD
21
- =======
22
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
23
- import Monitoring from './pages/Monitoring'
24
- import CodeGeneration from './pages/CodeGeneration'
25
- =======
26
- import { BrowserRouter as Router } from 'react-router-dom'
27
- import AppRouter from './components/AppRouter'
28
- >>>>>>> d6114470 (feat: add comprehensive DDD/Hexagonal architecture RFC series)
29
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
30
- =======
31
- import { BrowserRouter as Router } from 'react-router-dom'
32
- import AppRouter from './components/AppRouter'
33
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
34
4
  import ErrorBoundary from './components/ErrorBoundary'
35
5
  import { SocketProvider } from './hooks/useSocket'
36
6
  import { FriggProvider } from './hooks/useFrigg'
37
7
  import { ThemeProvider } from './components/theme-provider'
38
- <<<<<<< HEAD
39
- <<<<<<< HEAD
40
- =======
41
- <<<<<<< HEAD
42
- =======
43
- import ErrorBoundary from './components/ErrorBoundary'
44
- import { SocketProvider } from './hooks/useSocket'
45
- import { FriggProvider } from './hooks/useFrigg'
46
- >>>>>>> 652520a5 (Claude Flow RFC related development)
47
- =======
48
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
49
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
50
- =======
51
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
52
8
 
53
9
  function App() {
54
10
  return (
55
11
  <ErrorBoundary>
56
- <<<<<<< HEAD
57
- <<<<<<< HEAD
58
- =======
59
- <<<<<<< HEAD
60
- <<<<<<< HEAD
61
- =======
62
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
63
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
64
- =======
65
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
66
12
  <ThemeProvider defaultTheme="system">
67
13
  <SocketProvider>
68
14
  <FriggProvider>
@@ -72,38 +18,8 @@ function App() {
72
18
  </FriggProvider>
73
19
  </SocketProvider>
74
20
  </ThemeProvider>
75
- <<<<<<< HEAD
76
- <<<<<<< HEAD
77
- =======
78
- <<<<<<< HEAD
79
- =======
80
- <SocketProvider>
81
- <FriggProvider>
82
- <Router>
83
- <Layout>
84
- <Routes>
85
- <Route path="/" element={<Navigate to="/dashboard" />} />
86
- <Route path="/dashboard" element={<Dashboard />} />
87
- <Route path="/integrations" element={<IntegrationDiscovery />} />
88
- <Route path="/integrations/:integrationName/configure" element={<IntegrationConfigure />} />
89
- <Route path="/integrations/:integrationName/test" element={<IntegrationTest />} />
90
- <Route path="/environment" element={<Environment />} />
91
- <Route path="/users" element={<Users />} />
92
- <Route path="/connections" element={<ConnectionsEnhanced />} />
93
- <Route path="/simulation" element={<Simulation />} />
94
- </Routes>
95
- </Layout>
96
- </Router>
97
- </FriggProvider>
98
- </SocketProvider>
99
- >>>>>>> 652520a5 (Claude Flow RFC related development)
100
- =======
101
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
102
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
103
- =======
104
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
105
21
  </ErrorBoundary>
106
22
  )
107
23
  }
108
24
 
109
- export default App
25
+ export default App
package/management-ui/src/hooks/useFrigg.jsx CHANGED
@@ -21,35 +21,11 @@ export const FriggProvider = ({ children }) => {
21
21
  const [users, setUsers] = useState([])
22
22
  const [connections, setConnections] = useState([])
23
23
  const [currentUser, setCurrentUser] = useState(null)
24
- <<<<<<< HEAD
25
- <<<<<<< HEAD
26
24
  const [repositories, setRepositories] = useState([])
27
25
  const [currentRepository, setCurrentRepository] = useState(null)
28
26
  const [isLoading, setIsLoading] = useState(true)
29
27
  const [loading, setLoading] = useState(false)
30
28
  const [error, setError] = useState(null)
31
- =======
32
- <<<<<<< HEAD
33
- <<<<<<< HEAD
34
- <<<<<<< HEAD
35
- =======
36
- =======
37
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
38
- const [repositories, setRepositories] = useState([])
39
- const [currentRepository, setCurrentRepository] = useState(null)
40
- const [isLoading, setIsLoading] = useState(true)
41
- const [loading, setLoading] = useState(false)
42
- const [error, setError] = useState(null)
43
- <<<<<<< HEAD
44
- =======
45
- >>>>>>> 652520a5 (Claude Flow RFC related development)
46
- =======
47
- const [loading, setLoading] = useState(false)
48
- const [error, setError] = useState(null)
49
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
50
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
51
- =======
52
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
53
29
 
54
30
  useEffect(() => {
55
31
  // Listen for status updates
@@ -123,114 +99,34 @@ export const FriggProvider = ({ children }) => {
123
99
 
124
100
  const fetchInitialData = async () => {
125
101
  try {
126
- <<<<<<< HEAD
127
- <<<<<<< HEAD
128
- =======
129
- <<<<<<< HEAD
130
- <<<<<<< HEAD
131
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
132
- =======
133
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
134
102
  setLoading(true)
135
103
  setError(null)
136
104
 
137
105
  const [statusRes, integrationsRes, envRes, usersRes, connectionsRes] = await Promise.all([
138
106
  api.get('/api/project/status'),
139
- <<<<<<< HEAD
140
- <<<<<<< HEAD
141
- =======
142
- =======
143
- const [statusRes, integrationsRes, envRes, usersRes, connectionsRes] = await Promise.all([
144
- api.get('/api/frigg/status'),
145
- >>>>>>> 652520a5 (Claude Flow RFC related development)
146
- =======
147
- setLoading(true)
148
- setError(null)
149
-
150
- const [statusRes, integrationsRes, envRes, usersRes, connectionsRes] = await Promise.all([
151
- api.get('/api/project/status'),
152
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
153
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
154
- =======
155
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
156
107
  api.get('/api/integrations'),
157
108
  api.get('/api/environment'),
158
109
  api.get('/api/users'),
159
110
  api.get('/api/connections'),
160
111
  ])
161
112
 
162
- <<<<<<< HEAD
163
- <<<<<<< HEAD
164
- =======
165
- <<<<<<< HEAD
166
- <<<<<<< HEAD
167
- =======
168
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
169
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
170
- =======
171
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
172
113
  setStatus(statusRes.data.data?.status || statusRes.data.status || 'stopped')
173
114
  setIntegrations(integrationsRes.data.data?.integrations || integrationsRes.data.integrations || [])
174
115
  setEnvVariables(envRes.data.data?.variables || envRes.data.variables || {})
175
116
  setUsers(usersRes.data.data?.users || usersRes.data.users || [])
176
117
  setConnections(connectionsRes.data.data?.connections || connectionsRes.data.connections || [])
177
- <<<<<<< HEAD
178
- <<<<<<< HEAD
179
- =======
180
- <<<<<<< HEAD
181
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
182
- =======
183
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
184
- } catch (error) {
185
- console.error('Error fetching initial data:', error)
186
- setError(error.message || 'Failed to fetch data')
187
- } finally {
188
- setLoading(false)
189
- <<<<<<< HEAD
190
- <<<<<<< HEAD
191
- =======
192
- =======
193
- setStatus(statusRes.data.status)
194
- setIntegrations(integrationsRes.data.integrations || [])
195
- setEnvVariables(envRes.data.variables || {})
196
- setUsers(usersRes.data.users || [])
197
- setConnections(connectionsRes.data.connections || [])
198
- } catch (error) {
199
- console.error('Error fetching initial data:', error)
200
- >>>>>>> 652520a5 (Claude Flow RFC related development)
201
- =======
202
118
  } catch (error) {
203
119
  console.error('Error fetching initial data:', error)
204
120
  setError(error.message || 'Failed to fetch data')
205
121
  } finally {
206
122
  setLoading(false)
207
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
208
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
209
- =======
210
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
211
123
  }
212
124
  }
213
125
 
214
126
  const startFrigg = async (options = {}) => {
215
127
  try {
216
128
  setStatus('starting')
217
- <<<<<<< HEAD
218
- <<<<<<< HEAD
219
- await api.post('/api/project/start', options)
220
- =======
221
- <<<<<<< HEAD
222
- <<<<<<< HEAD
223
129
  await api.post('/api/project/start', options)
224
- =======
225
- await api.post('/api/frigg/start', options)
226
- >>>>>>> 652520a5 (Claude Flow RFC related development)
227
- =======
228
- await api.post('/api/project/start', options)
229
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
230
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
231
- =======
232
- await api.post('/api/project/start', options)
233
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
234
130
  } catch (error) {
235
131
  console.error('Error starting Frigg:', error)
236
132
  setStatus('stopped')
@@ -239,23 +135,7 @@ export const FriggProvider = ({ children }) => {
239
135
 
240
136
  const stopFrigg = async (force = false) => {
241
137
  try {
242
- <<<<<<< HEAD
243
- <<<<<<< HEAD
244
- await api.post('/api/project/stop', { force })
245
- =======
246
- <<<<<<< HEAD
247
- <<<<<<< HEAD
248
138
  await api.post('/api/project/stop', { force })
249
- =======
250
- await api.post('/api/frigg/stop', { force })
251
- >>>>>>> 652520a5 (Claude Flow RFC related development)
252
- =======
253
- await api.post('/api/project/stop', { force })
254
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
255
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
256
- =======
257
- await api.post('/api/project/stop', { force })
258
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
259
139
  setStatus('stopped')
260
140
  } catch (error) {
261
141
  console.error('Error stopping Frigg:', error)
@@ -264,23 +144,7 @@ export const FriggProvider = ({ children }) => {
264
144
 
265
145
  const restartFrigg = async (options = {}) => {
266
146
  try {
267
- <<<<<<< HEAD
268
- <<<<<<< HEAD
269
- await api.post('/api/project/restart', options)
270
- =======
271
- <<<<<<< HEAD
272
- <<<<<<< HEAD
273
147
  await api.post('/api/project/restart', options)
274
- =======
275
- await api.post('/api/frigg/restart', options)
276
- >>>>>>> 652520a5 (Claude Flow RFC related development)
277
- =======
278
- await api.post('/api/project/restart', options)
279
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
280
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
281
- =======
282
- await api.post('/api/project/restart', options)
283
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
284
148
  } catch (error) {
285
149
  console.error('Error restarting Frigg:', error)
286
150
  }
@@ -288,28 +152,8 @@ export const FriggProvider = ({ children }) => {
288
152
 
289
153
  const getLogs = async (limit = 100) => {
290
154
  try {
291
- <<<<<<< HEAD
292
- <<<<<<< HEAD
293
- const response = await api.get(`/api/project/logs?limit=${limit}`)
294
- return response.data.data?.logs || response.data.logs || []
295
- =======
296
- <<<<<<< HEAD
297
- <<<<<<< HEAD
298
155
  const response = await api.get(`/api/project/logs?limit=${limit}`)
299
156
  return response.data.data?.logs || response.data.logs || []
300
- =======
301
- const response = await api.get(`/api/frigg/logs?limit=${limit}`)
302
- return response.data.logs || []
303
- >>>>>>> 652520a5 (Claude Flow RFC related development)
304
- =======
305
- const response = await api.get(`/api/project/logs?limit=${limit}`)
306
- return response.data.data?.logs || response.data.logs || []
307
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
308
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
309
- =======
310
- const response = await api.get(`/api/project/logs?limit=${limit}`)
311
- return response.data.data?.logs || response.data.logs || []
312
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
313
157
  } catch (error) {
314
158
  console.error('Error fetching logs:', error)
315
159
  return []
@@ -318,48 +162,14 @@ export const FriggProvider = ({ children }) => {
318
162
 
319
163
  const getMetrics = async () => {
320
164
  try {
321
- <<<<<<< HEAD
322
- <<<<<<< HEAD
323
- const response = await api.get('/api/project/metrics')
324
- return response.data.data || response.data
325
- =======
326
- <<<<<<< HEAD
327
- <<<<<<< HEAD
328
- const response = await api.get('/api/project/metrics')
329
- return response.data.data || response.data
330
- =======
331
- const response = await api.get('/api/frigg/metrics')
332
- return response.data
333
- >>>>>>> 652520a5 (Claude Flow RFC related development)
334
- =======
335
165
  const response = await api.get('/api/project/metrics')
336
166
  return response.data.data || response.data
337
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
338
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
339
- =======
340
- const response = await api.get('/api/project/metrics')
341
- return response.data.data || response.data
342
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
343
167
  } catch (error) {
344
168
  console.error('Error fetching metrics:', error)
345
169
  return null
346
170
  }
347
171
  }
348
172
 
349
- <<<<<<< HEAD
350
- <<<<<<< HEAD
351
- =======
352
- <<<<<<< HEAD
353
- <<<<<<< HEAD
354
-
355
- =======
356
- >>>>>>> 652520a5 (Claude Flow RFC related development)
357
- =======
358
-
359
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
360
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
361
- =======
362
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
363
173
  const installIntegration = async (integrationName) => {
364
174
  try {
365
175
  const response = await api.post('/api/integrations/install', { name: integrationName })
@@ -539,35 +349,11 @@ export const FriggProvider = ({ children }) => {
539
349
  users,
540
350
  connections,
541
351
  currentUser,
542
- <<<<<<< HEAD
543
- <<<<<<< HEAD
544
- repositories,
545
- currentRepository,
546
- isLoading,
547
- loading,
548
- error,
549
- =======
550
- <<<<<<< HEAD
551
- <<<<<<< HEAD
552
- <<<<<<< HEAD
553
- =======
554
- =======
555
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
556
352
  repositories,
557
353
  currentRepository,
558
354
  isLoading,
559
355
  loading,
560
356
  error,
561
- <<<<<<< HEAD
562
- =======
563
- >>>>>>> 652520a5 (Claude Flow RFC related development)
564
- =======
565
- loading,
566
- error,
567
- >>>>>>> f153939e (refactor: clean up CLI help display and remove unused dependencies)
568
- >>>>>>> 860052b4 (feat: integrate complete management-ui and additional features)
569
- =======
570
- >>>>>>> 7e97f01c (fix: resolve ui-command merge conflicts and update package.json)
571
357
  startFrigg,
572
358
  stopFrigg,
573
359
  restartFrigg,
@@ -598,4 +384,4 @@ export const FriggProvider = ({ children }) => {
598
384
  {children}
599
385
  </FriggContext.Provider>
600
386
  )
601
- }
387
+ }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@friggframework/devtools",
3
3
  "prettier": "@friggframework/prettier-config",
4
- "version": "2.0.0-next.42",
4
+ "version": "2.0.0-next.43",
5
5
  "dependencies": {
6
6
  "@aws-sdk/client-ec2": "^3.835.0",
7
7
  "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
9
9
  "@babel/eslint-parser": "^7.18.9",
10
10
  "@babel/parser": "^7.25.3",
11
11
  "@babel/traverse": "^7.25.3",
12
- "@friggframework/schemas": "2.0.0-next.42",
13
- "@friggframework/test": "2.0.0-next.42",
12
+ "@friggframework/schemas": "2.0.0-next.43",
13
+ "@friggframework/test": "2.0.0-next.43",
14
14
  "@hapi/boom": "^10.0.1",
15
15
  "@inquirer/prompts": "^5.3.8",
16
16
  "axios": "^1.7.2",
@@ -32,8 +32,8 @@
32
32
  "serverless-http": "^2.7.0"
33
33
  },
34
34
  "devDependencies": {
35
- "@friggframework/eslint-config": "2.0.0-next.42",
36
- "@friggframework/prettier-config": "2.0.0-next.42",
35
+ "@friggframework/eslint-config": "2.0.0-next.43",
36
+ "@friggframework/prettier-config": "2.0.0-next.43",
37
37
  "aws-sdk-client-mock": "^4.1.0",
38
38
  "aws-sdk-client-mock-jest": "^4.1.0",
39
39
  "jest": "^30.1.3",
@@ -68,5 +68,5 @@
68
68
  "publishConfig": {
69
69
  "access": "public"
70
70
  },
71
- "gitHead": "9b956c72ec74f70bb5efd336782cf269c79c3d9b"
71
+ "gitHead": "2619db8a4e885887ad9071fe166cf0e8dee12d91"
72
72
  }