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.

Sign up for GitHub

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

fix(devbox):fix version control #5334

Merged
merged 1 commit into from
Jan 7, 2025
Merged

fix(devbox):fix version control #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 6 additions & 16 deletions ...tend/providers/devbox/app/[lang]/(platform)/template/updateTemplate/EditTemplateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const EditTemplateModal: FC<CreateTemplateModalProps> = ({
name: string;
config: string;
image: string;
createAt: Date;
updateAt: Date;
createdAt: Date;
updatedAt: Date;
}) => JSX.Element
}[] = [
{
Expand All @@ -93,14 +93,14 @@ const EditTemplateModal: FC<CreateTemplateModalProps> = ({
dataIndex: 'createAt',
key: 'createAt',
render: (item) => {
return <Text color={'grayModern.600'}>{dayjs().format('YYYY-MM-DD hh:mm')}</Text>
return <Text color={'grayModern.600'}>{dayjs(item.createdAt).format('YYYY-MM-DD HH:mm')}</Text>
}
}, {
title: t('update_time'),
dataIndex: 'createAt',
key: 'createAt',
dataIndex: 'updateAt',
key: 'updateAt',
render: (item) => {
return <Text color={'grayModern.600'}>{dayjs().format('YYYY-MM-DD hh:mm')}</Text>
return <Text color={'grayModern.600'}>{dayjs(item.updatedAt).format('YYYY-MM-DD HH:mm')}</Text>
}
},
{
Expand Down Expand Up @@ -133,16 +133,6 @@ const EditTemplateModal: FC<CreateTemplateModalProps> = ({
)
}
]
// const mock = [
// {
// "uid": "741bc275-107a-43a7-ac01-2d26a0f64297",
// "name": "v1",
// "config": "{\"appPorts\":[{\"name\":\"devbox-app-port\",\"port\":8080,\"protocol\":\"TCP\",\"targetPort\":0}],\"ports\":[{\"containerPort\":22,\"name\":\"devbox-ssh-port\",\"protocol\":\"TCP\"}],\"releaseArgs\":[\"/home/devbox/project/entrypoint.sh\"],\"releaseCommand\":[\"/bin/bash\",\"-c\"],\"user\":\"devbox\",\"workingDir\":\"/home/devbox/project\"}",
// "image": "sealos.hub:5000/vfwsepe/devbox4:v1",
// "createdAt": "2024-12-13T08:29:26.171Z",
// "updatedAt": "2024-12-13T08:29:26.171Z"
// },
// ]
const templateList =
templateRepositoryQuery.data?.templateList || []
return (<>
Expand Down
3 changes: 0 additions & 3 deletions frontend/providers/devbox/prisma/migrations/20250103095011_region_update/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
-- DropIndex
DROP INDEX "TemplateRepository_isDeleted_name_key";

-- DropIndex
DROP INDEX "TemplateRepository_isDeleted_name_key";

-- add regionUid column
ALTER TABLE "TemplateRepository"
ADD COLUMN "regionUid" STRING NOT NULL default '00000000-0000-0000-0000-000000000000';
Expand Down
Loading