Add save version dialog

[bugfix] id format error when saving flow

backend/app/api/api_v1/routers/kintone.py

@@ -156,10 +156,10 @@ def getsettingfromexcel(df):
     des = df.iloc[2,2]
     return {"name":appname,"description":des}
 
-def getsettingfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getsettingfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     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)
     return r.json()
 
@@ -171,24 +171,24 @@ def analysesettings(excel,kintone):
             updatesettings[key] = excel[key]
     return updatesettings
 
-def createkintoneapp(name:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+def createkintoneapp(name:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
     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))
     return r.json()
 
-def updateappsettingstokintone(app:str,updates:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
+def updateappsettingstokintone(app:str,updates:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
     data = {"app":app}
     data.update(updates)
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def addfieldstokintone(app:str,fields:dict,c:config.KINTONE_ENV,revision:str = None):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+def addfieldstokintone(app:str,fields:dict,env:config.KINTONE_ENV,revision:str = None):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     if revision != None:
         data = {"app":app,"revision":revision,"properties":fields}
     else:
@@ -197,43 +197,43 @@ def addfieldstokintone(app:str,fields:dict,c:config.KINTONE_ENV,revision:str = N
     r.raise_for_status()
     return r.json()
  
-def updatefieldstokintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+def updatefieldstokintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     data = {"app":app,"properties":fields}
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def deletefieldsfromkintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+def deletefieldsfromkintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     params = {"app":app,"revision":revision,"fields":fields}
     #r = httpx.delete(url,headers=headers,content=json.dumps(params))
     r = httpx.request(method="DELETE",url=url,headers=headers,content=json.dumps(params))
     return r.json()
 
-def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
+def deoployappfromkintone(app:str,revision:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
     data = {"apps":[{"app":app,"revision":revision}],"revert": False}
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json
 
 # 既定項目に含めるアプリのフィールドのみ取得する
 # スペース、枠線、ラベルを含まない    
-def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getfieldsfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     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)
     return r.json()
 
 # フォームに配置するフィールドのみ取得する
 # スペース、枠線、ラベルも含める
-def getformfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getformfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     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)
     return r.json()
 
@@ -286,10 +286,10 @@ def analysefields(excel,kintone):
 
     return {"update":updatefields,"add":addfields,"del":delfields}
 
-def getprocessfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getprocessfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     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)
     return r.json()
 
@@ -374,24 +374,24 @@ def getkintoneorgs(c:config.KINTONE_ENV):
     r = httpx.get(url,headers=headers,params=params)
     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"):
         return {'fileKey':file}
     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)}
-    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)    
     #{"name":data['filename'],'fileKey':r['fileKey']}
     return r.json()
 
-def updateappjscss(app,uploads,c:config.KINTONE_ENV):
+def updateappjscss(app,uploads,env:config.KINTONE_ENV):
     dsjs = []
     dscss = []
     #mobile側
     mbjs = []  
     mbcss = []
-    customize = getappcustomize(app, c)
+    customize = getappcustomize(app, env)
     current_js = customize['desktop'].get('js', [])
     current_css = customize['desktop'].get('css', [])
     current_mobile_js = customize['mobile'].get('js', [])
@@ -430,16 +430,16 @@ def updateappjscss(app,uploads,c:config.KINTONE_ENV):
     ds ={'js':dsjs,'css':dscss}
     mb ={'js':mbjs,'css':mbcss}
     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"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
     print(json.dumps(data))
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
 #kintone カスタマイズ情報
-def getappcustomize(app,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
+def getappcustomize(app,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
     params = {"app":app}
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
@@ -451,9 +451,9 @@ def getTempPath(filename):
     fpath = os.path.join(rootdir,"Temp",filename)
     return fpath
 
-def createappjs(domainid,app):
+def createappjs(domain_url,app):
     db = SessionLocal()
-    flows = get_flows_by_app(db,domainid,app)
+    flows = get_flows_by_app(db,domain_url,app)
     db.close()
     content={}
     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]}  
 
 @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:
         jscs=[]
         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)
 
 @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:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/app.json"
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/app.json"
         params ={"id":app}
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     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")
-async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
+async def allapps(request:Request,env:config.KINTONE_ENV=Depends(getkintoneenv)):
     try:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/apps.json"
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/apps.json"
         offset = 0
         limit = 100
         all_apps = [] 
@@ -572,17 +572,17 @@ async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
         return {"apps": all_apps}
 
     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")
-async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
+async def appfields(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
     try:
         return getfieldsfromkintone(app,env)
     except Exception as e:
        raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e) 
 
 @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:
         field_resp = getfieldsfromkintone(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) 
 
 @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:
         return getprocessfromkintone(app,env)
     except Exception as e:
        raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e) 
 
 @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:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/app/customize.json"
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/app/customize.json"
         params = {"app":app}
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     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",)
-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:
-        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}
-        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))
         result = r.json()
         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}
             r = httpx.post(url,headers=headers,data=json.dumps(data))
         return r.json
     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",)
@@ -761,7 +761,7 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
     try:
         jscs=[]
         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.css'))        
         for file in files:

backend/app/api/api_v1/routers/platform.py

@@ -1,5 +1,7 @@
+from http import HTTPStatus
 from fastapi import Query, Request,Depends, APIRouter, UploadFile,HTTPException,File
-from app.core.operation import log_operation
+from fastapi.responses import JSONResponse
+# from app.core.operation import log_operation
 from app.db import Base,engine
 from app.db.session import get_db
 from app.db.crud import *
@@ -25,9 +27,9 @@ async def apps_list(
     db=Depends(get_db),
 ):
     try:
-        platformapps = get_apps(db)
-        domain = get_activedomain(db, user.id)
        
+        domain = get_activedomain(db, user.id)
+        platformapps = get_apps(db,domain.url)
         kintoneevn = config.KINTONE_ENV(domain)
         headers={config.API_V1_AUTH_KEY:kintoneevn.API_V1_AUTH_VALUE}
         url = f"{kintoneevn.BASE_URL}{config.API_V1_STR}/apps.json"
@@ -44,17 +46,13 @@ async def apps_list(
                 break
             offset += limit
         
-        tempapps = platformapps.copy()
-        for papp in  tempapps:
-           exist = False
-           for kapp in  all_apps:
-               if kapp['appId'] == papp.appid:
-                   exist = True
-                   break
-           if not exist:
-              platformapps.remove(papp)
-
-        return platformapps
+        kintone_apps_dict = {app['appId']: app for app in all_apps}
+        filtered_apps = []
+        for papp in platformapps:
+            if papp.appid in kintone_apps_dict:
+                papp.appname = kintone_apps_dict[papp.appid]["name"]
+                filtered_apps.append(papp)
+        return filtered_apps
     except Exception as e:
         raise APIException('platform:apps',request.url._url,f"Error occurred while get apps:",e)
 
@@ -216,11 +214,14 @@ async def flow_create(
 )
 async def flow_edit(
     request: Request,
+    flowid: str, 
     flow: FlowBase,
+    user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        return edit_flow(db, flow)
+        domain = get_activedomain(db, user.id)
+        return edit_flow(db,domain.url, flow)
     except Exception as e:
         raise APIException('platform:flow',request.url._url,f"Error occurred while edit flow:",e)
 
@@ -258,10 +259,11 @@ async def domain_details(
 async def domain_create(
     request: Request,
     domain: DomainBase,
+    user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        return create_domain(db, domain)
+        return create_domain(db, domain,user.id)
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while create domain:",e)
 
@@ -354,8 +356,9 @@ async def get_useractivedomain(
 ):
     try:
         # domain = get_activedomain(db, user.id)
-
         domain = get_activedomain(db, userId if userId is not None else user.id)
+        if domain is None:
+            return JSONResponse(content=None,status_code=HTTPStatus.OK)
         return domain
     except Exception as e:
         raise APIException('platform:activedomain',request.url._url,f"Error occurred while get user({user.id}) activedomain:",e)

backend/app/db/crud.py

@@ -70,9 +70,10 @@ def edit_user(
     return db_user
 
 def get_apps(
-    db: Session
+    db: Session,
+    domain_url:str
 ) -> t.List[schemas.AppList]:
-    return db.query(models.App).all()
+    return db.query(models.App).filter(models.App.domainurl == domain_url).all()
 
 def update_appversion(db: Session, appedit: schemas.AppVersion,userid:int):
     app = db.query(models.App).filter(and_(models.App.domainurl ==  appedit.domainurl,models.App.appid == appedit.appid)).first()
@@ -189,11 +190,13 @@ def delete_flow(db: Session, flowid: str):
 
 
 def edit_flow(
-    db: Session, flow: schemas.FlowBase
+    db: Session, domainurl: str, flow: schemas.FlowBase
 ) -> schemas.Flow:
     db_flow = get_flow(db, flow.flowid)
     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)
 
     for key, value in update_data.items():
@@ -213,8 +216,8 @@ def get_flows(db: Session, flowid: str):
 
 def get_flow(db: Session, flowid: str):
     flow = db.query(models.Flow).filter(models.Flow.flowid == flowid).first()
-    if not flow:
-        raise HTTPException(status_code=404, detail="Data not found")
+    # if not flow:
+    #     raise HTTPException(status_code=404, detail="Data not found")
     return flow
 
 def get_flows_by_app(db: Session,domainurl: str, appid: str):
@@ -223,7 +226,7 @@ def get_flows_by_app(db: Session,domainurl: str, appid: str):
         raise Exception("Data not found")
     return flows
 
-def create_domain(db: Session, domain: schemas.DomainBase):
+def create_domain(db: Session, domain: schemas.DomainBase,userid:int):
     domain.encrypt_kintonepwd()
     db_domain = models.Domain(
         tenantid = domain.tenantid,
@@ -233,6 +236,8 @@ def create_domain(db: Session, domain: schemas.DomainBase):
         kintonepwd=domain.kintonepwd
     )
     db.add(db_domain)
+    db.flush()
+    add_userdomain(db,userid,db_domain.id)
     db.commit()
     db.refresh(db_domain)
     return db_domain
@@ -264,7 +269,13 @@ def edit_domain(
     db.refresh(db_domain)
     return db_domain
 
-def add_userdomain(db: Session, userid:int,domainids:list[str]):
+
+def add_userdomain(db: Session, userid:int,domainid:int):
+    user_domain = models.UserDomain(userid = userid, domainid = domainid )
+    db.add(user_domain)
+    return user_domain
+
+def add_userdomains(db: Session, userid:int,domainids:list[str]):
     dbCommits = list(map(lambda domainid: models.UserDomain(userid = userid, domainid = domainid ), domainids))
     db.bulk_save_objects(dbCommits)
     db.commit()
@@ -291,16 +302,23 @@ def active_userdomain(db: Session, userid: int,domainid: int):
     db.commit()
     return db_userdomains
 
-def get_activedomain(db: Session, userid: int):
-    db_domain = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(and_(models.UserDomain.userid == userid,models.UserDomain.active == True)).first()
-    # if not db_domain:
+def get_activedomain(db: Session, userid: int)-> t.Optional[models.Domain]:
+    user_domains = (db.query(models.Domain,models.UserDomain.active)
+                 .join(models.UserDomain,models.UserDomain.domainid == models.Domain.id )
+                 .filter(models.UserDomain.userid == userid)
+                 .all())
+    db_domain=None
+    if len(user_domains)==1:
+        db_domain = user_domains[0][0];
+    else:
+        db_domain = next((domain for domain,active in user_domains if active),None)
     # raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
     return db_domain
 
 def get_domain(db: Session, userid: str):
     domains = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(models.UserDomain.userid == userid).all()
-    if not domains:
-        raise HTTPException(status_code=404, detail="Data not found")
+    # if not domains:
+    #     raise HTTPException(status_code=404, detail="Data not found")
     # for domain in domains:
     #     decrypted_pwd = chacha20Decrypt(domain.kintonepwd)
     #     domain.kintonepwd = decrypted_pwd

document/ALCKintone_20231012.drawio

@@ -1,4 +1,4 @@
-<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36" version="24.8.3" pages="4">
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36" version="24.8.6" pages="4">
   <diagram name="Page-1" id="efa7a0a1-bf9b-a30e-e6df-94a7791c09e9">
     <mxGraphModel dx="1434" dy="884" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="826" pageHeight="1169" background="none" math="0" shadow="0">
       <root>
@@ -134,7 +134,7 @@
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="-EYEuPrK34tZavjatbhk-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=none;dashed=1;" parent="1" vertex="1">
-          <mxGeometry x="635" y="-920" width="605" height="1120" as="geometry" />
+          <mxGeometry x="635" y="-920" width="775" height="1200" as="geometry" />
         </mxCell>
         <mxCell id="vKKEXlAMpGyNXKJgxOUS-2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=none;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="295" y="-920" width="290" height="505" as="geometry" />
@@ -552,15 +552,15 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="GH2g80-cBXHe62XdPV4N-18">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="GH2g80-cBXHe62XdPV4N-18" vertex="1">
           <mxGeometry y="120" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-2" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-1">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-2" value="UK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-1" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-3" value="app_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-1">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-3" value="app_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-1" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -578,28 +578,28 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="GH2g80-cBXHe62XdPV4N-18">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="GH2g80-cBXHe62XdPV4N-18" vertex="1">
           <mxGeometry y="180" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-2" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="65XQlPrDDXONBYnOkRAB-1">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-2" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="65XQlPrDDXONBYnOkRAB-1" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-3" value="Update_User" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="65XQlPrDDXONBYnOkRAB-1">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-3" value="Update_User" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="65XQlPrDDXONBYnOkRAB-1" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-4" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="GH2g80-cBXHe62XdPV4N-18">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-4" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="GH2g80-cBXHe62XdPV4N-18" vertex="1">
           <mxGeometry y="210" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-5" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="65XQlPrDDXONBYnOkRAB-4">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-5" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="65XQlPrDDXONBYnOkRAB-4" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="65XQlPrDDXONBYnOkRAB-6" value="Verion" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="65XQlPrDDXONBYnOkRAB-4">
+        <mxCell id="65XQlPrDDXONBYnOkRAB-6" value="Verion" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="65XQlPrDDXONBYnOkRAB-4" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -978,217 +978,358 @@
         <mxCell id="-EYEuPrK34tZavjatbhk-2" value="テナントDB" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#6c8ebf;fillColor=#dae8fc;dashed=1;gradientColor=#7ea6e0;" parent="1" vertex="1">
           <mxGeometry x="635" y="-950" width="90" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-1" value="Flow_stage" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-1" value="Flow_stage" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
           <mxGeometry x="380" y="-385" width="180" height="210" as="geometry">
             <mxRectangle x="320" y="370" width="60" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-3" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-2">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-3" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-2" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-4" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-2">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-4" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-2" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="60" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-6" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-5">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-6" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-5" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-7" value="domain_url" style="shape=partialRectangle;connectable=0;fillColor=#e51400;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;fontColor=#ffffff;strokeColor=#B20000;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-5">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-7" value="domain_url" style="shape=partialRectangle;connectable=0;fillColor=#e51400;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;fontColor=#ffffff;strokeColor=#B20000;" parent="r-0MZSSSpHWbTn0B3lSh-5" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="90" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-9" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-8">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-9" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-8" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-10" value="app_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-8">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-10" value="app_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-8" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="120" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-12" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-11">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-12" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-11" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-13" value="spaceid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-11">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-13" value="spaceid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="r-0MZSSSpHWbTn0B3lSh-11" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-14" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-14" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="150" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-15" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-14">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-15" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="r-0MZSSSpHWbTn0B3lSh-14" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-16" value="content(json)" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-14">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-16" value="content(json)" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="r-0MZSSSpHWbTn0B3lSh-14" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-1">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="r-0MZSSSpHWbTn0B3lSh-1" vertex="1">
           <mxGeometry y="180" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-18" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-17">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-18" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="r-0MZSSSpHWbTn0B3lSh-17" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-19" value="event_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="r-0MZSSSpHWbTn0B3lSh-17">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-19" value="event_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="r-0MZSSSpHWbTn0B3lSh-17" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="r-0MZSSSpHWbTn0B3lSh-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="8Zu1yShcSHxMs68hy39H-2" target="r-0MZSSSpHWbTn0B3lSh-2">
+        <mxCell id="r-0MZSSSpHWbTn0B3lSh-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="8Zu1yShcSHxMs68hy39H-2" target="r-0MZSSSpHWbTn0B3lSh-2" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-4" value="OperateLog" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-4" value="OperateLog" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
           <mxGeometry x="380" y="-140" width="180" height="300" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-6" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-5">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-6" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-5" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-7" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-5">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-7" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-5" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="60" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-8">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-8" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-10" value="event_datetime" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-8">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-10" value="event_datetime" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-8" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-30" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-30" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="90" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-31" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-30">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-31" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-30" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-32" value="tenant_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-30">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-32" value="tenant_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-30" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-27" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-27" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="120" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-28" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-27">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-28" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-27" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-29" value="domain_url" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-27">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-29" value="domain_url" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-27" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="150" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-12" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-11">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-12" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-11" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-13" value="user_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-11">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-13" value="user_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-11" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-14" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-14" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="180" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-15" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-14">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-15" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-14" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-16" value="evnetname" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-14">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-16" value="evnetname" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="tkXtZmliqQ14OWrfpaW_-14" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="210" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-18" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-17">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-18" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-17" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-19" value="operation" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-17">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-19" value="operation" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-17" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-24" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-24" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="240" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-25" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-24">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-25" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-24" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-26" value="function" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-24">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-26" value="function" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-24" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-35" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-4">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-35" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="tkXtZmliqQ14OWrfpaW_-4" vertex="1">
           <mxGeometry y="270" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-36" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-35">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-36" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-35" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tkXtZmliqQ14OWrfpaW_-37" value="detail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="tkXtZmliqQ14OWrfpaW_-35">
+        <mxCell id="tkXtZmliqQ14OWrfpaW_-37" value="detail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="tkXtZmliqQ14OWrfpaW_-35" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-4" value="App_History" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+          <mxGeometry x="1220" y="-680" width="180" height="330" as="geometry">
+            <mxRectangle x="600" y="370" width="60" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-6" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-5">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-7" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-5">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-9" value="UK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-8">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-10" value="domain_url" style="shape=partialRectangle;connectable=0;fillColor=#e51400;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;fontColor=#ffffff;strokeColor=#B20000;" vertex="1" parent="BQHE1joUryQacNBmIgG7-8">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-12" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-11">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-13" value="app_name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-11">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-14" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="120" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-15" value="UK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-14">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-16" value="app_id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-14">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="150" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-18" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-17">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-19" value="update_date" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="BQHE1joUryQacNBmIgG7-17">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-20" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="180" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-21" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-20">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-22" value="Update_User" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-20">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-23" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="210" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-24" value="UK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-23">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="BQHE1joUryQacNBmIgG7-25" value="Verion" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="BQHE1joUryQacNBmIgG7-23">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-4" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="240" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-5" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-4">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-6" value="Version_Name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-4">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-7" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="270" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-8" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-7">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-9" value="Comment" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-7">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="BQHE1joUryQacNBmIgG7-4">
+          <mxGeometry y="300" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-2" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-3" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=0;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="-PBKhDU9AzNn-prZe6Pj-1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="-PBKhDU9AzNn-prZe6Pj-10" value="" style="edgeStyle=entityRelationEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="NCbWPNvujZOKFJAbQVH6-51" target="BQHE1joUryQacNBmIgG7-8">
+          <mxGeometry width="100" height="100" relative="1" as="geometry">
+            <mxPoint x="1210" y="-230" as="sourcePoint" />
+            <mxPoint x="1310" y="-330" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="yu2qkxLoxjZt0KdZdE3U" name="サイトマップ">
-    <mxGraphModel dx="1434" dy="884" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1434" dy="820" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1215,7 +1356,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="Eq-ANaZqQ9FOvZb4mf5f-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="pWS3KtQQPnqtkGdZ5dy--7" target="Eq-ANaZqQ9FOvZb4mf5f-1">
+        <mxCell id="Eq-ANaZqQ9FOvZb4mf5f-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="pWS3KtQQPnqtkGdZ5dy--7" target="Eq-ANaZqQ9FOvZb4mf5f-1" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="pWS3KtQQPnqtkGdZ5dy--7" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
@@ -1268,9 +1409,17 @@
         <mxCell id="pWS3KtQQPnqtkGdZ5dy--22" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="pWS3KtQQPnqtkGdZ5dy--23" target="pWS3KtQQPnqtkGdZ5dy--25" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="uYWa1kwDf4TWZ3BUWFD4-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="pWS3KtQQPnqtkGdZ5dy--23" target="pWS3KtQQPnqtkGdZ5dy--34">
+        <mxCell id="uYWa1kwDf4TWZ3BUWFD4-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="pWS3KtQQPnqtkGdZ5dy--23" target="pWS3KtQQPnqtkGdZ5dy--34" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
+        <mxCell id="cVGsqKUb7IUMrPYZG-Pq-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="pWS3KtQQPnqtkGdZ5dy--23" target="pWS3KtQQPnqtkGdZ5dy--32">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="590" y="685" />
+              <mxPoint x="590" y="485" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
         <mxCell id="pWS3KtQQPnqtkGdZ5dy--23" value="アプリ一覧" style="html=1;whiteSpace=wrap;strokeColor=#006EAF;fillColor=#1ba1e2;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.news;fontColor=#ffffff;" parent="1" vertex="1">
           <mxGeometry x="440" y="650" width="120" height="70" as="geometry" />
         </mxCell>
@@ -1301,15 +1450,7 @@
           <mxGeometry x="620" y="755" width="120" height="70" as="geometry" />
         </mxCell>
         <mxCell id="pWS3KtQQPnqtkGdZ5dy--32" value="設計書ダウロード" style="html=1;whiteSpace=wrap;strokeColor=#006EAF;fillColor=#1ba1e2;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.news;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="440" y="865" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="pWS3KtQQPnqtkGdZ5dy--33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="pWS3KtQQPnqtkGdZ5dy--21" target="pWS3KtQQPnqtkGdZ5dy--32" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="390" y="685" />
-              <mxPoint x="390" y="900" />
-            </Array>
-          </mxGeometry>
+          <mxGeometry x="630" y="450" width="120" height="70" as="geometry" />
         </mxCell>
         <mxCell id="pWS3KtQQPnqtkGdZ5dy--34" value="フロー履歴管理" style="html=1;whiteSpace=wrap;strokeColor=#006EAF;fillColor=#1ba1e2;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.news;fontColor=#ffffff;" parent="1" vertex="1">
           <mxGeometry x="620" y="550" width="120" height="70" as="geometry" />
@@ -1349,7 +1490,7 @@
         <mxCell id="rk_IxCTN61cNepe1bzat-3" value="テナントDB&lt;br&gt;作成" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="660" y="40" width="90" height="70" as="geometry" />
         </mxCell>
-        <mxCell id="Eq-ANaZqQ9FOvZb4mf5f-1" value="ログ管理" style="html=1;whiteSpace=wrap;strokeColor=#56517e;fillColor=#d0cee2;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.home;" vertex="1" parent="1">
+        <mxCell id="Eq-ANaZqQ9FOvZb4mf5f-1" value="ログ管理" style="html=1;whiteSpace=wrap;strokeColor=#56517e;fillColor=#d0cee2;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
           <mxGeometry x="440" y="450" width="120" height="70" as="geometry" />
         </mxCell>
       </root>

frontend/src/components/DomainSelector.vue

@@ -1,12 +1,15 @@
 <template>
     <q-btn-dropdown
-      color="primay"
+      class="customized-disabled-btn"
       push
       flat
       no-caps
       icon="share"
       size="md"
       :label="userStore.currentDomain.domainName"
+      :disable-dropdown="isUnclickable"
+      :dropdown-icon="isUnclickable ? 'none' : ''"
+      :disable="isUnclickable"
     >
       <q-list>
         <q-item v-for="domain in domains" :key="domain.domainName"
@@ -26,18 +29,32 @@
 <script setup lang="ts" >
 import { IDomainInfo } from 'src/types/ActionTypes';
 import { useAuthStore,IUserState } from 'stores/useAuthStore';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
 const userStore = useAuthStore();
+const route = useRoute()
 const domains = ref<IDomainInfo[]>([]);
 (async ()=>{
   domains.value = await userStore.getUserDomains();
 })();
 
+const isUnclickable = computed(()=>{
+  return route.path.startsWith('/FlowChart/') || domains.value === undefined || domains.value.length === 0;
+});
+
+
 const onItemClick=(domain:IDomainInfo)=>{
   console.log(domain);
   userStore.setCurrentDomain(domain);
 }
 </script>
 <style lang="scss">
+.q-btn.disabled.customized-disabled-btn {
+  opacity: 1 !important;
+  cursor: default !important;
+}
 
+.q-btn.disabled.customized-disabled-btn * {
+  cursor: default !important;
+}
 </style>

frontend/src/components/dialog/VersionInput.vue

@@ -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>

frontend/src/layouts/MainLayout.vue

@@ -22,6 +22,8 @@
         <div v-if="isAdmin()">
           <EssentialLink v-for="link in adminLinks" :key="link.title" v-bind="link" />
         </div>
+        <EssentialLink v-for="link in domainLinks" :key="link.title" v-bind="link" />
+
       </q-list>
     </q-drawer>
 
@@ -90,58 +92,23 @@ const essentialLinks: EssentialLinkProps[] = [
   //   link:'https://cybozu.dev/ja/kintone/docs/',
   //   icon:'help_outline'
   // },
+];
+
+const domainLinks: EssentialLinkProps[] = [
+  {
+    title: 'ドメイン管理',
+    caption: 'kintoneのドメイン設定',
+    icon: 'domain',
+    link: '/#/domain',
+    target: '_self'
+  },
   // {
-  //   title:'',
-  //   isSeparator:true
+  //   title: 'ドメイン適用',
+  //   caption: 'ユーザー使用可能なドメインの設定',
+  //   icon: 'assignment_ind',
+  //   link: '/#/userDomain',
+  //   target: '_self'
   // },
-  // {
-  //   title: 'Docs',
-  //   caption: 'quasar.dev',
-  //   icon: 'school',
-  //   link: 'https://quasar.dev'
-  // },
-  // {
-  //   title: 'Icons',
-  //   caption: 'Material Icons',
-  //   icon: 'insert_emoticon',
-  //   link: 'https://fonts.google.com/icons?selected=Material+Icons:insert_emoticon:'
-  // },
-  // {
-  //   title: 'Github',
-  //   caption: 'github.com/quasarframework',
-  //   icon: 'code',
-  //   link: 'https://github.com/quasarframework'
-  // },
-  // {
-  //   title: 'Discord Chat Channel',
-  //   caption: 'chat.quasar.dev',
-  //   icon: 'chat',
-  //   link: 'https://chat.quasar.dev'
-  // },
-  // {
-  //   title: 'Forum',
-  //   caption: 'forum.quasar.dev',
-  //   icon: 'record_voice_over',
-  //   link: 'https://forum.quasar.dev'
-  // },
-  // {
-  //   title: 'Twitter',
-  //   caption: '@quasarframework',
-  //   icon: 'rss_feed',
-  //   link: 'https://twitter.quasar.dev'
-  // },
-  // {
-  //   title: 'Facebook',
-  //   caption: '@QuasarFramework',
-  //   icon: 'public',
-  //   link: 'https://facebook.quasar.dev'
-  // },
-  // {
-  //   title: 'Quasar Awesome',
-  //   caption: 'Community Quasar projects',
-  //   icon: 'favorite',
-  //   link: 'https://awesome.quasar.dev'
-  // }
 ];
 
 const adminLinks: EssentialLinkProps[] = [
@@ -152,20 +119,6 @@ const adminLinks: EssentialLinkProps[] = [
     link: '/#/user',
     target: '_self'
   },
-  {
-    title: 'ドメイン管理',
-    caption: 'kintoneのドメイン設定',
-    icon: 'domain',
-    link: '/#/domain',
-    target: '_self'
-  },
-  {
-    title: 'ドメイン適用',
-    caption: 'ユーザー使用可能なドメインの設定',
-    icon: 'assignment_ind',
-    link: '/#/userDomain',
-    target: '_self'
-  },
 ]
 
 const version = process.env.version;

frontend/src/pages/AppManagement.vue

@@ -16,7 +16,13 @@
           </template>
         </q-input>
       </template>
-
+      <template v-slot:body-cell-url="prop">
+        <q-td :props="prop">
+          <a :href="prop.row.url" target="_blank" :title="prop.row.name" >
+            {{ prop.row.url  }}
+          </a>
+        </q-td>
+      </template>
       <template v-slot:body-cell-actions="p">
         <q-td :props="p">
           <q-btn-group flat>
@@ -33,61 +39,85 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted, watch, reactive } from 'vue';
 import { api } from 'boot/axios';
 import { useAuthStore } from 'stores/useAuthStore';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { router } from 'src/router';
+import { date } from 'quasar'
+import { IManagedApp } from 'src/types/AppTypes';
+
+interface IAppDisplay{
+  id:string;
+  name:string;
+  url:string;
+  user:string;
+  version:string;
+  updatetime:string;
+}
 
 const authStore = useAuthStore();
+const numberStringSorting = (a: string, b: string) => parseInt(a, 10) - parseInt(b, 10);
 
 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: 'url', label: 'URL', field: 'url', align: 'left', sortable: true },
-  { name: 'user', label: 'ログイン名', field: 'user', align: 'left', },
-  { name: 'version', label: 'バージョン', field: 'version', align: 'left', },
+  { name: 'user', label: '最後更新者', field: 'user', align: 'left', sortable: true},
+  { name: 'updatetime', label: '最後更新日', field: 'updatetime', align: 'left', sortable: true},
+  { name: 'version', label: 'バージョン', field: 'version', align: 'left', sortable: true},
   { name: 'actions', label: '操作', field: 'actions' }
 ];
 
 const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 20 });
 const loading = ref(false);
 const filter = ref('');
-const rows = ref([]);
+const rows = ref<IAppDisplay[]>([]);
 const store = useFlowEditorStore();
 
-const tenantid = ref(authStore.currentDomain.id);
-
 const getApps = async () => {
   loading.value = true;
   const result = await api.get('api/apps');
-  rows.value = result.data.map((item) => {
-    return { id: item.appid, name: item.appname, url: item.domainurl, user: item.user.email, version: item.version }
-  });
+  rows.value = result.data.map((item: IManagedApp) => {
+    return {
+      id: item.appid,
+      name: item.appname,
+      url: `${item.domainurl}/k/${item.appid}`,
+      user: `${item.user.first_name} ${item.user.last_name}` ,
+      updatetime:date.formatDate(item.update_time, 'YYYY/MM/DD HH:mm'),
+      version: Number(item.version)
+    }
+  }).sort((a: IAppDisplay, b: IAppDisplay) => numberStringSorting(a.id, b.id)); // set default order
   loading.value = false;
 }
 
 onMounted(async () => {
+  authStore.setLeftMenu(false);
   await getApps();
-})
+});
+
+watch(() => authStore.currentDomain.id, async () => {
+  await getApps();
+});
 
 const addRow = () => {
   return
 }
 
-const removeRow = (row) => {
+const removeRow = (app:IAppDisplay) => {
   return
 }
 
-const showHistory = (row) => {
+const showHistory = (app:IAppDisplay) => {
   return
 }
 
-const editFlow = (row) => {
+const editFlow = (app:IAppDisplay) => {
   store.setApp({
-    appId: row.id,
-    name: row.name
+    appId: app.id,
+    name: app.name
   });
-  router.push('/FlowChart');
+  store.selectFlow(undefined);
+  router.push('/FlowChart/' + app.id);
 };
 </script>

frontend/src/pages/FlowChart.vue

@@ -3,11 +3,7 @@
     <q-layout container class="absolute-full shadow-2 rounded-borders">
       <div class="q-pa-sm q-gutter-sm  ">
         <q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
-          <div class="flex-center fixed-top app-selector">
-            <AppSelector />
-          </div>
-
-          <div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
+          <div class="flex-center absolute-full" style="padding:15px">
             <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
               <EventTree />
             </q-scroll-area>
@@ -18,6 +14,15 @@
             <q-space></q-space>
             <q-btn-dropdown color="primary" label="保存" icon="save" :loading="saveLoading" >
               <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-section avatar >
                     <q-icon name="save" color="primary"></q-icon>
@@ -42,8 +47,24 @@
       </div>
       <q-btn flat dense round
               :icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
-              :style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
+              :style="{'left': fixedLeftPosition}"
               @click="drawerLeft=!drawerLeft" class="expand" />
+      <q-breadcrumbs v-if="store.appInfo" class="fixed q-pl-md"
+              :style="{'left': fixedLeftPosition}">
+        <q-breadcrumbs-el icon="widgets" label="アプリ管理" to="/app" />
+        <q-breadcrumbs-el>
+          <template v-slot>
+            <a class="full-width" :href="!store.appInfo?'':`${authStore.currentDomain.kintoneUrl}/k/${store.appInfo?.appId}`" target="_blank" title="Kiontoneへ">
+              {{ store.appInfo?.name }}
+              <q-icon
+                class="q-ma-xs"
+                name="open_in_new"
+                color="grey-9"
+              />
+            </a>
+          </template>
+        </q-breadcrumbs-el>
+      </q-breadcrumbs>
       <div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
         <div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
           <node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
@@ -63,31 +84,46 @@
       </template>
       <action-select ref="appDg" name="model" :filter="filter"  type="single" @clearFilter="onClearFilter" ></action-select>
     </ShowDialog>
-
+    <!-- save version dialog -->
+    <ShowDialog v-model:visible="saveVersionAction" name="新バージョン保存" @close="closeSaveVersionDg" min-width="500px">
+      <version-input v-model="versionInfo" />
+    </ShowDialog>
+    <q-inner-loading
+      :showing="initLoading"
+      color="primary"
+      label="読み込み中..."
+    />
   </q-page>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
+import { IManagedApp, IVersionInfo } from 'src/types/AppTypes';
 import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { useAuthStore } from 'stores/useAuthStore';
+import { api } from 'boot/axios';
 
 import NodeItem from 'src/components/main/NodeItem.vue';
 import ShowDialog from 'components/ShowDialog.vue';
 import ActionSelect from 'components/ActionSelect.vue';
 import PropertyPanel from 'components/right/PropertyPanel.vue';
-import AppSelector from 'components/left/AppSelector.vue';
 import EventTree from 'components/left/EventTree.vue';
+import VersionInput from 'components/dialog/VersionInput.vue';
 import { FlowCtrl } from '../control/flowctrl';
 import { useQuasar } from 'quasar';
+
 const deployLoading = ref(false);
 const saveLoading = ref(false);
+const initLoading = ref(true);
 const drawerLeft = ref(false);
+const versionInfo = ref<IVersionInfo>();
 const $q = useQuasar();
 const store = useFlowEditorStore();
 const authStore = useAuthStore();
+const route = useRoute()
 
 const appDg = ref();
 const prevNodeIfo = ref({
@@ -96,6 +132,7 @@ const prevNodeIfo = ref({
 });
 // const refFlow = ref<ActionFlow|null>(null);
 const showAddAction = ref(false);
+const saveVersionAction = ref(false);
 const drawerRight = ref(false);
 const filter=ref("");
 const model = ref("");
@@ -111,6 +148,9 @@ const minPanelWidth=computed(()=>{
     return "300px";
   }
 });
+const fixedLeftPosition = computed(()=>{
+  return drawerLeft.value?"300px":"0px";
+});
 
 const addNode = (node: IActionNode, inputPoint: string) => {
   if (drawerRight.value) {
@@ -153,7 +193,7 @@ const onDeleteAllNextNodes = (node: IActionNode) => {
 }
 const closeDg = (val: any) => {
   console.log("Dialog closed->", val);
-  if (val == 'OK') {
+  if (val == 'OK' && appDg?.value?.selected?.length > 0) {
     const data = appDg.value.selected[0];
     const actionProps = JSON.parse(data.property);
     const outputPoint = JSON.parse(data.outputPoints);
@@ -221,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 targetFlow = store.selectedFlow;
   if (targetFlow === undefined) {
@@ -290,26 +344,35 @@ const onSaveAllFlow= async ()=>{
 }
 
 const fetchData = async () => {
+  initLoading.value = true;
+  if (store.appInfo === undefined && route?.params?.id !== undefined) {
+    const { appid, appname } = await fetchAppById(route.params.id as string);
+    store.setApp({
+      appId: appid,
+      name: appname
+    });
+  };
   await store.loadFlow();
+  initLoading.value = false
   drawerLeft.value = true;
 }
 
+const fetchAppById = async(id: string) => {
+  const result = await api.get('api/apps');
+  return result.data.find((item: IManagedApp) => item.appid === id ) as IManagedApp;
+}
+
 const onClearFilter=()=>{
   filter.value='';
 }
 
 onMounted(() => {
-  authStore.toggleLeftMenu();
+  authStore.setLeftMenu(false);
   fetchData();
 });
 </script>
 
 <style lang="scss">
-.app-selector {
-  padding: 15px;
-  z-index: 999;
-}
-
 .flowchart {
   padding-top: 10px;
 }

frontend/src/pages/TenantDomain.vue

@@ -155,7 +155,8 @@ let editId = ref(0);
 
 const getDomain = async () => {
   loading.value = true;
-  const result = await api.get(`api/domains/1`);
+  const userId = authStore.userId;
+  const result = await api.get(`api/domain?userId=${userId}`);
   rows.value = result.data.map((item) => {
     return { id: item.id, tenantid: item.tenantid, name: item.name, url: item.url, user: item.kintoneuser, password: item.kintonepwd }
   });

frontend/src/router/routes.ts

@@ -6,7 +6,7 @@ const routes: RouteRecordRaw[] = [
     component: () => import('pages/LoginPage.vue')
   },
   {
-    path:'/FlowChart',
+    path:'/FlowChart/:id',
     component:()=>import('layouts/MainLayout.vue'),
     children:[
       {path:'',component:()=>import('pages/FlowChart.vue')}
@@ -25,7 +25,7 @@ const routes: RouteRecordRaw[] = [
       // { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
       { path: 'right', component: () => import('pages/testRight.vue') },
       { path: 'domain', component: () => import('pages/TenantDomain.vue') },
-      { path: 'userdomain', component: () => import('pages/UserDomain.vue')},
+      // { path: 'userdomain', component: () => import('pages/UserDomain.vue')},
       { path: 'user', component: () => import('pages/UserManagement.vue')},
       { path: 'app', component: () => import('pages/AppManagement.vue')},
       { path: 'condition', component: () => import('pages/conditionPage.vue') }

frontend/src/stores/useAuthStore.ts

@@ -35,6 +35,9 @@ export const useAuthStore = defineStore('auth', {
     },
   },
   actions: {
+    setLeftMenu(value:boolean){
+      this.LeftDrawer=value;
+    },
     toggleLeftMenu() {
       this.LeftDrawer = !this.LeftDrawer;
     },
@@ -60,11 +63,12 @@ export const useAuthStore = defineStore('auth', {
       }
     },
     async getCurrentDomain(): Promise<IDomainInfo> {
-      const activedomain = await api.get(`api/activedomain`);
+      const resp = await api.get(`api/activedomain`);
+      const activedomain = resp?.data;
       return {
-        id: activedomain.data.id,
-        domainName: activedomain.data.name,
-        kintoneUrl: activedomain.data.url,
+        id: activedomain?.id,
+        domainName: activedomain?.name,
+        kintoneUrl: activedomain?.url,
       };
     },
     async getUserDomains(): Promise<IDomainInfo[]> {

frontend/src/types/AppTypes.ts

@@ -0,0 +1,20 @@
+interface IUser {
+  first_name: string;
+  last_name: string;
+  email: string;
+}
+
+export interface IManagedApp {
+  appid: string;
+  appname: string;
+  domainurl: string;
+  version: string;
+  user: IUser;
+  update_time: string;
+}
+
+export interface IVersionInfo {
+  id: string;
+  name?: string;
+  desc?: string;
+}