Skip to content

Commit 66d58d2

Browse files
tc-imbaReapor-Yurnero
tc-imba
and
Reapor-Yurnero
committed
add updated in app model
Co-authored-by: tc-imba <[email protected]> Co-authored-by: Reapor-Yurnero <[email protected]>
1 parent 783578e commit 66d58d2

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

‎projects/sbos-frontend/src/pages/Admin/AppList/index.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ const AppList: React.FC = () => {
6363
<Card title={app.name} bordered={false}>
6464
<Typography.Paragraph>{app.description}</Typography.Paragraph>
6565
<Flex gap="middle" wrap>
66-
<Button type="primary" onClick={handleApproveApp}>
67-
Approve
68-
</Button>
66+
{(app.updated || !app.approved) ?
67+
(<Button type="primary" onClick={handleApproveApp}>
68+
Approve
69+
</Button>) : (<Button disabled>Approved</Button>)}
6970
<Button type="primary" onClick={handleBuildApp}>
7071
Build
7172
</Button>

‎projects/sbos-frontend/src/services/brick-server-playground/apps.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ export async function appsSubmitDataBrickapiV1AppsAppSubmitPost2(
293293
}
294294

295295
/** Apps:Api Call a backend api of an app. GET /brickapi/v1/apps/api/${param0} */
296-
export async function appsApiBrickapiV1AppsApiPathOptions(
296+
export async function appsApiBrickapiV1AppsApiPathHead(
297297
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
298-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
298+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
299299
options?: { [key: string]: any },
300300
) {
301301
const { path: param0, ...queryParams } = params;
@@ -307,9 +307,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions(
307307
}
308308

309309
/** Apps:Api Call a backend api of an app. GET /brickapi/v1/apps/api/${param0} */
310-
export async function appsApiBrickapiV1AppsApiPathOptions2(
310+
export async function appsApiBrickapiV1AppsApiPathHead2(
311311
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
312-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
312+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
313313
options?: { [key: string]: any },
314314
) {
315315
const { path: param0, ...queryParams } = params;
@@ -321,9 +321,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions2(
321321
}
322322

323323
/** Apps:Api Call a backend api of an app. PUT /brickapi/v1/apps/api/${param0} */
324-
export async function appsApiBrickapiV1AppsApiPathOptions3(
324+
export async function appsApiBrickapiV1AppsApiPathHead3(
325325
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
326-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
326+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
327327
options?: { [key: string]: any },
328328
) {
329329
const { path: param0, ...queryParams } = params;
@@ -335,9 +335,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions3(
335335
}
336336

337337
/** Apps:Api Call a backend api of an app. PUT /brickapi/v1/apps/api/${param0} */
338-
export async function appsApiBrickapiV1AppsApiPathOptions4(
338+
export async function appsApiBrickapiV1AppsApiPathHead4(
339339
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
340-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
340+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
341341
options?: { [key: string]: any },
342342
) {
343343
const { path: param0, ...queryParams } = params;
@@ -349,9 +349,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions4(
349349
}
350350

351351
/** Apps:Api Call a backend api of an app. POST /brickapi/v1/apps/api/${param0} */
352-
export async function appsApiBrickapiV1AppsApiPathOptions5(
352+
export async function appsApiBrickapiV1AppsApiPathHead5(
353353
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
354-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
354+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
355355
options?: { [key: string]: any },
356356
) {
357357
const { path: param0, ...queryParams } = params;
@@ -363,9 +363,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions5(
363363
}
364364

365365
/** Apps:Api Call a backend api of an app. POST /brickapi/v1/apps/api/${param0} */
366-
export async function appsApiBrickapiV1AppsApiPathOptions6(
366+
export async function appsApiBrickapiV1AppsApiPathHead6(
367367
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
368-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
368+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
369369
options?: { [key: string]: any },
370370
) {
371371
const { path: param0, ...queryParams } = params;
@@ -377,9 +377,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions6(
377377
}
378378

379379
/** Apps:Api Call a backend api of an app. DELETE /brickapi/v1/apps/api/${param0} */
380-
export async function appsApiBrickapiV1AppsApiPathOptions7(
380+
export async function appsApiBrickapiV1AppsApiPathHead7(
381381
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
382-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
382+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
383383
options?: { [key: string]: any },
384384
) {
385385
const { path: param0, ...queryParams } = params;
@@ -391,9 +391,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions7(
391391
}
392392

393393
/** Apps:Api Call a backend api of an app. DELETE /brickapi/v1/apps/api/${param0} */
394-
export async function appsApiBrickapiV1AppsApiPathOptions8(
394+
export async function appsApiBrickapiV1AppsApiPathHead8(
395395
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
396-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
396+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
397397
options?: { [key: string]: any },
398398
) {
399399
const { path: param0, ...queryParams } = params;
@@ -405,9 +405,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions8(
405405
}
406406

407407
/** Apps:Api Call a backend api of an app. PATCH /brickapi/v1/apps/api/${param0} */
408-
export async function appsApiBrickapiV1AppsApiPathOptions9(
408+
export async function appsApiBrickapiV1AppsApiPathHead9(
409409
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
410-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
410+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
411411
options?: { [key: string]: any },
412412
) {
413413
const { path: param0, ...queryParams } = params;
@@ -419,9 +419,9 @@ export async function appsApiBrickapiV1AppsApiPathOptions9(
419419
}
420420

421421
/** Apps:Api Call a backend api of an app. PATCH /brickapi/v1/apps/api/${param0} */
422-
export async function appsApiBrickapiV1AppsApiPathOptions10(
422+
export async function appsApiBrickapiV1AppsApiPathHead10(
423423
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
424-
params: API.appsApiBrickapiV1AppsApiPathOptionsParams,
424+
params: API.appsApiBrickapiV1AppsApiPathHeadParams,
425425
options?: { [key: string]: any },
426426
) {
427427
const { path: param0, ...queryParams } = params;

‎projects/sbos-frontend/src/services/brick-server-playground/typings.d.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ declare namespace API {
7575
description: string;
7676
/** Approved */
7777
approved: boolean;
78+
/** Updated */
79+
updated?: boolean;
7880
};
7981

8082
type AppReadList = {
@@ -109,6 +111,8 @@ declare namespace API {
109111
description: string;
110112
/** Approved */
111113
approved: boolean;
114+
/** Updated */
115+
updated?: boolean;
112116
approvedData?: AppData | null;
113117
submittedData?: AppData | null;
114118
};
@@ -130,6 +134,8 @@ declare namespace API {
130134
description: string;
131135
/** Approved */
132136
approved: boolean;
137+
/** Updated */
138+
updated?: boolean;
133139
approvedData?: AppData | null;
134140
};
135141

@@ -141,27 +147,27 @@ declare namespace API {
141147
data?: AppReadWithApprovedData | null;
142148
};
143149

144-
type appsApiBrickapiV1AppsApiPathOptionsParams = {
150+
type appsApiBrickapiV1AppsApiPathHeadParams = {
145151
/** Api endpoint in the app */
146152
path: string;
147153
};
148154

149-
type appsApiBrickapiV1AppsApiPathOptionsParams = {
155+
type appsApiBrickapiV1AppsApiPathHeadParams = {
150156
/** Api endpoint in the app */
151157
path: string;
152158
};
153159

154-
type appsApiBrickapiV1AppsApiPathOptionsParams = {
160+
type appsApiBrickapiV1AppsApiPathHeadParams = {
155161
/** Api endpoint in the app */
156162
path: string;
157163
};
158164

159-
type appsApiBrickapiV1AppsApiPathOptionsParams = {
165+
type appsApiBrickapiV1AppsApiPathHeadParams = {
160166
/** Api endpoint in the app */
161167
path: string;
162168
};
163169

164-
type appsApiBrickapiV1AppsApiPathOptionsParams = {
170+
type appsApiBrickapiV1AppsApiPathHeadParams = {
165171
/** Api endpoint in the app */
166172
path: string;
167173
};

‎projects/sbos-playground/sbos/playground/models/app.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class App(Document):
1818
description: str = ""
1919
developer: Link[User] | None = None
2020
approved: bool = False
21+
updated: bool = False
2122
approved_data: AppData | None = None
2223
submitted_data: AppData | None = None
2324

‎projects/sbos-playground/sbos/playground/schemas/app.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class AppRead(BaseModel):
2323
name: str
2424
description: str
2525
approved: bool
26+
updated: bool = False
27+
2628

2729
class AppReadWithDeveloper(AppRead):
2830
developer: UserRead | None

‎projects/sbos-playground/sbos/playground/services/app.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ async def submit_app_data(
255255
db: AsyncDatabase = Depends(get_mongodb),
256256
) -> schemas.StandardResponse[schemas.AppReadWithAllData]:
257257
permission_profile_arguments = json.loads(permission_profile_arguments)
258+
app.updated = True
258259
if app.submitted_data is None:
259260
app.submitted_data = models.AppData()
260261
if app.submitted_data.permission_profile is None:
@@ -362,6 +363,7 @@ async def approve_app(
362363
)
363364
await approved_permission_profile.save()
364365

366+
app.updated = False
365367
app.approved_data.frontend = app.submitted_data.frontend
366368
app.approved_data.backend = app.submitted_data.backend
367369
app.approved_data.permission_model = app.submitted_data.permission_model

0 commit comments

Comments
 (0)