Compare commits
5 Commits
feature-ap
...
feature-xj
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b804d7608 | ||
|
|
4563274789 | ||
|
|
3b9f08b43d | ||
|
|
4c8cc1def9 | ||
|
|
7284f982a3 |
@@ -156,10 +156,10 @@ def getsettingfromexcel(df):
|
|||||||
des = df.iloc[2,2]
|
des = df.iloc[2,2]
|
||||||
return {"name":appname,"description":des}
|
return {"name":appname,"description":des}
|
||||||
|
|
||||||
def getsettingfromkintone(app:str,c:config.KINTONE_ENV):
|
def getsettingfromkintone(app:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/app/settings.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/app/settings.json"
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
@@ -171,24 +171,24 @@ def analysesettings(excel,kintone):
|
|||||||
updatesettings[key] = excel[key]
|
updatesettings[key] = excel[key]
|
||||||
return updatesettings
|
return updatesettings
|
||||||
|
|
||||||
def createkintoneapp(name:str,c:config.KINTONE_ENV):
|
def createkintoneapp(name:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
data = {"name":name}
|
data = {"name":name}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app.json"
|
||||||
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def updateappsettingstokintone(app:str,updates:dict,c:config.KINTONE_ENV):
|
def updateappsettingstokintone(app:str,updates:dict,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
|
||||||
data = {"app":app}
|
data = {"app":app}
|
||||||
data.update(updates)
|
data.update(updates)
|
||||||
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def addfieldstokintone(app:str,fields:dict,c:config.KINTONE_ENV,revision:str = None):
|
def addfieldstokintone(app:str,fields:dict,env:config.KINTONE_ENV,revision:str = None):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
||||||
if revision != None:
|
if revision != None:
|
||||||
data = {"app":app,"revision":revision,"properties":fields}
|
data = {"app":app,"revision":revision,"properties":fields}
|
||||||
else:
|
else:
|
||||||
@@ -197,43 +197,43 @@ def addfieldstokintone(app:str,fields:dict,c:config.KINTONE_ENV,revision:str = N
|
|||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def updatefieldstokintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
|
def updatefieldstokintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
||||||
data = {"app":app,"properties":fields}
|
data = {"app":app,"properties":fields}
|
||||||
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def deletefieldsfromkintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
|
def deletefieldsfromkintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
|
||||||
params = {"app":app,"revision":revision,"fields":fields}
|
params = {"app":app,"revision":revision,"fields":fields}
|
||||||
#r = httpx.delete(url,headers=headers,content=json.dumps(params))
|
#r = httpx.delete(url,headers=headers,content=json.dumps(params))
|
||||||
r = httpx.request(method="DELETE",url=url,headers=headers,content=json.dumps(params))
|
r = httpx.request(method="DELETE",url=url,headers=headers,content=json.dumps(params))
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
|
def deoployappfromkintone(app:str,revision:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
|
||||||
data = {"apps":[{"app":app,"revision":revision}],"revert": False}
|
data = {"apps":[{"app":app,"revision":revision}],"revert": False}
|
||||||
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json
|
return r.json
|
||||||
|
|
||||||
# 既定項目に含めるアプリのフィールドのみ取得する
|
# 既定項目に含めるアプリのフィールドのみ取得する
|
||||||
# スペース、枠線、ラベルを含まない
|
# スペース、枠線、ラベルを含まない
|
||||||
def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
|
def getfieldsfromkintone(app:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/app/form/fields.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/app/form/fields.json"
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
# フォームに配置するフィールドのみ取得する
|
# フォームに配置するフィールドのみ取得する
|
||||||
# スペース、枠線、ラベルも含める
|
# スペース、枠線、ラベルも含める
|
||||||
def getformfromkintone(app:str,c:config.KINTONE_ENV):
|
def getformfromkintone(app:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/form.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/form.json"
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
@@ -286,10 +286,10 @@ def analysefields(excel,kintone):
|
|||||||
|
|
||||||
return {"update":updatefields,"add":addfields,"del":delfields}
|
return {"update":updatefields,"add":addfields,"del":delfields}
|
||||||
|
|
||||||
def getprocessfromkintone(app:str,c:config.KINTONE_ENV):
|
def getprocessfromkintone(app:str,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/app/status.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/app/status.json"
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
@@ -374,24 +374,24 @@ def getkintoneorgs(c:config.KINTONE_ENV):
|
|||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def uploadkintonefiles(file,c:config.KINTONE_ENV):
|
def uploadkintonefiles(file,env:config.KINTONE_ENV):
|
||||||
if (file.endswith('alc_runtime.js') and config.DEPLOY_MODE == "DEV"):
|
if (file.endswith('alc_runtime.js') and config.DEPLOY_MODE == "DEV"):
|
||||||
return {'fileKey':file}
|
return {'fileKey':file}
|
||||||
upload_files = {'file': open(file,'rb')}
|
upload_files = {'file': open(file,'rb')}
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
data ={'name':'file','filename':os.path.basename(file)}
|
data ={'name':'file','filename':os.path.basename(file)}
|
||||||
url = f"{c.BASE_URL}/k/v1/file.json"
|
url = f"{env.BASE_URL}/k/v1/file.json"
|
||||||
r = httpx.post(url,headers=headers,data=data,files=upload_files)
|
r = httpx.post(url,headers=headers,data=data,files=upload_files)
|
||||||
#{"name":data['filename'],'fileKey':r['fileKey']}
|
#{"name":data['filename'],'fileKey':r['fileKey']}
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
def updateappjscss(app,uploads,c:config.KINTONE_ENV):
|
def updateappjscss(app,uploads,env:config.KINTONE_ENV):
|
||||||
dsjs = []
|
dsjs = []
|
||||||
dscss = []
|
dscss = []
|
||||||
#mobile側
|
#mobile側
|
||||||
mbjs = []
|
mbjs = []
|
||||||
mbcss = []
|
mbcss = []
|
||||||
customize = getappcustomize(app, c)
|
customize = getappcustomize(app, env)
|
||||||
current_js = customize['desktop'].get('js', [])
|
current_js = customize['desktop'].get('js', [])
|
||||||
current_css = customize['desktop'].get('css', [])
|
current_css = customize['desktop'].get('css', [])
|
||||||
current_mobile_js = customize['mobile'].get('js', [])
|
current_mobile_js = customize['mobile'].get('js', [])
|
||||||
@@ -430,16 +430,16 @@ def updateappjscss(app,uploads,c:config.KINTONE_ENV):
|
|||||||
ds ={'js':dsjs,'css':dscss}
|
ds ={'js':dsjs,'css':dscss}
|
||||||
mb ={'js':mbjs,'css':mbcss}
|
mb ={'js':mbjs,'css':mbcss}
|
||||||
data = {'app':app,'scope':'ALL','desktop':ds,'mobile':mb,'revision':customize["revision"]}
|
data = {'app':app,'scope':'ALL','desktop':ds,'mobile':mb,'revision':customize["revision"]}
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
|
||||||
print(json.dumps(data))
|
print(json.dumps(data))
|
||||||
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
r = httpx.put(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
#kintone カスタマイズ情報
|
#kintone カスタマイズ情報
|
||||||
def getappcustomize(app,c:config.KINTONE_ENV):
|
def getappcustomize(app,env:config.KINTONE_ENV):
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
@@ -451,9 +451,9 @@ def getTempPath(filename):
|
|||||||
fpath = os.path.join(rootdir,"Temp",filename)
|
fpath = os.path.join(rootdir,"Temp",filename)
|
||||||
return fpath
|
return fpath
|
||||||
|
|
||||||
def createappjs(domainid,app):
|
def createappjs(domain_url,app):
|
||||||
db = SessionLocal()
|
db = SessionLocal()
|
||||||
flows = get_flows_by_app(db,domainid,app)
|
flows = get_flows_by_app(db,domain_url,app)
|
||||||
db.close()
|
db.close()
|
||||||
content={}
|
content={}
|
||||||
for flow in flows:
|
for flow in flows:
|
||||||
@@ -521,7 +521,7 @@ async def upload(request:Request,files:t.List[UploadFile] = File(...)):
|
|||||||
return {"files": [file.filename for file in files]}
|
return {"files": [file.filename for file in files]}
|
||||||
|
|
||||||
@r.post("/updatejscss")
|
@r.post("/updatejscss")
|
||||||
async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env = Depends(getkintoneenv)):
|
async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env:config.KINTONE_ENV = Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
jscs=[]
|
jscs=[]
|
||||||
for file in files:
|
for file in files:
|
||||||
@@ -542,21 +542,21 @@ async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env
|
|||||||
raise APIException('kintone:updatejscss',request.url._url, f"Error occurred while update js/css {file.filename} is not an Excel file",e)
|
raise APIException('kintone:updatejscss',request.url._url, f"Error occurred while update js/css {file.filename} is not an Excel file",e)
|
||||||
|
|
||||||
@r.get("/app")
|
@r.get("/app")
|
||||||
async def app(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
|
async def app(request:Request,app:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/app.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/app.json"
|
||||||
params ={"id":app}
|
params ={"id":app}
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAME}->{app}):",e)
|
raise APIException('kintone:app',request.url._url, f"Error occurred while get app({env.DOMAIN_NAME}->{app}):",e)
|
||||||
|
|
||||||
@r.get("/allapps")
|
@r.get("/allapps")
|
||||||
async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
|
async def allapps(request:Request,env:config.KINTONE_ENV=Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/apps.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/apps.json"
|
||||||
offset = 0
|
offset = 0
|
||||||
limit = 100
|
limit = 100
|
||||||
all_apps = []
|
all_apps = []
|
||||||
@@ -572,17 +572,17 @@ async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
|
|||||||
return {"apps": all_apps}
|
return {"apps": all_apps}
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:allapps', request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAME}):", e)
|
raise APIException('kintone:allapps', request.url._url, f"Error occurred while get allapps({env.DOMAIN_NAME}):", e)
|
||||||
|
|
||||||
@r.get("/appfields")
|
@r.get("/appfields")
|
||||||
async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
|
async def appfields(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
return getfieldsfromkintone(app,env)
|
return getfieldsfromkintone(app,env)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e)
|
raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e)
|
||||||
|
|
||||||
@r.get("/allfields")
|
@r.get("/allfields")
|
||||||
async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
|
async def allfields(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
field_resp = getfieldsfromkintone(app,env)
|
field_resp = getfieldsfromkintone(app,env)
|
||||||
form_resp = getformfromkintone(app,env)
|
form_resp = getformfromkintone(app,env)
|
||||||
@@ -591,38 +591,38 @@ async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
|
|||||||
raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAME}->{app}):",e)
|
raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAME}->{app}):",e)
|
||||||
|
|
||||||
@r.get("/appprocess")
|
@r.get("/appprocess")
|
||||||
async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
|
async def appprocess(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
return getprocessfromkintone(app,env)
|
return getprocessfromkintone(app,env)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e)
|
raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e)
|
||||||
|
|
||||||
@r.get("/alljscss")
|
@r.get("/alljscss")
|
||||||
async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
|
async def alljscs(request:Request,app:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/app/customize.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/app/customize.json"
|
||||||
params = {"app":app}
|
params = {"app":app}
|
||||||
r = httpx.get(url,headers=headers,params=params)
|
r = httpx.get(url,headers=headers,params=params)
|
||||||
return r.json()
|
return r.json()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAME}->{app}):",e)
|
raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({env.DOMAIN_NAME}->{app}):",e)
|
||||||
|
|
||||||
@r.post("/createapp",)
|
@r.post("/createapp",)
|
||||||
async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
|
async def createapp(request:Request,name:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
|
||||||
try:
|
try:
|
||||||
headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
|
||||||
data = {"name":name}
|
data = {"name":name}
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app.json"
|
||||||
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
||||||
result = r.json()
|
result = r.json()
|
||||||
if result.get("app") != None:
|
if result.get("app") != None:
|
||||||
url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
|
url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
|
||||||
data = {"apps":[result],"revert": False}
|
data = {"apps":[result],"revert": False}
|
||||||
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
r = httpx.post(url,headers=headers,data=json.dumps(data))
|
||||||
return r.json
|
return r.json
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAME}->{name}):",e)
|
raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({env.DOMAIN_NAME}->{name}):",e)
|
||||||
|
|
||||||
|
|
||||||
@r.post("/createappfromexcel",)
|
@r.post("/createappfromexcel",)
|
||||||
@@ -761,7 +761,7 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
|
|||||||
try:
|
try:
|
||||||
jscs=[]
|
jscs=[]
|
||||||
files=[]
|
files=[]
|
||||||
files.append(createappjs(env.DOMAIN_ID, app))
|
files.append(createappjs(env.BASE_URL, app))
|
||||||
files.append(getTempPath('alc_runtime.js'))
|
files.append(getTempPath('alc_runtime.js'))
|
||||||
files.append(getTempPath('alc_runtime.css'))
|
files.append(getTempPath('alc_runtime.css'))
|
||||||
for file in files:
|
for file in files:
|
||||||
|
|||||||
@@ -214,11 +214,14 @@ async def flow_create(
|
|||||||
)
|
)
|
||||||
async def flow_edit(
|
async def flow_edit(
|
||||||
request: Request,
|
request: Request,
|
||||||
|
flowid: str,
|
||||||
flow: FlowBase,
|
flow: FlowBase,
|
||||||
|
user=Depends(get_current_user),
|
||||||
db=Depends(get_db),
|
db=Depends(get_db),
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
return edit_flow(db, flow)
|
domain = get_activedomain(db, user.id)
|
||||||
|
return edit_flow(db,domain.url, flow)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise APIException('platform:flow',request.url._url,f"Error occurred while edit flow:",e)
|
raise APIException('platform:flow',request.url._url,f"Error occurred while edit flow:",e)
|
||||||
|
|
||||||
|
|||||||
@@ -190,15 +190,17 @@ def delete_flow(db: Session, flowid: str):
|
|||||||
|
|
||||||
|
|
||||||
def edit_flow(
|
def edit_flow(
|
||||||
db: Session, flow: schemas.FlowBase
|
db: Session, domainurl: str, flow: schemas.FlowBase
|
||||||
) -> schemas.Flow:
|
) -> schemas.Flow:
|
||||||
db_flow = get_flow(db, flow.flowid)
|
db_flow = get_flow(db, flow.flowid)
|
||||||
if not db_flow:
|
if not db_flow:
|
||||||
raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Flow not found")
|
#見つからない時新規作成
|
||||||
|
return create_flow(db,domainurl,flow)
|
||||||
|
|
||||||
update_data = flow.dict(exclude_unset=True)
|
update_data = flow.dict(exclude_unset=True)
|
||||||
|
|
||||||
for key, value in update_data.items():
|
for key, value in update_data.items():
|
||||||
setattr(db_flow, key, value)
|
setattr(db_flow, key, value)
|
||||||
|
|
||||||
db.add(db_flow)
|
db.add(db_flow)
|
||||||
db.commit()
|
db.commit()
|
||||||
@@ -214,8 +216,8 @@ def get_flows(db: Session, flowid: str):
|
|||||||
|
|
||||||
def get_flow(db: Session, flowid: str):
|
def get_flow(db: Session, flowid: str):
|
||||||
flow = db.query(models.Flow).filter(models.Flow.flowid == flowid).first()
|
flow = db.query(models.Flow).filter(models.Flow.flowid == flowid).first()
|
||||||
if not flow:
|
# if not flow:
|
||||||
raise HTTPException(status_code=404, detail="Data not found")
|
# raise HTTPException(status_code=404, detail="Data not found")
|
||||||
return flow
|
return flow
|
||||||
|
|
||||||
def get_flows_by_app(db: Session,domainurl: str, appid: str):
|
def get_flows_by_app(db: Session,domainurl: str, appid: str):
|
||||||
|
|||||||
39
frontend/src/components/dialog/VersionInput.vue
Normal file
39
frontend/src/components/dialog/VersionInput.vue
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
<template>
|
||||||
|
<q-input
|
||||||
|
v-model="versionInfo.name"
|
||||||
|
filled
|
||||||
|
label="バージョン名"
|
||||||
|
:rules="[(val) => val.length <= 20 || '20字以内で入力ください']"
|
||||||
|
/>
|
||||||
|
<q-input
|
||||||
|
v-model="versionInfo.desc"
|
||||||
|
filled
|
||||||
|
type="textarea"
|
||||||
|
:rules="[(val) => val.length <= 80 || '80字以内で入力ください']"
|
||||||
|
label="説明"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, watch, defineProps, defineEmits } from 'vue';
|
||||||
|
import { QInput } from 'quasar';
|
||||||
|
import { IVersionInfo } from 'src/types/AppTypes';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
modelValue: IVersionInfo;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const versionInfo = ref({
|
||||||
|
...props.modelValue,
|
||||||
|
name: props.modelValue.name || `新バージョン ${new Date().toLocaleString()}`,
|
||||||
|
});
|
||||||
|
|
||||||
|
const emit = defineEmits(['update:modelValue']);
|
||||||
|
|
||||||
|
watch(
|
||||||
|
versionInfo,
|
||||||
|
() => {
|
||||||
|
emit('update:modelValue', { ...versionInfo.value });
|
||||||
|
},
|
||||||
|
{ immediate: true, deep: true }
|
||||||
|
);
|
||||||
|
</script>
|
||||||
@@ -57,9 +57,10 @@ interface IAppDisplay{
|
|||||||
}
|
}
|
||||||
|
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
|
const numberStringSorting = (a: string, b: string) => parseInt(a, 10) - parseInt(b, 10);
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
{ name: 'id', label: 'アプリID', field: 'id', align: 'left', sortable: true },
|
{ name: 'id', label: 'アプリID', field: 'id', align: 'left', sortable: true, sort: numberStringSorting },
|
||||||
{ name: 'name', label: 'アプリ名', field: 'name', align: 'left', sortable: true },
|
{ name: 'name', label: 'アプリ名', field: 'name', align: 'left', sortable: true },
|
||||||
{ name: 'url', label: 'URL', field: 'url', align: 'left', sortable: true },
|
{ name: 'url', label: 'URL', field: 'url', align: 'left', sortable: true },
|
||||||
{ name: 'user', label: '最後更新者', field: 'user', align: 'left', sortable: true},
|
{ name: 'user', label: '最後更新者', field: 'user', align: 'left', sortable: true},
|
||||||
@@ -77,16 +78,16 @@ const store = useFlowEditorStore();
|
|||||||
const getApps = async () => {
|
const getApps = async () => {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
const result = await api.get('api/apps');
|
const result = await api.get('api/apps');
|
||||||
rows.value = result.data.map((item:IManagedApp) => {
|
rows.value = result.data.map((item: IManagedApp) => {
|
||||||
return {
|
return {
|
||||||
id: Number(item.appid),
|
id: item.appid,
|
||||||
name: item.appname,
|
name: item.appname,
|
||||||
url: `${item.domainurl}/k/${item.appid}`,
|
url: `${item.domainurl}/k/${item.appid}`,
|
||||||
user: `${item.user.first_name} ${item.user.last_name}` ,
|
user: `${item.user.first_name} ${item.user.last_name}` ,
|
||||||
updatetime:date.formatDate(item.update_time, 'YYYY/MM/DD HH:mm'),
|
updatetime:date.formatDate(item.update_time, 'YYYY/MM/DD HH:mm'),
|
||||||
version: Number(item.version)
|
version: Number(item.version)
|
||||||
}
|
}
|
||||||
}).sort((a, b) => a.id - b.id); // set default order
|
}).sort((a: IAppDisplay, b: IAppDisplay) => numberStringSorting(a.id, b.id)); // set default order
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,15 @@
|
|||||||
<q-space></q-space>
|
<q-space></q-space>
|
||||||
<q-btn-dropdown color="primary" label="保存" icon="save" :loading="saveLoading" >
|
<q-btn-dropdown color="primary" label="保存" icon="save" :loading="saveLoading" >
|
||||||
<q-list>
|
<q-list>
|
||||||
|
<q-item clickable v-close-popup @click="onSaveVersion">
|
||||||
|
<q-item-section avatar >
|
||||||
|
<q-icon name="history"></q-icon>
|
||||||
|
</q-item-section>
|
||||||
|
<q-item-section>
|
||||||
|
<q-item-label>新バージョン保存</q-item-label>
|
||||||
|
</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
|
||||||
<q-item clickable v-close-popup @click="onSaveFlow">
|
<q-item clickable v-close-popup @click="onSaveFlow">
|
||||||
<q-item-section avatar >
|
<q-item-section avatar >
|
||||||
<q-icon name="save" color="primary"></q-icon>
|
<q-icon name="save" color="primary"></q-icon>
|
||||||
@@ -75,6 +84,10 @@
|
|||||||
</template>
|
</template>
|
||||||
<action-select ref="appDg" name="model" :filter="filter" type="single" @clearFilter="onClearFilter" ></action-select>
|
<action-select ref="appDg" name="model" :filter="filter" type="single" @clearFilter="onClearFilter" ></action-select>
|
||||||
</ShowDialog>
|
</ShowDialog>
|
||||||
|
<!-- save version dialog -->
|
||||||
|
<ShowDialog v-model:visible="saveVersionAction" name="新バージョン保存" @close="closeSaveVersionDg" min-width="500px">
|
||||||
|
<version-input v-model="versionInfo" />
|
||||||
|
</ShowDialog>
|
||||||
<q-inner-loading
|
<q-inner-loading
|
||||||
:showing="initLoading"
|
:showing="initLoading"
|
||||||
color="primary"
|
color="primary"
|
||||||
@@ -87,7 +100,7 @@
|
|||||||
import { ref, reactive, computed, onMounted } from 'vue';
|
import { ref, reactive, computed, onMounted } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
|
import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
|
||||||
import { IManagedApp } from 'src/types/AppTypes';
|
import { IManagedApp, IVersionInfo } from 'src/types/AppTypes';
|
||||||
import { storeToRefs } from 'pinia';
|
import { storeToRefs } from 'pinia';
|
||||||
import { useFlowEditorStore } from 'stores/flowEditor';
|
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||||
import { useAuthStore } from 'stores/useAuthStore';
|
import { useAuthStore } from 'stores/useAuthStore';
|
||||||
@@ -98,6 +111,7 @@ import ShowDialog from 'components/ShowDialog.vue';
|
|||||||
import ActionSelect from 'components/ActionSelect.vue';
|
import ActionSelect from 'components/ActionSelect.vue';
|
||||||
import PropertyPanel from 'components/right/PropertyPanel.vue';
|
import PropertyPanel from 'components/right/PropertyPanel.vue';
|
||||||
import EventTree from 'components/left/EventTree.vue';
|
import EventTree from 'components/left/EventTree.vue';
|
||||||
|
import VersionInput from 'components/dialog/VersionInput.vue';
|
||||||
import { FlowCtrl } from '../control/flowctrl';
|
import { FlowCtrl } from '../control/flowctrl';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
|
||||||
@@ -105,6 +119,7 @@ const deployLoading = ref(false);
|
|||||||
const saveLoading = ref(false);
|
const saveLoading = ref(false);
|
||||||
const initLoading = ref(true);
|
const initLoading = ref(true);
|
||||||
const drawerLeft = ref(false);
|
const drawerLeft = ref(false);
|
||||||
|
const versionInfo = ref<IVersionInfo>();
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const store = useFlowEditorStore();
|
const store = useFlowEditorStore();
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
@@ -117,6 +132,7 @@ const prevNodeIfo = ref({
|
|||||||
});
|
});
|
||||||
// const refFlow = ref<ActionFlow|null>(null);
|
// const refFlow = ref<ActionFlow|null>(null);
|
||||||
const showAddAction = ref(false);
|
const showAddAction = ref(false);
|
||||||
|
const saveVersionAction = ref(false);
|
||||||
const drawerRight = ref(false);
|
const drawerRight = ref(false);
|
||||||
const filter=ref("");
|
const filter=ref("");
|
||||||
const model = ref("");
|
const model = ref("");
|
||||||
@@ -177,7 +193,7 @@ const onDeleteAllNextNodes = (node: IActionNode) => {
|
|||||||
}
|
}
|
||||||
const closeDg = (val: any) => {
|
const closeDg = (val: any) => {
|
||||||
console.log("Dialog closed->", val);
|
console.log("Dialog closed->", val);
|
||||||
if (val == 'OK') {
|
if (val == 'OK' && appDg?.value?.selected?.length > 0) {
|
||||||
const data = appDg.value.selected[0];
|
const data = appDg.value.selected[0];
|
||||||
const actionProps = JSON.parse(data.property);
|
const actionProps = JSON.parse(data.property);
|
||||||
const outputPoint = JSON.parse(data.outputPoints);
|
const outputPoint = JSON.parse(data.outputPoints);
|
||||||
@@ -245,6 +261,20 @@ const onSaveActionProps=(props:IActionProperty[])=>{
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onSaveVersion = async () => {
|
||||||
|
versionInfo.value = {
|
||||||
|
id: '1' // TODO
|
||||||
|
}
|
||||||
|
saveVersionAction.value = true;
|
||||||
|
// await onSaveAllFlow();
|
||||||
|
}
|
||||||
|
|
||||||
|
const closeSaveVersionDg = (val: 'OK'|'CANCEL') => {
|
||||||
|
if (val == 'OK') {
|
||||||
|
console.log(versionInfo.value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const onSaveFlow = async () => {
|
const onSaveFlow = async () => {
|
||||||
const targetFlow = store.selectedFlow;
|
const targetFlow = store.selectedFlow;
|
||||||
if (targetFlow === undefined) {
|
if (targetFlow === undefined) {
|
||||||
|
|||||||
@@ -12,3 +12,9 @@ export interface IManagedApp {
|
|||||||
user: IUser;
|
user: IUser;
|
||||||
update_time: string;
|
update_time: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IVersionInfo {
|
||||||
|
id: string;
|
||||||
|
name?: string;
|
||||||
|
desc?: string;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user