@@ -22,19 +22,19 @@
해당 BoundedContext ( {{ deleteBounded }} )데이터가
삭제되었습니다.
@@ -44,19 +44,19 @@
{{ ideSnackBar.icon }} {{ ideSnackBar.icon }}
{{ alertInfo.submit }}
{{ $t("word.close") }} {{ $t("word.close") }}
@@ -161,89 +161,90 @@
mdi-undo
@@ -270,13 +271,13 @@
mdi-redo
@@ -289,8 +290,8 @@
-
- mdi-home
-
+
+ mdi-home
+
mdi-cog
+ :disabled="disableBtn"
+ @click="openExportDialog()"
+ color="#8d8d8d"
+ >mdi-cog
@@ -341,37 +342,37 @@
mdi-kubernetes
mdi-hexagon-outline mdi-hexagon-outline
mdi-view-dashboard
{{item.title}}
+ >{{item.title}}
@@ -488,41 +489,41 @@
mdi-restart mdi-restart
+ style="font-size: medium;">
{{item.version}}
{{convertTimeStampToDate(item.timeStamp)}} {{convertTimeStampToDate(item.timeStamp)}}
@@ -576,8 +577,8 @@
mdi-restart
+ >mdi-restart
@@ -608,26 +609,26 @@
@@ -637,18 +638,18 @@
{{ icon.join }}
@@ -660,49 +661,49 @@
{{
icon.save
- }}
+ }}
{{
icon.fork
- }}
+ }}
{{
- item.title
+ >{{
+ item.title
}}
@@ -731,50 +732,50 @@
{{
icon.share
- }}
+ }}
{{
- requestCount
+ requestCount
}}
@@ -782,15 +783,15 @@
{{
- item.title
+ >{{
+ item.title
}}
@@ -808,41 +809,41 @@
-->
{{
icon.code
- }}
+ }}
{{
- item.title
+ >{{
+ item.title
}}
@@ -895,99 +896,99 @@
{{icon.join}}
{{joinRequestedText.text }}
{{ icon.fork}}
{{
icon.save
- }}
+ }}
{{ item.title }}
+ >{{ item.title }}
{{
icon.share
- }}
+ }}
@@ -998,37 +999,37 @@
{{ item.title }}
+ >{{ item.title }}
mdi-restart
@@ -1037,21 +1038,21 @@
{{
- icon.code
+ icon.code
}}
@@ -1059,149 +1060,149 @@
{{ item.title }}
+ >{{ item.title }}
mdi-kubernetes mdi-kubernetes
mdi-hexagon-outline mdi-hexagon-outline
mdi-view-dashboard mdi-view-dashboard
{{ item.title }}
+ >{{ item.title }}
mdi-checkbox-multiple-blank-outline
mdi-hexagon-outline mdi-hexagon-outline
@@ -1229,81 +1230,81 @@
Draggable Screen : onDraggable Screen : on
Draggable Screen : offDraggable Screen : off
mdi-border-inside mdi-border-inside
mdi-border-none mdi-border-none
Arrange Guidance : onArrange Guidance : on
Arrange Guidance : offArrange Guidance : off
![]()
@@ -1312,27 +1313,27 @@
![]()
@@ -1341,90 +1342,90 @@
Draggable Screen : onDraggable Screen : on
Draggable Screen : offDraggable Screen : off
mdi-border-inside mdi-border-inside
mdi-border-none mdi-border-none
Arrange Guidance : onArrange Guidance : on
Arrange Guidance : offArrange Guidance : off
![]()
mdi-database-plus mdi-database-plus
@@ -1509,27 +1510,27 @@
mdi-database-plus mdi-database-plus
@@ -1539,42 +1540,29 @@
-
-
- {{ }} Token
-
-
-
-
-
Manage Clusters Manage Clusters
mdi-close
@@ -1584,8 +1572,8 @@
@@ -1593,14 +1581,14 @@
@@ -1610,10 +1598,10 @@
-->
@@ -1635,14 +1623,14 @@
@@ -1680,33 +1668,33 @@
Token Dialog Token Dialog
Download Download
Cancel Cancel
@@ -1715,7 +1703,7 @@
Fork
+ >Fork
{{ icon.fork }}
@@ -1725,16 +1713,16 @@
Fork
+ color="green darken-1"
+ text
+ @click="saveComposition('fork')"
+ >Fork
Close Close
@@ -1743,7 +1731,7 @@
Warning Warning
There are
@@ -1757,21 +1745,21 @@
See details See details
Cancel Cancel
Open IDE
+ color="primary"
+ text
+ @click="openIdeAccept(),functionSelect('Project IDE')"
+ >Open IDE
mdi-kubernetes mdi-kubernetes
@@ -1897,29 +1885,29 @@
Select Public
+ >Select Public
{{ key }}
@@ -1929,16 +1917,16 @@
Apply
Close
@@ -1951,13 +1939,13 @@
Select Process
{{
command.name
- }}
+ }}
mdi-open-in-new
@@ -1966,9 +1954,9 @@
Close
@@ -1977,26 +1965,28 @@
Select Model for PBC Select Model for PBC
mdi-close mdi-close
@@ -2009,24 +1999,24 @@
{{ otherMouseEvent.name }}
@@ -2105,41 +2095,41 @@
Select for mirror element
Select Select
@@ -2149,2830 +2139,2048 @@
diff --git a/src/components/designer/es-modeling/EventStormingModelPanel.vue b/src/components/designer/es-modeling/EventStormingModelPanel.vue
index 071d42e7..f7e09cec 100644
--- a/src/components/designer/es-modeling/EventStormingModelPanel.vue
+++ b/src/components/designer/es-modeling/EventStormingModelPanel.vue
@@ -5,7 +5,7 @@
import getParent from "../../../utils/getParent";
import isAttached from '../../../utils/isAttached';
-
+
var jsondiffpatch = require('jsondiffpatch').create({
objectHash: function (obj, index) {
return '$$index:' + index;
@@ -45,9 +45,9 @@
openValidationLists:false,
validationLevelIcon:
{
- 'error' : {icon: 'mdi-close-circle-outline', color:'#E53935'},
- 'warning' : {icon: 'mdi-alert-outline', color:'#FFA726'},
- 'info' : {icon: 'mdi-information-outline', color:'#29B6F6'},
+ 'error' : {icon: 'mdi-close-circle-outline', color:'#E53935'},
+ 'warning' : {icon: 'mdi-alert-outline', color:'#FFA726'},
+ 'info' : {icon: 'mdi-information-outline', color:'#29B6F6'},
},
// command, external
@@ -68,14 +68,30 @@
// this.setElementCanvas();
},
computed: {
+ isOpenAPIPBC(){
+ if(!this.isPBCModel) return false
+ if(!this.value.pbcId) return false
+ if(!this.canvas.value.elements[this.value.pbcId]) return false;
+
+ if(Object.keys(this.canvas.value.elements[this.value.pbcId].modelValue).length == 0) return true
+
+ return false;
+ },
+ isReadOnly(){
+ if(this.canvas.isReadOnlyModel) return true
+ if(this.readOnly) return true
+ if(this.isPBCModel) return true
+
+ return false
+ },
translateObj(){
return {'usedTranslate': this.usedTranslate , 'translateText': this.translateText}
},
getImage(){
- if(this.image){
- return this.image
- }
- return null;
+ if(this.image){
+ return this.image
+ }
+ return null;
},
titleName() {
if(this.value){
@@ -127,11 +143,11 @@
},
"value.name": _.debounce(async function (newVal) {
var me = this
- me.changedNamePanel(me.value.name)
+ me.changedNamePanel(me.value.name)
}, 500),
"value.description": _.debounce(async function (newVal) {
var me = this
- me.changedDescriptionPanel(me.value.description)
+ me.changedDescriptionPanel(me.value.description)
}, 500),
// value: {
// deep: true,
diff --git a/src/components/designer/es-modeling/PBCModelList.vue b/src/components/designer/es-modeling/PBCModelList.vue
index cc7ba1d9..5ce1390b 100644
--- a/src/components/designer/es-modeling/PBCModelList.vue
+++ b/src/components/designer/es-modeling/PBCModelList.vue
@@ -15,17 +15,16 @@
:disabled="showLoading && index != selectedTabIndex"
:href="`#${tabObj.id}`"
:key="tabObj.key"
- style="height:45px;"
+ style="height:45px; width: max-content;"
>
{{tabObj.display}}
-
{{tabObj.totalCount == null ? '...': (tabObj.totalCount == 0 ? '0' : tabObj.totalCount)}}
-
mdi-magnify
@@ -110,7 +109,11 @@
-
+
+
+
+
@@ -155,7 +158,8 @@
-
-
+
@@ -281,7 +282,7 @@
})
}
return text
-
+
}
return null
},
diff --git a/src/components/designer/es-modeling/elements/EventStormingModelElement.vue b/src/components/designer/es-modeling/elements/EventStormingModelElement.vue
index 249205c9..a5c0a747 100644
--- a/src/components/designer/es-modeling/elements/EventStormingModelElement.vue
+++ b/src/components/designer/es-modeling/elements/EventStormingModelElement.vue
@@ -139,9 +139,10 @@
return this.value.elementView
},
showValidation() {
- if (this.elementValidationResults.length == 0) {
- return false
- }
+ if (this.elementValidationResults.length == 0) return false
+ if (this.isPBCModel) return false;
+ if (!this.value.mirrorElement) return false;
+
return true
},
showValidationImg() {
@@ -212,14 +213,14 @@
var editable = true
me.newEditUserImg.some(function(user, index){
- if(user.uid == me.getEditUid){
- return true
- }
- // edit condition
- if( user.action == 'userPanelOpen' ){
- editable = false
- return true
- }
+ if(user.uid == me.getEditUid){
+ return true
+ }
+ // edit condition
+ if( user.action == 'userPanelOpen' ){
+ editable = false
+ return true
+ }
})
return editable
@@ -624,7 +625,6 @@
var afterViewObj = {x: offsetX, y: offsetY, width: offsetW, height: offsetH}
var beforeViewObj = {x: originX, y: originY, width: originW, height: originH}
- // me.delayedMoveAction(beforeViewObj, afterViewObj)
me.canvas.moveElementAction(me.value, beforeViewObj, afterViewObj)
}catch (e) {
alert(`[Error] ModelElement-delayedMove: ${e}`)
@@ -644,7 +644,6 @@
})
offsetVertices = JSON.stringify(newVertices)
- // me.delayedRelationMoveAction(originVertices, offsetVertices)
me.canvas.moveElementAction(me.value, originVertices, offsetVertices)
}catch (e) {
alert(`[Error] ModelElement - delayedRelationMove: ${e}`)
@@ -891,6 +890,10 @@
}
},
delayedRelationMoveAction(originVertices, offsetVertices) {
+ /*
+ !!! REMOVE !!!!
+ changedMethod: canvas.moveElementAction
+ */
var me = this
if (me.isCustomMoveExist) {
@@ -927,7 +930,7 @@
me.movingElement = true;
}catch (e) {
- alert(`[Error] ModelElement-onMoveElement: ${e}`)
+ alert(`[Error] ModelElement-onMove Element: ${e}`)
}
},
onMoveRelation(newObj,STATUS_COMPLETE){
diff --git a/src/components/designer/es-modeling/elements/PBC.vue b/src/components/designer/es-modeling/elements/PBC.vue
index aed8b568..e73ed58b 100644
--- a/src/components/designer/es-modeling/elements/PBC.vue
+++ b/src/components/designer/es-modeling/elements/PBC.vue
@@ -133,7 +133,12 @@
@@ -119,8 +119,8 @@
:sub-right="'5px'"
:sub-bottom="'5px'"
>
-
-
@@ -311,7 +312,7 @@
let model = Object.assign([], parent.value)
- return{
+ return{
description: this.value.description,
value: this.value,
model: model,
@@ -356,10 +357,10 @@
async onGenerationFinished(model){
this.generateDone = true;
this.$emit('update:generateDone', true);
- },
+ },
generate(){
this.generator.generate();
- this.generateDone = false;
+ this.generateDone = false;
},
stop(){
this.generator.stop()
@@ -420,7 +421,7 @@
var validationResultIndex = me.elementValidationResults.findIndex(x=> (x.code == me.ESE_NOT_PK) )
if( validationResultIndex == -1 ){
me.elementValidationResults.push(me.validationFromCode(me.ESE_NOT_PK))
-
+
}
}else{
var validationResultIndex = me.elementValidationResults.findIndex(x=> (x.code == me.ESE_NOT_PK))
diff --git a/src/components/designer/es-modeling/panels/AggregateDefinitionPanel.vue b/src/components/designer/es-modeling/panels/AggregateDefinitionPanel.vue
index 26578406..2a7bde7e 100644
--- a/src/components/designer/es-modeling/panels/AggregateDefinitionPanel.vue
+++ b/src/components/designer/es-modeling/panels/AggregateDefinitionPanel.vue
@@ -2,7 +2,7 @@
Examples
-
+
descriptor.name);
var descriptorName = descriptor ? descriptor.name : undefined;
-
if(me.value.isRestRepository){
var fieldDescriptorsName = 'aggFieldName="value" '
if(me.value && me.relatedAggregateName){
@@ -321,17 +321,29 @@
}
}
- // RestRepository -> Default Verbs
- if(me.value.restRepositoryInfo.method == 'POST'){
- me.commandExample = `http POST localhost:8080/${aggName} ${fieldDescriptorsName}`
- }else if(me.value.restRepositoryInfo.method == 'PATCH'){
- me.commandExample = `http PATCH localhost:8080/${aggName}/1 ${fieldDescriptorsName}`
- }else if(me.value.restRepositoryInfo.method == 'DELETE'){
- me.commandExample = `http DELETE localhost:8080/${aggName}/1`
- }else if(me.value.restRepositoryInfo.method == 'PUT'){
- me.commandExample = `http PUT localhost:8080/${aggName}/1 ${fieldDescriptorsName}`
+ if(me.isOpenAPIPBC){
+ // RestRepository -> Default Verbs
+ if(me.value.restRepositoryInfo.method == 'POST'){
+ me.commandExample = `http POST localhost:8080/${me.value.restRepositoryInfo.apiPath} ${fieldDescriptorsName}`
+ }else if(me.value.restRepositoryInfo.method == 'PATCH'){
+ me.commandExample = `http PATCH localhost:8080/${me.value.restRepositoryInfo.apiPath}/1 ${fieldDescriptorsName}`
+ }else if(me.value.restRepositoryInfo.method == 'DELETE'){
+ me.commandExample = `http DELETE localhost:8080/${me.value.restRepositoryInfo.apiPath}/1`
+ }else if(me.value.restRepositoryInfo.method == 'PUT'){
+ me.commandExample = `http PUT localhost:8080/${me.value.restRepositoryInfo.apiPath}/1 ${fieldDescriptorsName}`
+ }
+ } else {
+ // RestRepository -> Default Verbs
+ if(me.value.restRepositoryInfo.method == 'POST'){
+ me.commandExample = `http POST localhost:8080/${aggName} ${fieldDescriptorsName}`
+ }else if(me.value.restRepositoryInfo.method == 'PATCH'){
+ me.commandExample = `http PATCH localhost:8080/${aggName}/1 ${fieldDescriptorsName}`
+ }else if(me.value.restRepositoryInfo.method == 'DELETE'){
+ me.commandExample = `http DELETE localhost:8080/${aggName}/1`
+ }else if(me.value.restRepositoryInfo.method == 'PUT'){
+ me.commandExample = `http PUT localhost:8080/${aggName}/1 ${fieldDescriptorsName}`
+ }
}
- // var fieldDescriptorsName = 'FieldName'
}else{
var fieldDescriptorsName = 'fieldName="value" '
if(me.value && me.value.fieldDescriptors){
@@ -345,13 +357,21 @@
}
}
- // Controller -> Extend Verb
- if(me.value.controllerInfo.method == 'POST'){
- me.commandExample = `http POST localhost:8080/${pluralize(changeCase.camelCase(me.relatedAggregateName))}`
- }else{
- me.commandExample = `http PUT localhost:8080/${pluralize(changeCase.camelCase(me.relatedAggregateName))}/1/${me.value.controllerInfo.apiPath} ${descriptorName}= "${descriptorName}" ${me.value.controllerInfo.apiPath}=1`
+ if(me.isOpenAPIPBC){
+ if(me.value.controllerInfo.method == 'POST'){
+ me.commandExample = `http POST localhost:8080${me.value.controllerInfo.apiPath} ${fieldDescriptorsName}`
+ }else{
+ me.commandExample = `http PUT localhost:8080${me.value.controllerInfo.apiPath} ${fieldDescriptorsName}`
+ }
+ } else {
+ // Controller -> Extend Verb
+ if(me.value.controllerInfo.method == 'POST'){
+ me.commandExample = `http POST localhost:8080/${pluralize(changeCase.camelCase(me.relatedAggregateName))} ${fieldDescriptorsName}`
+ }else{
+ me.commandExample = `http PUT localhost:8080/${pluralize(changeCase.camelCase(me.relatedAggregateName))}/1/${me.value.controllerInfo.apiPath} ${descriptorName}="{value}"`
+ }
+ me.setApiPath()
}
- me.setApiPath()
}
},
diff --git a/src/components/designer/es-modeling/panels/DomainEventDefinitionPanel.vue b/src/components/designer/es-modeling/panels/DomainEventDefinitionPanel.vue
index 167351af..446dc5e7 100644
--- a/src/components/designer/es-modeling/panels/DomainEventDefinitionPanel.vue
+++ b/src/components/designer/es-modeling/panels/DomainEventDefinitionPanel.vue
@@ -2,7 +2,7 @@
Trigger By LifeCycle
-
+
@@ -67,12 +67,12 @@
Close
@@ -92,39 +92,39 @@
{{ snackbar.text }}
close
{{ alertInfo.text }}
Github Persenal Access Token 발행 방법Github Persenal Access Token 발행 방법
DEPLOY
@@ -381,44 +382,44 @@
Hexagonal
VIEW
@@ -427,15 +428,15 @@
Versions
@@ -531,17 +532,17 @@
@@ -549,26 +550,26 @@
SAVE
FORK
@@ -710,20 +711,20 @@
SHARE
CODE
+
+
@@ -166,6 +170,7 @@
-
-
-
-
-
\ No newline at end of file
+ }
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/designer/es-modeling/elements/DomainEventDefinition.vue b/src/components/designer/es-modeling/elements/DomainEventDefinition.vue
index baeccba1..082cd5b4 100644
--- a/src/components/designer/es-modeling/elements/DomainEventDefinition.vue
+++ b/src/components/designer/es-modeling/elements/DomainEventDefinition.vue
@@ -59,8 +59,8 @@
마지막 페이지 [최대 27개 표시(최근 수정날짜 기준)]
Creating Aggregate... stop
+
Selected Model Info
@@ -71,6 +71,49 @@
+
-
+
-
+
-
+
@@ -108,7 +108,7 @@
-
-
+
+
+
+ Select Visibility Element
+
+
+
+
@@ -96,6 +139,9 @@
selectVersion: null,
versions: null,
loading: false,
+ selectedReads: [],
+ selectedCommands: [],
+ selectedEvents: [],
}
},
computed: {
@@ -123,14 +169,18 @@
},
mounted(){},
methods: {
- async panelInit(){
+ async panelInit(){
var me = this
// Element
me.selectVersion = me.value.modelValue.projectVersion
me.versions = await me.getString(`db://definitions/${me.selectedProjectId}/versionLists`)
- await me.migrateVersions(me.selectedProjectId, me.versions);
+ await me.migrateVersions(me.selectedProjectId, me.versions);
+
+ me.selectedReads = me.value.views.filter(item => item && item.visibility == "public")
+ me.selectedCommands = me.value.commands.filter(item => item && item.visibility == "public")
+ me.selectedEvents = me.value.events.filter(item => item && item.visibility == "public")
- // Common
+ // Common
me.$super(EventStormingModelPanel).panelInit()
},
async migrateVersions(projectId, versions){
@@ -161,6 +211,32 @@
var me = this
// Element
+ // IN
+ me.value.views.forEach(function (element, idx) {
+ if(me.selectedReads.find(x=> x && x.elementView.id == element.elementView.id) ) {
+ element.visibility = 'public'
+ } else {
+ element.visibility = 'private'
+ }
+ })
+ me.value.commands.forEach(function (element, idx) {
+ if(me.selectedCommands.find(x=> x && x.elementView.id == element.elementView.id) ) {
+ element.visibility = 'public'
+ } else {
+ element.visibility = 'private'
+ }
+ })
+
+ // Out
+ me.value.events.forEach(function (element, idx) {
+ if(me.selectedEvents.find(x=> x && x.elementView.id == element.elementView.id) ) {
+ element.visibility = 'public'
+ } else {
+ element.visibility = 'private'
+ }
+ })
+
+
// Common
me.$super(EventStormingModelPanel).executeBeforeDestroy()
},
@@ -192,3 +268,12 @@
}
}
+
+
+
diff --git a/src/components/designer/es-modeling/panels/ViewDefinitionPanel.vue b/src/components/designer/es-modeling/panels/ViewDefinitionPanel.vue
index c8a18889..f7e0d253 100644
--- a/src/components/designer/es-modeling/panels/ViewDefinitionPanel.vue
+++ b/src/components/designer/es-modeling/panels/ViewDefinitionPanel.vue
@@ -2,7 +2,7 @@
+ Read Element
+
+
+ Command Element
+
+
+ Event Element
+
+
@@ -128,7 +128,7 @@
-
mdi-plus
@@ -160,14 +160,14 @@
v-model="value"
:updateItem="item"
:index="key"
- :isRead="canvas.isReadOnlyModel"
+ :isRead="isReadOnly"
>
-
mdi-plus
@@ -181,13 +181,13 @@
v-model="value"
:deleteItem="item"
:index="key"
- :isRead="canvas.isReadOnlyModel"
+ :isRead="isReadOnly"
>
-
mdi-plus
@@ -215,7 +215,12 @@
mixins: [EventStormingModelPanel],
name: 'view-panel',
props: {
- generator: Object
+ generator: Object,
+ generateDone: {
+ type: Boolean,
+ required: true
+ },
+ isPBCModel: Boolean,
},
components: {
CommonPanel,
@@ -230,11 +235,8 @@
generator: "CQRSGenerator",
userStory: '',
},
- generateDone: true,
- generateDone: {
- type: Boolean,
- required: true
- },
+ // generateDone: true,
+
}
},
computed: {
@@ -266,7 +268,7 @@
// let model = Object.assign([], parent.value)
- // return{
+ // return{
// description: this.value.description,
// value: this.value,
// model: model,
@@ -287,7 +289,8 @@
panelInit(){
var me = this
// Element
- me.relatedAggregate = me.canvas.getAttachedAggregate(me.value)
+ // me.relatedAggregate = me.canvas.getAttachedAggregate(me.value)
+ me.relatedAggregate = me.isPBCModel ? me.value.aggregate : me.canvas.getAttachedAggregate(me.value)
// Common
me.$super(EventStormingModelPanel).panelInit()// }
@@ -353,14 +356,14 @@
async onGenerationFinished(model){
this.$emit('update:generateDone', true);
this.$EventBus.$emit('generationFinished');
- },
+ },
generate(){
this.executeBeforeDestroy();
-
+
this.generator.generate();
this.state.startTemplateGenerate = true;
this.$emit('update:generateDone', false);
- this.generateDone = false;
+ this.generateDone = false;
},
stop(){
this.generator.stop();
diff --git a/src/components/designer/modeling/CodeGenerator.vue b/src/components/designer/modeling/CodeGenerator.vue
index 38d4e4af..49f94c22 100644
--- a/src/components/designer/modeling/CodeGenerator.vue
+++ b/src/components/designer/modeling/CodeGenerator.vue
@@ -2,20 +2,20 @@
@@ -35,9 +35,9 @@
mdi-refresh
@@ -48,14 +48,14 @@
mdi-menu
@@ -90,29 +90,29 @@
mdi-code-braces
@@ -163,9 +163,9 @@
mdi-code-tags-check
mdi-spin mdi-loading
@@ -177,8 +177,8 @@
@@ -208,7 +208,7 @@
@@ -224,7 +224,7 @@
@@ -248,7 +248,7 @@
Toppings
{{ showTopping ? ' mdi-menu-up' : 'mdi-menu-down' }}
@@ -310,7 +310,7 @@
+ v-on="on">
+ v-on="on">
-
+
@@ -733,7 +733,7 @@
-
@@ -789,9 +789,9 @@
@@ -831,20 +831,20 @@
@@ -858,8 +858,8 @@
val.style.color = '#0f7f12'
} -->
{{ item.name }}
-
-
- mdi-folder-plus
-
+
+ mdi-folder-plus
+
- {{ openCodeFileName }}
Template Explorer
- Template Explorer
+
@@ -901,14 +901,14 @@
{{ platform }}
mdi-file-plus
mdi-folder-plus
@@ -917,19 +917,19 @@
@@ -955,32 +955,32 @@
- {{item.name}}
+
-
{{item.name}}
-
mdi-pencil
mdi-file-plus
mdi-folder-plus
mdi-delete
@@ -1133,7 +1133,7 @@
mdi-close
@@ -1175,17 +1175,17 @@
mdi-alert-circle-outline
- {{ opennedTemplateFramework[0].templateErrMsg }}
+ {{ opennedTemplateFramework[0].templateErrMsg }}
mdi-alert-circle-outline {{ opennedTemplateFramework[0].templateErrMsg }}
@@ -1208,12 +1208,12 @@
:style="opennedTemplateFramework && opennedTemplateFramework[0].refList && opennedTemplateFramework[0].refList.length > 0 ? 'margin-bottom: -30px;':''"
>
@@ -1434,13 +1434,13 @@
@@ -1507,11 +1507,11 @@
-
mdi-check
@@ -1519,9 +1519,9 @@
Template
mdi-check
@@ -1968,7 +1968,7 @@
if(this.reGenerateOnlyModifiedTemplate){
this.setTemplateFramework(this.opennedTemplateFramework)
}
-
+
this.isLoadingExpectedTemplate = true
if((this.openCode && this.openCode[0]) || this.value.basePlatform){
var platform = this.openCode && this.openCode[0] ? this.openCode[0].template : this.value.basePlatform
@@ -2175,7 +2175,7 @@
var getCodePath = localStorage.getItem('openCodePath')
if (getCodePath) {
me.openCode[0] = me.codeLists.find(x => x.fullPath == getCodePath)
- }
+ }
}
//done
if (me.openCode.length > 0 && me.openCode[0]) {
@@ -2187,7 +2187,7 @@
setTimeout(()=>{ //TODO: temporal
me.openCode[0].code = me.codeAlign(me.openCode[0].code)
}, 0)
-
+
}
return me.openCode
}
@@ -2653,11 +2653,11 @@
this.tempToppingPlatforms.push('isVanillaK8s')
}
if(this.value){
- if(this.value.toppingPlatforms && !this.value.toppingPlatforms.find(x => x === "isVanillaK8s")){
- this.value.toppingPlatforms.push('isVanillaK8s')
- }
+ if(this.value.toppingPlatforms && !this.value.toppingPlatforms.find(x => x === "isVanillaK8s")){
+ this.value.toppingPlatforms.push('isVanillaK8s')
+ }
}
-
+
this.openCodeGenerator()
// this.settingGithub()
// this.onLoadInitTemplate();
@@ -2670,7 +2670,7 @@
window.removeEventListener("message", me.messageProcessing);
this.closeCodeViewer()
},
- mounted: function () {
+ mounted: function () {
var me = this
window.addEventListener("message", me.messageProcessing);
@@ -2773,9 +2773,9 @@
me.isSIgpt = false
},
isRootFolder(item){
- if(this.projectInformation
- && this.projectInformation.firstCommit == 'false'
- && this.rootModelAndElementMap.modelForElements.BoundedContext.find(x => x.name == item.name)){
+ if(this.projectInformation
+ && this.projectInformation.firstCommit == 'false'
+ && this.rootModelAndElementMap.modelForElements.BoundedContext.find(x => x.name == item.name)){
return true;
} else {
return false;
@@ -2844,11 +2844,11 @@ jobs:
me.templateMetaData = YAML.parse(me.templateFrameWorkList[template]['.template/metadata.yml'].content)
me.templateMetaData.testModel = me.templateMetaData.testModel.replace('storming/', '')
me.templateMetaData.testModel = me.templateMetaData.testModel.replaceAll('/', '')
-
+
me.existOnlyExpected = []
me.existOnlyActual = []
me.diffList = []
-
+
var diffFile
Object.keys(me.templateFrameWorkList[template]).forEach(function (key){
if(key.includes('.template/')){
@@ -2866,21 +2866,21 @@ jobs:
}
}
})
-
+
me.codeLists.forEach(function (file){
diffFile = me.templateFrameWorkList[template][`.template/test/expected/${file.fullPath.replace(`${me.modelingProjectId}/`, `${me.templateMetaData.testModel}/`)}`]
if(!diffFile){
me.existOnlyActual.push(file.fullPath)
// '.template/test/expected/frontend/src/components/주문주문.vue'
// '.template/test/expected/frontend/src/components/주문주문.vue'
- }
+ }
})
if(me.diffList.length > 0 || me.existOnlyExpected.length > 0 || me.existOnlyActual.length > 0){
me.openExpectedTemplateTestDialog = true
} else {
alert("Every files are identical")
}
-
+
me.startCheckDiff = false
}
@@ -2904,7 +2904,7 @@ jobs:
} else {
if(key == pathList[roofNumber]){
if(key == pathList[pathList.length - 1]){
- modelData[key] = me.currentModelData.value
+ modelData[key] = me.currentModelData.value
} else {
// console.log(key)
roofNumber++;
@@ -2913,7 +2913,7 @@ jobs:
}
}
})
- },
+ },
setSelectedTempTreePath(item){
if(item && item.currentPath && item.platform){
this.selectedTempTreePath[item.platform] = item.currentPath
@@ -2963,9 +2963,9 @@ jobs:
} else if(mode == 'edit'){
this.selectedTreeItem.newName = this.selectedTreeItem.name
}
- },
+ },
editTreeItem(){
- var me = this
+ var me = this
// console.log(me.selectedTreeItem)
if(me.selectedTreeItem.editMode.includes('add')){
if(me.selectedTreeItem.editMode == 'add New'){
@@ -2995,7 +2995,7 @@ jobs:
if(!me.templateFrameWorkList[obj.platform]){
me.templateFrameWorkList[obj.platform] = {}
}
-
+
me.editTemplateFrameWorkList[obj.platform][obj.currentPath] = {
code: "// new",
element: [
@@ -3010,7 +3010,7 @@ jobs:
}
} else if(me.selectedTreeItem.editMode == 'add folder'){
obj.children = []
- }
+ }
if(me.selectedTreeItem.isNew){
me.templateTreeList[me.selectedTreeItem.platform].push(obj)
} else {
@@ -3046,10 +3046,10 @@ jobs:
}
}
- if(me.selectedTreeItem.editMode == 'edit' || me.selectedTreeItem.editMode == 'delete'){
+ if(me.selectedTreeItem.editMode == 'edit' || me.selectedTreeItem.editMode == 'delete'){
me.selectedTreeItem.computedFileName = me.selectedTreeItem.name,
- me.selectedTreeItem.computedSubFileName = me.selectedTreeItem.currentPath.replace(me.selectedTreeItem.name, "")
-
+ me.selectedTreeItem.computedSubFileName = me.selectedTreeItem.currentPath.replace(me.selectedTreeItem.name, "")
+
me.editTemplateFrameWorkList[me.selectedTreeItem.platform][me.selectedTreeItem.currentPath] = {
code: me.selectedTreeItem.code,
element: [
@@ -3090,7 +3090,7 @@ jobs:
if(this.treePathList[item.id]){
this.currentModelData.subPath = this.treePathList[item.id].replace(item.name.replace(": ", ""), "")
}
- },
+ },
fetchChildren(obj){
var me = this
var data = me.modelData
@@ -3153,23 +3153,23 @@ jobs:
var content
var startGen = false
// if(prompt == "autoGen"){
- Object.keys(modifiedValueList).forEach(function (key){
- if(modifiedValueList[key] != {}){
- Object.keys(modifiedValueList[key]).forEach(function (val){
- let path = modifiedValueList[key][val]
- let value = val
- me.convertStringToObj(path, value);
- })
- }
- })
- var CircularJSON = require('circular-json');
- var str = CircularJSON.stringify(me.convertedObj);
+ Object.keys(modifiedValueList).forEach(function (key){
+ if(modifiedValueList[key] != {}){
+ Object.keys(modifiedValueList[key]).forEach(function (val){
+ let path = modifiedValueList[key][val]
+ let value = val
+ me.convertStringToObj(path, value);
+ })
+ }
+ })
+ var CircularJSON = require('circular-json');
+ var str = CircularJSON.stringify(me.convertedObj);
- content = `If I have this model in json: ${str}
- I want to make a mustache template that generating following source code:`
+ content = `If I have this model in json: ${str}
+ I want to make a mustache template that generating following source code:`
+ me.originMustacheTemplate[0].code
- startGen = true
+ startGen = true
// } else {
// if(prompt != '' && prompt != null){
// console.log(prompt)
@@ -3183,7 +3183,7 @@ jobs:
model: "text-davinci-003",
prompt: content,
temperature: 0.5,
- max_tokens: tokenLength ? tokenLength : 3000,
+ max_tokens: tokenLength ? tokenLength : 3000,
}
let header = {
Authorization: `Bearer ${me.openaiToken}`,
@@ -3191,22 +3191,22 @@ jobs:
}
let respones = await axios.post(`https://api.openai.com/v1/completions`, data, { headers: header })
- .catch(function (error) {
- me.startGenerateUseOpenAI = false
- if(error.response && error.response.data && error.response.data.message){
- var errText = error.response.data.message
- if(error.response.data.errors && error.response.data.errors[0] && error.response.data.errors[0].message){
- errText = errText + ', ' + error.response.data.errors[0].message
+ .catch(function (error) {
+ me.startGenerateUseOpenAI = false
+ if(error.response && error.response.data && error.response.data.message){
+ var errText = error.response.data.message
+ if(error.response.data.errors && error.response.data.errors[0] && error.response.data.errors[0].message){
+ errText = errText + ', ' + error.response.data.errors[0].message
+ }
+ alert(errText)
+ } else {
+ alert(error.message)
}
- alert(errText)
- } else {
- alert(error.message)
- }
- });
+ });
if(respones.data.choices[0].text){
// if(prompt == "autoGen"){
- me.modifiedMustacheTemplate[0].code = respones.data.choices[0].text
- me.startGenerateUseOpenAI = false
+ me.modifiedMustacheTemplate[0].code = respones.data.choices[0].text
+ me.startGenerateUseOpenAI = false
// } else {
// // console.log(respones.data.choices[0].text)
// me.openAiResult = me.codeAlign(respones.data.choices[0].text)
@@ -3286,7 +3286,7 @@ jobs:
},
closeGitMenu(){
var me = this
- me.githubTokenError = false
+ me.githubTokenError = false
},
reGenerateTemplateCode(){
var me = this
@@ -3337,13 +3337,13 @@ jobs:
let filePath
if(me.opennedTemplateFramework[0].fullPath){
filePath = me.opennedTemplateFramework[0].fullPath
- }
+ }
if(me.opennedTemplateFramework[0].refList && me.opennedTemplateFramework[0].refList.length > 0){
if(!filePath || !me.opennedTemplateFramework[0].refList.find(x => x == filePath)){
filePath = me.opennedTemplateFramework[0].refList[0]
}
- }
-
+ }
+
return filePath
},
setTemplateResult(ref){
@@ -3374,7 +3374,7 @@ jobs:
// if(me.editTemplateFrameWorkList[platform][tempPath] && me.editTemplateFrameWorkList[platform][tempPath].elementResult && me.editTemplateFrameWorkList[platform][tempPath].elementResult.fullPath == ref){
// opennedReferenceFile = me.editTemplateFrameWorkList[platform][tempPath].elementResult
// }
-
+
if(!opennedReferenceFile || opennedReferenceFile.code == ""){
if(!opennedReferenceFile){
opennedReferenceFile = me.filteredPrettierCodeLists.find(x => x.fullPath == ref)
@@ -3416,21 +3416,21 @@ jobs:
}
}
}
-
-
+
+
if(opennedReferenceFile){
if(me.templateFrameWorkList[platform][tempPath] && me.templateFrameWorkList[platform][tempPath].refList){
opennedReferenceFile.refList = me.templateFrameWorkList[platform][tempPath].refList
}
me.openCode[0] = opennedReferenceFile
-
+
if(opennedReferenceFile){
var obj = null
if(tempPath.includes('for-model/')){
obj = me.rootModelAndElementMap.rootModel
} else if(me.modelForElement[platform] && me.modelForElement[platform][tempPath] && me.modelForElement[platform][tempPath][filePath]){
obj = me.modelForElement[platform][tempPath][filePath]
- }
+ }
if(!obj){
obj = me.rootModelAndElementMap.rootModel
@@ -3519,7 +3519,7 @@ jobs:
},
setTemplateTreeList(){
var me = this
- me.templateTreeList = {}
+ me.templateTreeList = {}
let editTemplateFrameWorkList = {}
Object.keys(me.templateFrameWorkList).forEach(function (platform){
@@ -3534,14 +3534,14 @@ jobs:
Object.keys(lists).forEach(function (key){
if(!lists[key].isDeleted){
// var currentFolder = treeLists;
- var currentFolder = me.templateTreeList[platform];
+ var currentFolder = me.templateTreeList[platform];
var currentPath = "";
-
+
key.split('/').forEach(fileName => {
currentPath = currentPath + "/" + fileName;
-
+
var isFolder = !(("/" + key) === currentPath);
-
+
var fileObj = currentFolder.find(x => x.name === fileName.trim());
if(!fileObj){
var fileType = me.fileType(fileName)
@@ -3554,7 +3554,7 @@ jobs:
path: key,
currentPath: currentPath.replace('/', ''),
};
-
+
currentFolder.push(fileObj);
}
currentFolder = fileObj.children;
@@ -4114,7 +4114,7 @@ jobs:
var set = new Set();
var option = option
-
+
root.forEach((item) => {
if(Array.isArray(item.children)) {
me._collectSelectedFileContents(item.children, codeBag, option);
@@ -4165,7 +4165,7 @@ jobs:
return false
}else if(onOff == 'contents'){
this.searchForContent.onOff = true
- this.searchForContents()
+ this.searchForContents()
return false
}
},
@@ -4307,7 +4307,7 @@ jobs:
try {
var moreHintMode = false
if(id == '2'){
- moreHintMode = true
+ moreHintMode = true
}
if(moreHintMode){
var inputSwitch
@@ -4325,7 +4325,7 @@ jobs:
}
})
}
- }
+ }
})
}
if(me.openaiToken){
@@ -4335,7 +4335,7 @@ jobs:
} else {
content = me.filteredOpenCode[0].code
}
-
+
var splitContent = null
var promptValue = []
var suffixValue = []
@@ -4349,53 +4349,53 @@ jobs:
})
promptValue = promptValue.join("\n")
suffixValue = suffixValue.join("\n")
-
+
let tokenLength
if(moreHintMode){
tokenLength = 4092 - Math.round(`${content}\n${testA.join('\n')}`.length/3.5)
- }
+ }
let data = {
model: "text-davinci-003",
prompt: promptValue,
suffix: moreHintMode ? `${suffixValue}\n${testA.join('\n')}` : suffixValue,
temperature: 0.5,
- max_tokens: moreHintMode ? tokenLength : 3000,
+ max_tokens: moreHintMode ? tokenLength : 3000,
}
let header = {
Authorization: `Bearer ${me.openaiToken}`,
'Content-Type': 'application/json'
}
-
+
let respones = await axios.post(`https://api.openai.com/v1/completions`, data, { headers: header })
- .catch(function (error) {
- me.startGenerate = false
- if(me.openaiContent){
- me.filteredOpenCode[0].code = me.openaiContent
- }
- if(error.response && error.response.data && error.response.data.message){
- var errText = error.response.data.message
- if(error.response.data.errors && error.response.data.errors[0] && error.response.data.errors[0].message){
- errText = errText + ', ' + error.response.data.errors[0].message
+ .catch(function (error) {
+ me.startGenerate = false
+ if(me.openaiContent){
+ me.filteredOpenCode[0].code = me.openaiContent
}
- alert(errText)
- } else {
- alert(error.message)
- }
- });
+ if(error.response && error.response.data && error.response.data.message){
+ var errText = error.response.data.message
+ if(error.response.data.errors && error.response.data.errors[0] && error.response.data.errors[0].message){
+ errText = errText + ', ' + error.response.data.errors[0].message
+ }
+ alert(errText)
+ } else {
+ alert(error.message)
+ }
+ });
if(respones && !me.stopAutoGenerate){
if(respones.data.choices[0].text){
var autoGenerateResult = promptValue + respones.data.choices[0].text + suffixValue
me.autoGenerateResponse = autoGenerateResult
-
+
me.changedDiffCodeViewer = true
me.changedDiffCode = JSON.parse(JSON.stringify(me.filteredOpenCode))
me.changedDiffCode[0].code = content
me.filteredOpenCode[0].code = me.autoGenerateResponse
-
+
localStorage.setItem('openaiToken', me.openaiToken)
me.startGenerate = false
-
+
me.setAutoGenerateCodetoList = JSON.parse(JSON.stringify(me.codeLists))
me.setAutoGenerateCodetoList.some(function (element, index){
if(me.filteredOpenCode[0].path == element.fullPath){
@@ -4403,13 +4403,13 @@ jobs:
return true;
}
})
-
+
me.refreshCallGenerate();
}
} else {
me.stopAutoGenerate = false
}
-
+
} else {
me.stopAutoGenerate = false
alert("input Token")
@@ -4426,7 +4426,7 @@ jobs:
var me = this
var convertModelData = convertModelData ? convertModelData:{}
me.recursiveCount++;
- for (let key in modelData) {
+ for (let key in modelData) {
if (typeof modelData[key] === "string") {
var beforePath = path ? path + '.' : ''
convertModelData[beforePath + key] = modelData[key]
@@ -4442,7 +4442,7 @@ jobs:
convertModelData[beforePath + key] = null
}
}
- me.recursiveCount--;
+ me.recursiveCount--;
if(me.recursiveCount == 0) {
var modifiedValueList = {}
@@ -4450,13 +4450,13 @@ jobs:
var content = me.originMustacheTemplate[0].code.split('\n')
const reg = /[\{\}\[\]\/?.,;:|\)*~`!^\-+<>@\#$%&\\\=\(\'\"]/gi;
let isAnnotation = false
- let dataIncludeUnderBar
- let replacedData
+ let dataIncludeUnderBar
+ let replacedData
content.forEach(function (code, idx){
if(code.includes('/**')){
isAnnotation = true
- }
+ }
if(code.includes('*/')){
isAnnotation = false
}
@@ -4470,10 +4470,10 @@ jobs:
// const tokens1 = new Set(code1.match(regex));
// const tokens2 = new Set(code2.match(regex));
-
+
// const intersection = new Set([...tokens1].filter(x => tokens2.has(x)));
// const overlap = intersection.size / Math.min(tokens1.size, tokens2.size);
-
+
// isOverlap = overlap >= threshold;
modifiedValueList[idx] = {}
@@ -4491,7 +4491,7 @@ jobs:
if(data.includes("_")){
dataIncludeUnderBar = data.split("_")
replacedData = dataIncludeUnderBar[0]
- }
+ }
if(data.includes('()')){
replacedData = data.replace('on', '')
}
@@ -4501,13 +4501,13 @@ jobs:
if(data.replaceAll(reg, '') == convertModelData[key] || (replacedData && replacedData.replaceAll(reg, '') == convertModelData[key])){
var originValuePriority = splitSpace[index].replaceAll(/.[0-9]./g, ".*.").split(".*.")
var changeValuePriority = key.replaceAll(/.[0-9]./g, ".*.").split(".*.")
-
+
if(firstGenerate || originValuePriority.length >= changeValuePriority.length){
var isValueUpdate = true
if(!firstGenerate && originValuePriority.length == changeValuePriority.length){
if(splitSpace[index].length < key.length){
isValueUpdate = false
- }
+ }
}
if(isValueUpdate){
@@ -4520,7 +4520,7 @@ jobs:
modifiedValueList[idx][convertModelData[key]] = key
firstGenerate = false
}
- }
+ }
}
}
})
@@ -4561,7 +4561,7 @@ jobs:
content.forEach(function (line, lineNumber){
if(line.includes('/**')){
isAnnotation = true
- }
+ }
if(line.includes('*/')){
isAnnotation = false
}
@@ -4579,28 +4579,28 @@ jobs:
isModeLine = false
var token = line.replaceAll("{{", "")
token = token.replaceAll("}}", "")
-
+
if(token.includes("{") && !token.includes(" class ")){
isMethod = true
if(content[idx - 1].includes("@")){
isModeLine = true
}
- }
+ }
if(token.includes("}")){
isMethod = false
- }
-
+ }
+
text = text ? text + '\n' + line : line
-
- if(isModeLine){
+
+ if(isModeLine){
var mode = content[idx - 1].split("@")
testArr[testArr.length - 1] = content[idx - 1].replace(mode[1], "mode")
}
-
+
if(!isMethod){
testArr.push(text)
text = null
- }
+ }
}
})
@@ -4650,9 +4650,9 @@ jobs:
const uniqueArrText = [...setText];
const setEndText = new Set(endText.split('\n'));
const uniqueArrEndText = [...setEndText];
-
+
loopCount = 0
- space = null
+ space = null
uniqueArrText.forEach(function (line, lineIdx){
while(loopCount == lineIdx){
space = space ? space + " " : " "
@@ -4663,7 +4663,7 @@ jobs:
})
uniqueArr[idx] = uniqueArrText.join('\n') + valueName + uniqueArrEndText.join('\n')
}
- })
+ })
}
})
me.modifiedMustacheTemplate[0].code = uniqueArr.join("\n")
@@ -4675,7 +4675,7 @@ jobs:
},
convertStringToObj(path, value) {
- var me = this
+ var me = this
var container = me.convertedObj;
path.split('.').map((k, i, values) => {
container = (container[k] = (i == values.length - 1 ? value : (container[k] ? container[k]:{})))
@@ -4705,15 +4705,15 @@ jobs:
let me = this
return new Promise(async function (resolve, reject) {
let result = await me.gitAPI.getFile("topping-isVanillaK8s", "msa-ez", "for-model/kubernetes/docs/common/Pod.md")
- .then(function (obj) {
- resolve(obj.data)
- })
- .catch(e => {
- if(e.response.status === 401){
- me.alertReLogin()
- }
- alert(e)
- })
+ .then(function (obj) {
+ resolve(obj.data)
+ })
+ .catch(e => {
+ if(e.response.status === 401){
+ me.alertReLogin()
+ }
+ alert(e)
+ })
})
},
async initHandleBars(handleBars){
@@ -4736,27 +4736,27 @@ jobs:
if(map.if && map.if.includes(value)){
return map.then;
}
-
+
if(map.default)
- return map.default
+ return map.default
}
return '';
-
+
})
window.$HandleBars.registerHelper('checkVO', function (className, options) {
- if(className.endsWith("Address") || className.endsWith("Photo") || className.endsWith("User") || className.endsWith("Email")
- || className.endsWith("Payment") || className.endsWith("Money") || className.endsWith("Weather") || className.endsWith("Rating")
- || className.endsWith("Likes")|| className.endsWith("Tags")|| className.endsWith("Comment") ){
+ if(className.endsWith("Address") || className.endsWith("Photo") || className.endsWith("User") || className.endsWith("Email")
+ || className.endsWith("Payment") || className.endsWith("Money") || className.endsWith("Weather") || className.endsWith("Rating")
+ || className.endsWith("Likes")|| className.endsWith("Tags")|| className.endsWith("Comment") ){
return options.fn(this);
}
})
window.$HandleBars.registerHelper('checkEntityMember', function (className, options) {
- if(!(className.endsWith("Address") || className.endsWith("Photo") || className.endsWith("User") || className.endsWith("Email")
- || className.endsWith("Payment") || className.endsWith("Money") || className.endsWith("Weather") || className.endsWith("Rating"))
- || className.endsWith("Likes")|| className.endsWith("Tags")|| className.endsWith("Comment") && className.indexOf("java.") == -1 && className.indexOf("List") == -1){
+ if(!(className.endsWith("Address") || className.endsWith("Photo") || className.endsWith("User") || className.endsWith("Email")
+ || className.endsWith("Payment") || className.endsWith("Money") || className.endsWith("Weather") || className.endsWith("Rating"))
+ || className.endsWith("Likes")|| className.endsWith("Tags")|| className.endsWith("Comment") && className.indexOf("java.") == -1 && className.indexOf("List") == -1){
return options.fn(this);
} else {
return options.inverse(this);
@@ -4857,10 +4857,10 @@ jobs:
});
window.$HandleBars.registerHelper('attached', function (type, value, options) {
-
+
let attachedElementsInTheType
-
+
if(value.attached)
attachedElementsInTheType = value.attached.filter(
element => (element._type.endsWith(type) || (type=='ReadModel' && element._type.endsWith('View')))
@@ -4879,7 +4879,7 @@ jobs:
});
-
+
window.$HandleBars.registerHelper('attachedOrIncoming', function (type, value, options) {
var attachedElements = window.$HandleBars.helpers.attached(type, value, options)
var incomingElements = window.$HandleBars.helpers.incoming(type, value, options)
@@ -4902,9 +4902,9 @@ jobs:
window.$HandleBars.registerHelper('reaching', function (type, value, options) {
let result = "";
-
+
var attachedOrOutgoing = window.$HandleBars.helpers.attachedOrOutgoing(type, value, options)
-
+
if(attachedOrOutgoing==""){
var attachedElements
attachedElements = value.attached.filter(
@@ -5186,45 +5186,45 @@ jobs:
// if(isCustom){
// me.showTopping = true
// }else{
- // // init
- // me.selectedVersion = 'java8'
- // me.isVanillaK8s = false
- // me.isJava15 = false
- // me.selectedSecurity = null
- // me.isSpringSecurity = false
- // me.isKeycloakSecurity = false
- // me.isServiceMesh = false
- // me.isRollout = false
- // me.isIngress = false
- // me.isApolloGraphQL = false
- // me.isJavaGraphQL = false
- //
- // if(me.tempToppingPlatforms.length > 0 ){
- // me.tempToppingPlatforms.forEach(function(toppingPlatform){
- // if(toppingPlatform =="apollo-graphql"){
- // me.isApolloGraphQL = true
- // } else if(toppingPlatform=="spring-security"){
- // me.selectedSecurity = "isSpringSecurity"
- // me.isKeycloakSecurity = false
- // me.isSpringSecurity = true
- // } else if(toppingPlatform=="keycloak-security"){
- // me.selectedSecurity = "isKeycloakSecurity"
- // me.isKeycloakSecurity = true
- // me.isSpringSecurity = false
- // } else if(toppingPlatform=="argo"){
- // me.isRollout = true
- // } else if(toppingPlatform=="istio"){
- // me.isServiceMesh = true
- // } else if(toppingPlatform=="ingress"){
- // me.isIngress = true
- // } else if(toppingPlatform=="java15"){
- // me.selectedVersion = "java15"
- // } else if(toppingPlatform=="isVanillaK8s"){
- // me.isVanillaK8s = true
- // }
- // })
- // }
- // me.showTopping = true
+ // // init
+ // me.selectedVersion = 'java8'
+ // me.isVanillaK8s = false
+ // me.isJava15 = false
+ // me.selectedSecurity = null
+ // me.isSpringSecurity = false
+ // me.isKeycloakSecurity = false
+ // me.isServiceMesh = false
+ // me.isRollout = false
+ // me.isIngress = false
+ // me.isApolloGraphQL = false
+ // me.isJavaGraphQL = false
+ //
+ // if(me.tempToppingPlatforms.length > 0 ){
+ // me.tempToppingPlatforms.forEach(function(toppingPlatform){
+ // if(toppingPlatform =="apollo-graphql"){
+ // me.isApolloGraphQL = true
+ // } else if(toppingPlatform=="spring-security"){
+ // me.selectedSecurity = "isSpringSecurity"
+ // me.isKeycloakSecurity = false
+ // me.isSpringSecurity = true
+ // } else if(toppingPlatform=="keycloak-security"){
+ // me.selectedSecurity = "isKeycloakSecurity"
+ // me.isKeycloakSecurity = true
+ // me.isSpringSecurity = false
+ // } else if(toppingPlatform=="argo"){
+ // me.isRollout = true
+ // } else if(toppingPlatform=="istio"){
+ // me.isServiceMesh = true
+ // } else if(toppingPlatform=="ingress"){
+ // me.isIngress = true
+ // } else if(toppingPlatform=="java15"){
+ // me.selectedVersion = "java15"
+ // } else if(toppingPlatform=="isVanillaK8s"){
+ // me.isVanillaK8s = true
+ // }
+ // })
+ // }
+ // me.showTopping = true
// }
},
// openForkedRepo(gitPath){
@@ -5324,7 +5324,7 @@ jobs:
me.openCode = item
}
}
-
+
if(item && item.length > 0){
me.templateResultPath = null
if(item[0].eleKeys){
@@ -5335,14 +5335,14 @@ jobs:
let tempPath = me.getTempPath();
// let filePath = me.getFilePath();
-
+
if(me.editTemplateFrameWorkList[platform] && me.editTemplateFrameWorkList[platform][tempPath]){
me.opennedTemplateFramework[0].code = me.editTemplateFrameWorkList[platform][tempPath].code
} else {
if(me.templateFrameWorkList[platform] && me.templateFrameWorkList[platform][tempPath]){
me.opennedTemplateFramework[0].code = me.templateFrameWorkList[platform][tempPath].content
- }
- }
+ }
+ }
if(me.templateFrameWorkList[platform] && me.templateFrameWorkList[platform][tempPath] && me.templateFrameWorkList[platform][tempPath].refList){
me.opennedTemplateFramework[0].refList = me.templateFrameWorkList[platform][tempPath].refList
if(me.openCode && me.openCode[0] && me.openCode[0].fullPath && me.opennedTemplateFramework[0].refList.find(x => x == me.openCode[0].fullPath)){
@@ -5367,7 +5367,7 @@ jobs:
// }
// }
}
-
+
me.setTemplateFileName(platform, tempPath)
if(!me.reGenerateOnlyModifiedTemplate){
me.setTemplateResult(me.templateResultPath)
@@ -5649,41 +5649,41 @@ jobs:
me.$manifestsPerTemplate[templateUrl] = [];
let org = templateUrl.split('/')[templateUrl.split('/').length - 2].trim()
let repo = templateUrl.split('/')[templateUrl.split('/').length - 1].trim()
-
+
// Template은 Main Branch에서 받아오도록 처리
let commitRes = await me.gitAPI.getCommit(org, repo, "main")
- .then(async function (res) {
- // Commit List 받아오는 것.
- let tree = await me.gitAPI.getTree(org, repo, res)
- .then(async function (list) {
- // console.log("try me.gitAPI.setGitList()")
- let gitList = await me.gitAPI.setGitList(list, repo, templateUrl)
- .then(function (resultLists) {
- // console.log(resultLists)
- Object.assign(me.$manifestsPerBaseTemplate, resultLists.manifestsPerBaseTemplate)
- me.$manifestsPerTemplate[templateUrl] = resultLists.manifestsPerTemplate[templateUrl]
- me.templateFrameWorkList = resultLists.templateFrameWorkList
- resolve()
- })
- .catch(e => {
- console.log(e)
- })
+ .then(async function (res) {
+ // Commit List 받아오는 것.
+ let tree = await me.gitAPI.getTree(org, repo, res)
+ .then(async function (list) {
+ // console.log("try me.gitAPI.setGitList()")
+ let gitList = await me.gitAPI.setGitList(list, repo, templateUrl)
+ .then(function (resultLists) {
+ // console.log(resultLists)
+ Object.assign(me.$manifestsPerBaseTemplate, resultLists.manifestsPerBaseTemplate)
+ me.$manifestsPerTemplate[templateUrl] = resultLists.manifestsPerTemplate[templateUrl]
+ me.templateFrameWorkList = resultLists.templateFrameWorkList
+ resolve()
+ })
+ .catch(e => {
+ console.log(e)
+ })
+ })
+ .catch(e => {
+ console.log(e)
+ if(e.response.status === 401){
+ me.alertReLogin()
+ }
+ alert(e)
+ })
})
- .catch(e => {
- console.log(e)
- if(e.response.status === 401){
+ .catch(error => {
+ console.log(error)
+ if(error.response.status === 401){
me.alertReLogin()
}
- alert(e)
+ alert(error)
})
- })
- .catch(error => {
- console.log(error)
- if(error.response.status === 401){
- me.alertReLogin()
- }
- alert(error)
- })
} catch (e) {
console.log(`Error] Load Git Template: ${e}`)
if(e.response.data.message.includes("Bad credentials")){
@@ -5713,7 +5713,7 @@ jobs:
// // me.$manifest... => pathList 정의
// // template Code List => { $path: $code}
// return new Promise(async (resolve, reject) => {
-
+
// });
// },
async setToppingList(template) {
@@ -5738,37 +5738,37 @@ jobs:
}
// console.log(repo,)
let commitRes = await me.gitAPI.getCommit(org, repo, "main")
- .then(async function (res) {
- // Commit List 받아오는 것.
- let tree = await me.gitAPI.getTree(org, repo, res)
- .then(async function (list) {
- // console.log("try me.gitAPI.setGitList() - " + fullUrl)
- let gitList = await me.gitAPI.setGitList(list, toppingName, fullUrl)
- .then(function (resultLists) {
- me.$manifestsPerToppings[fullUrl] = resultLists.manifestsPerToppings[fullUrl]
- Object.assign(me.gitToppingList, resultLists.gitToppingList)
- // me.gitToppingList = resultLists.gitToppingList
- resolve()
- })
- .catch(e => {
- console.log(e)
- })
+ .then(async function (res) {
+ // Commit List 받아오는 것.
+ let tree = await me.gitAPI.getTree(org, repo, res)
+ .then(async function (list) {
+ // console.log("try me.gitAPI.setGitList() - " + fullUrl)
+ let gitList = await me.gitAPI.setGitList(list, toppingName, fullUrl)
+ .then(function (resultLists) {
+ me.$manifestsPerToppings[fullUrl] = resultLists.manifestsPerToppings[fullUrl]
+ Object.assign(me.gitToppingList, resultLists.gitToppingList)
+ // me.gitToppingList = resultLists.gitToppingList
+ resolve()
+ })
+ .catch(e => {
+ console.log(e)
+ })
+ })
+ .catch(e => {
+ console.log(e)
+ if(e.response.status === 401){
+ me.alertReLogin()
+ }
+ alert(e)
+ })
})
- .catch(e => {
- console.log(e)
- if(e.response.status === 401){
+ .catch(error => {
+ console.log(error)
+ if(error.response.status === 401){
me.alertReLogin()
}
- alert(e)
+ alert(error)
})
- })
- .catch(error => {
- console.log(error)
- if(error.response.status === 401){
- me.alertReLogin()
- }
- alert(error)
- })
} catch (e) {
console.log(`Error] Load Git Template: ${e}`)
if(e.response.data.message.includes("Bad credentials")){
@@ -6033,7 +6033,7 @@ jobs:
if (i === keys.length - 1) {
currentObj[key] = value;
- } else {
+ } else {
if (!currentObj[key]) {
currentObj[key] = {};
}
@@ -6838,7 +6838,7 @@ jobs:
},
isChangedCode(codeItem) {
var me = this
-
+
if (!codeItem) {
return false
}
@@ -6877,7 +6877,7 @@ jobs:
try {
if (newVal && newVal.length > 0) {
-
+
if (me.changedPathLists && me.changedPathLists.length > 0) {
var findIdx = me.changedPathLists.indexOf(newVal[0].path)
@@ -6920,9 +6920,9 @@ jobs:
if (newValObj && newValObj.path.includes('.java')) {
- ////// TODO : performance problem
+ ////// TODO : performance problem
setTimeout(()=>{newValObj.code = me.codeAlign(newValObj.code)}, 0)
-
+
}
me.openCode = newVal
@@ -7050,16 +7050,21 @@ jobs:
for(let pbc of pbcLists){
let config = pbc.modelValue;
- if( config.projectId && config.projectVersion ){
- let modelVerInfo = await me.list(`db://definitions/${config.projectId}/versionLists/${config.projectVersion}`);
- let modelVerValue = {'elements': {}, 'relations': {}};
+ if( config.openAPI ){
+ //open API
- if(modelVerInfo && modelVerInfo.valueUrl){
- modelVerValue = await me.getObject(`storage://${modelVerInfo.valueUrl}`);
- } else {
- modelVerValue = modelVerInfo.versionValue ? JSON.parse(modelVerInfo.versionValue.value) : {'elements': {}, 'relations': {}};;
+ } else {
+ if( config.projectId && config.projectVersion ){
+ let modelVerInfo = await me.list(`db://definitions/${config.projectId}/versionLists/${config.projectVersion}`);
+ let modelVerValue = {'elements': {}, 'relations': {}};
+
+ if(modelVerInfo && modelVerInfo.valueUrl){
+ modelVerValue = await me.getObject(`storage://${modelVerInfo.valueUrl}`);
+ } else {
+ modelVerValue = modelVerInfo.versionValue ? JSON.parse(modelVerInfo.versionValue.value) : {'elements': {}, 'relations': {}};;
+ }
+ await callPBC(modelVerValue, modelVerInfo);
}
- await callPBC(modelVerValue, modelVerInfo);
}
}
}
@@ -7342,7 +7347,7 @@ jobs:
}
})
},
-
+
convertNameForElement(item){
item.namePascalCase = changeCase.pascalCase(item.name)
item.nameCamelCase = changeCase.camelCase(item.name)
@@ -7482,10 +7487,10 @@ jobs:
};
Promise.all([me.generateBaseTemplate(templateContext), me.generateTemplate(templateContext)])
- .then(async function () {
- await me.generateToppingTemplate(templateContext)
- resolve()
- });
+ .then(async function () {
+ await me.generateToppingTemplate(templateContext)
+ resolve()
+ });
} catch (e) {
// me.isListSettingDone = true
@@ -7574,7 +7579,7 @@ jobs:
if((localStorage.getItem("loginType") && localStorage.getItem("loginType") == "github") || me.gitAccessToken) {
// var loadTemplate = localStorage.getItem(me.selectedBaseTemplate)
// var loadTemplate = me.templateFrameWorkList[basePlatform]
-
+
var platformFullName = basePlatform
if(!platformFullName.includes("http")){
platformFullName = await me.gitAPI.getTemplateURL(basePlatform)
@@ -7799,7 +7804,7 @@ jobs:
// 아래 데이터는 npm 빌드때 파일시스템 tree 탐색을 통해 자동으로 생성하거나 일일이 작업해줘야 한다.
manifestTemplate = me.$manifestsPerToppings[template] ? me.$manifestsPerToppings[template] : [];
}
-
+
var manifestTemplateLastIndex = manifestTemplate.length - 1
if( manifestTemplateLastIndex == -1 ){
@@ -8009,9 +8014,9 @@ jobs:
// temp fix
if( splitDivision.length > 1 &&
( optionsCheck.includes('ifDuplicated:')
- || optionsCheck.includes('representativeFor:')
- || optionsCheck.includes('priority:')
- || optionsCheck.includes('except:')
+ || optionsCheck.includes('representativeFor:')
+ || optionsCheck.includes('priority:')
+ || optionsCheck.includes('except:')
)
){ test = optionsCheck.concat(test) }
test = test.concat('\n---\n')
@@ -8105,10 +8110,10 @@ jobs:
templateProcessContext.options = JSON.parse(JSON.stringify(me.isExistConfTemplate('BASE', basePlatform) ? basePlatformConf[basePlatform] : templateProcessContext.options))
}
} else if( modelElement.boundedContext
- && modelElement.boundedContext.preferredPlatform
- && modelElement.boundedContext.preferredPlatformConf
- && modelElement.boundedContext.preferredPlatformConf[modelElement.boundedContext.preferredPlatform]
- && me.isExistConfTemplate('TEMPLATE', modelElement.boundedContext.preferredPlatform) ){
+ && modelElement.boundedContext.preferredPlatform
+ && modelElement.boundedContext.preferredPlatformConf
+ && modelElement.boundedContext.preferredPlatformConf[modelElement.boundedContext.preferredPlatform]
+ && me.isExistConfTemplate('TEMPLATE', modelElement.boundedContext.preferredPlatform) ){
// setting of Configuration
templateProcessContext.options = JSON.parse(JSON.stringify(modelElement.boundedContext.preferredPlatformConf[modelElement.boundedContext.preferredPlatform]));
} else { // setting of base
@@ -8147,9 +8152,9 @@ jobs:
var isEditTemplate = false
if( me.editTemplateFrameWorkList[template] && me.editTemplateFrameWorkList[template][frameWorkelement] ){
- isEditTemplate = true
+ isEditTemplate = true
frameWork = me.editTemplateFrameWorkList[template][frameWorkelement].code
-
+
if(me.editTemplateFrameWorkList[template][frameWorkelement].code.includes("---")){
content = me.editTemplateFrameWorkList[template][frameWorkelement].code
} else {
@@ -8231,11 +8236,11 @@ jobs:
}
// try{
-
+
var compileTemplate = window.$HandleBars.compile(content);
gen = compileTemplate(ele);
-
+
if(processContext.element.includes('for-model/kubernetes/docs')){
compileTemplate = window.$HandleBars.compile(gen);
gen = compileTemplate(ele);
@@ -8547,7 +8552,7 @@ jobs:
if(me.openCode && me.openCode[0]){
if(me.openCode[0].path == codeObj.fullPath || me.openCode[0].fullPath == codeObj.fullPath || (me.openCode[0].template == codeObj.template && me.openCode[0].templatePath == codeObj.templatePath)){
me.openCode[0].code = codeObj.code
- }
+ }
// else {
// if(!me.opennedTemplateFramework[0].templateErrMsg){
// var platform = me.getPlatformPath()
@@ -8557,7 +8562,7 @@ jobs:
// }
// }
// }
- }
+ }
var fileNameCheckArray = content.split("---");
@@ -8642,13 +8647,13 @@ jobs:
if(me.editTemplateFrameWorkList[template][frameWorkelement].isEditted == true){
me.editTemplateFrameWorkList[template][frameWorkelement].isFixed = true
me.editTemplateFrameWorkList[template][frameWorkelement].isEditted = false
- }
+ }
}
}
if(!(me.openCode && me.openCode[0]) && me.opennedTemplateFramework && me.opennedTemplateFramework[0]){
if(me.opennedTemplateFramework[0].templatePath == codeObj.templatePath || me.opennedTemplateFramework[0].path == codeObj.templatePath){
- me.opennedTemplateFramework[0].templateErrMsg = null
+ me.opennedTemplateFramework[0].templateErrMsg = null
me.setTemplateResult(codeObj.templatePath)
}
}
@@ -8694,14 +8699,14 @@ jobs:
}
me.$set(me.editTemplateFrameWorkList[template], filePath, elementObj);
-
+
if(fullPath){
if(!me.errTempResultList[template]){
me.errTempResultList[template] = {}
- }
+ }
if(!me.errTempResultList[template][filePath]){
me.errTempResultList[template][filePath] = {}
- }
+ }
me.errTempResultList[template][filePath][fullPath] = e.message
console.log(fullPath, e.message)
}
diff --git a/src/components/designer/modeling/GitActionDialog.vue b/src/components/designer/modeling/GitActionDialog.vue
index 5a0aa7e0..a6166663 100644
--- a/src/components/designer/modeling/GitActionDialog.vue
+++ b/src/components/designer/modeling/GitActionDialog.vue
@@ -399,7 +399,7 @@
if(error.lineNumber && me.codeList[fileName]){
var codeSplit = me.codeList[fileName].split('\n')
if(codeSplit[error.lineNumber - 1] && codeSplit[error.lineNumber - 1] != ""){
- errDetail = `An error called ${error.errorDetails} occurred in the ${codeSplit[error.lineNumber - 1]} part of the code content of the ${fileName} file.`
+ errDetail = `An error called "${error.errorDetails}" occurred in the ${codeSplit[error.lineNumber - 1]} part of the code content of the ${fileName} file.`
}
}
me.generatedErrorDetails.push(errDetail)
diff --git a/src/components/designer/modeling/OpenAPIPBC.vue b/src/components/designer/modeling/OpenAPIPBC.vue
new file mode 100644
index 00000000..239b9597
--- /dev/null
+++ b/src/components/designer/modeling/OpenAPIPBC.vue
@@ -0,0 +1,405 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/designer/modeling/OpenAPIToPBC.js b/src/components/designer/modeling/OpenAPIToPBC.js
new file mode 100644
index 00000000..903d4976
--- /dev/null
+++ b/src/components/designer/modeling/OpenAPIToPBC.js
@@ -0,0 +1,94 @@
+// const swagger = require('swagger-parser');
+const yamlParser = require('js-yaml')
+
+const Gitlab = require('../../../utils/Gitlab')
+const GitAPI = require('../../../utils/GitAPI')
+const Github = require('../../../utils/Github')
+
+class OpenAPIToPBC {
+
+ constructor(options){
+ if(!options) options={}
+ }
+
+ async call(value){
+ let yaml = value;
+ if(value.startsWith('https://') || value.startsWith('http://') ){
+ this.git = null;
+ if(window.MODE == "onprem") {
+ this.git = new Gitlab();
+ } else {
+ this.git = new Github();
+ }
+ this.gitAPI = new GitAPI(this.git);
+
+ const githubRegex = /^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/main\/(.+)$/;
+ const match = value.match(githubRegex);
+ if (match) {
+ // Extracted values
+ const owner = match[1];
+ const repository = match[2];
+ const filePath = match[3];
+ let response = await this.gitAPI.getFile(repository, owner, filePath)
+ yaml = response.data
+ } else {
+ alert('Invalid GitHub URL format.')
+ console.log('Invalid GitHub URL format');
+ return null;
+ }
+ }
+ //string, object
+ return await this.convert(yaml);
+ }
+
+ async convert(yaml){
+ try{
+ const parser = yamlParser.load(yaml); // testYaml
+ // const parser = await swagger.parse(yaml);
+ if(parser){
+ let result = {
+ info: null,
+ read: [],
+ command: [],
+ schemas: {}
+ };
+
+ if(parser.paths){
+ result.info = parser.info;
+
+ for (const path in parser.paths) {
+ const pathInfo = parser.paths[path];
+
+ for (const method in pathInfo) {
+ const methodInfo = pathInfo[method];
+
+ const extractedInfo = {
+ _path: path,
+ _method: method,
+ ...methodInfo,
+ };
+
+ if (method == 'get') {
+ result.read.push(extractedInfo);
+ } else {
+ result.command.push(extractedInfo);
+ }
+ }
+ }
+ }
+
+ if(parser.components){
+ result.schemas = parser.components.schemas
+ }
+
+ return result;
+ }
+ return null; // Can't find 'paths'.
+ } catch (e) {
+ return undefined; // Fail parser.
+ }
+ }
+
+}
+
+module.exports = OpenAPIToPBC;
\ No newline at end of file
diff --git a/src/components/designer/modeling/OpenAPIToPBC.test.js b/src/components/designer/modeling/OpenAPIToPBC.test.js
new file mode 100644
index 00000000..fe8041c9
--- /dev/null
+++ b/src/components/designer/modeling/OpenAPIToPBC.test.js
@@ -0,0 +1,293 @@
+
+import OpenAPIToPBC from "./OpenAPIToPBC.js";
+const openAPIToPBCClass = new OpenAPIToPBC({});
+import { info } from "console";
+
+const testURL = 'https://raw.githubusercontent.com/sooheon45/pbc-gitlab/main/openapi.yaml';
+const testYaml =`
+openapi: 3.0.1
+info:
+ title: GitLab API
+ version: v4
+ description: |
+ An OpenAPI definition for the GitLab REST API.
+ Few API resources or endpoints are currently included.
+ The intent is to expand this to match the entire Markdown documentation of the API:
+
+ mdi-minus
+
+
+ {{ openAPI.name }}
+
+
+ {{ openAPI.description }}
+
+
+
+
+
+ Save
+ Cancel
+
+
+
+ +
+
+