Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/MZC-CSC/cm-butterfly int…
Browse files Browse the repository at this point in the history
…o develop
  • Loading branch information
hippo-an committed Oct 25, 2024
2 parents 87a61cc + 8dcab92 commit b94b80e
Show file tree
Hide file tree
Showing 32 changed files with 1,447 additions and 804 deletions.
2 changes: 1 addition & 1 deletion front/.env.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VITE_BACKEND_ENDPOINT = '/api'
VITE_BACKEND_URL = 'http://localhost:4000'
VITE_BACKEND_URL = 'https://devmigapi.onecloudcon.com'
VITE_PROJECT_NAME = 'MIGRATOR'

3 changes: 3 additions & 0 deletions front/src/app/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@
},
"COPY_BUTTON": {
"COPIED": "Copy!"
},
"SELECT_DROPDOWN": {
"SELECT" : "select item"
}
}
}
3 changes: 1 addition & 2 deletions front/src/app/providers/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { RoleType } from '../../../shared/libs/accessControl/pageAccessHelper/ty
import { getMinimalPageAccessPermissionList } from '../../../shared/libs';
import { toLower } from 'lodash';
import { tempRoutes } from './routes/temp.ts';
import WorkflowTemplate from '@/features/workflow/workflowDesigner/ui/WorkflowDesigner.vue';
import NotFound from '@/pages/error/404/NotFound.vue';
//TODO admin부분 고려

Expand Down Expand Up @@ -45,7 +44,7 @@ export class McmpRouter {
...authRoutes,
{
path: '/test',
component: WorkflowTemplate,
component: MainLayout,
},
{ path: '/:pathMatch(.*)*', name: 'NotFound', component: NotFound },
];
Expand Down
1 change: 1 addition & 0 deletions front/src/entities/workflow/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const UPDATE_WORKFLOW = 'update-workflow';
const RUN_WORKFLOW = 'run-workflow';
const DELETE_WORKFLOW = 'delete-workflow';

// const GET_DISK_TYPE = 'GET_DISK_TYPE';
const GET_WORKFLOW_TEMPLATE_LIST = 'list-workflow-template';

const GET_TASK_COMPONENT_LIST = 'list-task-component';
Expand Down
27 changes: 5 additions & 22 deletions front/src/entities/workflow/model/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,19 @@ export interface IWorkflow {
}
export interface ITaskGroupResponse {
description: string;
id: string;
name: string;
id?: string;
tasks: Array<ITaskResponse>;
task_groups?: Array<ITaskGroupResponse>;
}
export interface ITaskResponse {
dependencies: any[];
dependencies: any;
name: string;
path_params: any;
request_body: {
name: string;
installMonAgent: string;
label: string;
systemLabel: string;
description: string;
vm: Array<ITaskVmResponse>;
};
request_body: string;
task_component: string;
}
export interface ITaskVmResponse {
name: string;
subGroupSize: string;
label: string;
description: string;
commonSpec: string;
commonImage: string;
rootDiskType: string;
rootDiskSize: string;
vmUserPassword: string;
connectionName: string;
query_params?: any;
id?: string;
}

export interface IWorkflowResponse {
Expand Down
46 changes: 0 additions & 46 deletions front/src/features/workflow/model/types.ts

This file was deleted.

121 changes: 0 additions & 121 deletions front/src/features/workflow/model/workflowToolModel.ts

This file was deleted.

73 changes: 0 additions & 73 deletions front/src/features/workflow/ui/WorkflowTool.vue

This file was deleted.

Loading

0 comments on commit b94b80e

Please sign in to comment.