update

Weko dev team · Weko dev team · commit bbf54189b64e · 2025-11-21T05:13:13.000-05:00
diff --git a/docker-compose2.yml b/docker-compose2.yml
@@ -69,8 +69,8 @@ services:
       - INVENIO_ROLE_CONTRIBUTOR=Contributor
       - INVENIO_ROLE_COMMUNITY=Community Administrator
       # production or development
-      - FLASK_ENV=development
-      # - FLASK_ENV=production
+      # - FLASK_ENV=development
+      - FLASK_ENV=production
       # - FLASK_DEBUG=True
       - SEARCH_INDEX_PREFIX=tenant1
       #- INVENIO_DB_POOL_CLASS=QueuePool
@@ -381,6 +381,8 @@ services:
       resources:
         limits:
           memory: 300m
+    environment:
+      - NODE_TLS_REJECT_UNAUTHORIZED=0
     extra_hosts:
       - ams.ir.rcos.nii.ac.jp:127.0.0.1
 
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/views/server.py b/modules/invenio-oauth2server/invenio_oauth2server/views/server.py
@@ -120,6 +120,7 @@ def access_token():
     # Return None or a dictionary. Dictionary will be merged with token
     # returned to the client requesting the access token.
     # Response is in application/json
+    
     return None
 
 
diff --git a/modules/weko-search-ui/weko_search_ui/utils.py b/modules/weko-search-ui/weko_search_ui/utils.py
@@ -921,10 +921,14 @@ def check_jsonld_import_items(
                 .format(item_type.item_type_name.name)
             )
 
+        _json_ld = {}
         with open(f"{data_path}/{json_name}", "r") as f:
-            json_ld = json.load(f)
+            _json_ld = json.load(f)
         mapper.data_path = data_path
+        # Temporary fix for pipe character
+        json_ld = json.loads((json.dumps(_json_ld, ensure_ascii=False)).replace("|", "｜"))
         item_metadatas, _ = mapper.to_item_metadata(json_ld)
+        
         list_record = [
             {
                 "$schema": f"/items/jsonschema/{item_type.id}",
diff --git a/modules/weko-swordserver/weko_swordserver/views.py b/modules/weko-swordserver/weko_swordserver/views.py
@@ -467,7 +467,7 @@ def process_item(item, request_info):
 @oauth2.require_oauth()
 @limiter.limit("")
 @require_oauth_scopes(write_scope.id, actions_scope.id)
-@require_oauth_scopes(item_update_scope.id)
+# @require_oauth_scopes(item_update_scope.id)
 @roles_required(WEKO_SWORDSERVER_DEPOSIT_ROLE_ENABLE)
 @check_on_behalf_of()
 @check_package_contents()
diff --git a/nginx/ams/weko-frontend/components/common/Footer.vue b/nginx/ams/weko-frontend/components/common/Footer.vue
@@ -23,11 +23,13 @@
               <span>FAQ</span>
             </NuxtLink>
           </li> -->
+          <!--
           <li class="cursor-pointer">
             <NuxtLink class="underline" to="" event="" @click="throughDblClick(`${appConf.amsPath ?? ''}/contact`)">
               <span>CONTACT</span>
             </NuxtLink>
           </li>
+          -->
         </ul>
         <ul class="text-white text-sm">
           <!-- <li class="mb-1.5">
diff --git a/nginx/ams/weko-frontend/nuxt.config.ts b/nginx/ams/weko-frontend/nuxt.config.ts
@@ -20,7 +20,7 @@ export default defineNuxtConfig({
     buildAssetsDir: '/ams/_nuxt/',
     head: {
       htmlAttrs: { lang: 'ja' },
-      title: 'AMS-alpha',
+      title: 'Mebyo Data Catalog DB',
       meta: [
         { charset: 'utf-8' },
         { name: 'keywords', content: '' },
@@ -45,7 +45,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       clientId: 'KVKymVW0sVb8nFSXqCgS96UjbZ9ZhreyT0Nt2VxB',
-      redirectURI: 'http://ams.ir.rcos.nii.ac.jp/',
+      redirectURI: 'https://ams.ir.rcos.nii.ac.jp/',
       apiTimeout: 10000, // api response timeout (ms)
       tokenRefreshLimit: 600, // refresh access token before time (s)
       contact: {
diff --git a/nginx/ams/weko-frontend/package-lock.json b/nginx/ams/weko-frontend/package-lock.json
diff --git a/nginx/ams/weko-frontend/package.json b/nginx/ams/weko-frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ams-alpha",
+  "name": "mebyo-data-catalog-db",
   "private": true,
   "scripts": {
     "dev": "nuxt dev",
diff --git a/nginx/ams/weko-frontend/pages/ams/login.vue b/nginx/ams/weko-frontend/pages/ams/login.vue
@@ -2,7 +2,10 @@
   <div class="relative flex flex-col justify-center h-screen bg-miby-dark-blue">
     <div class="w-full m-auto mb-5 flex justify-center cursor-pointer">
       <NuxtLink to="" event="" @click="throughDblClick">
+        <!--
         <img class="scale-150" :src="`${appConf.amsImage ?? '/img'}/logo/logo_w.svg`" alt="AMS Logo" />
+        -->
+        <h1 class="text-5xl text-center font-medium text-white">Mebyo Data Catalog DB</h1>
       </NuxtLink>
     </div>
     <div
diff --git a/nginx/ams/weko-frontend/pages/ams/logout.vue b/nginx/ams/weko-frontend/pages/ams/logout.vue
@@ -2,7 +2,10 @@
   <div class="relative flex flex-col justify-center h-screen bg-miby-dark-blue">
     <div class="w-full m-auto mb-5 flex justify-center cursor-pointer">
       <NuxtLink to="" event="" @click="throughDblClick">
+        <!--
         <img class="scale-150" :src="`${appConf.amsImage ?? '/img'}/logo/logo_w.svg`" alt="AMS Logo" />
+        -->
+        <h1 class="text-5xl text-center font-medium text-white">Mebyo Data Catalog DB</h1>
       </NuxtLink>
     </div>
     <div
diff --git a/nginx/ams/weko-frontend/server/api/ams/captcha/[id]/request-mail.post.ts b/nginx/ams/weko-frontend/server/api/ams/captcha/[id]/request-mail.post.ts
@@ -1,6 +1,5 @@
 export default defineEventHandler(async (event) => {
   // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // NOTE: オレオレ証明書を使用している場合は有効にする
-
   const params = event.context.params;
   if (!params || !params.id) {
     throw createError({
diff --git a/scripts/demo/ams/item_type.sql b/scripts/demo/ams/item_type.sql
diff --git a/scripts/demo/ams/item_type_mapping.sql b/scripts/demo/ams/item_type_mapping.sql
diff --git a/scripts/demo/ams/item_type_name.sql b/scripts/demo/ams/item_type_name.sql
@@ -21,7 +21,7 @@ SET row_security = off;
 --
 
 INSERT INTO public.item_type_name (created, updated, id, name, has_site_license, is_active) VALUES
-('2025-02-25 04:05:58.871334', '2025-02-25 04:05:58.871341', 51000, '未病アイテムタイプ', true, true)
+('2025-02-25 04:05:58.871334', '2025-02-25 04:05:58.871341', 32001, '未病アイテムタイプ', true, true)
 ON CONFLICT (id) DO UPDATE SET
   created = EXCLUDED.created,
   updated = EXCLUDED.updated,
diff --git a/scripts/demo/ams/jsonld_mappings.sql b/scripts/demo/ams/jsonld_mappings.sql
diff --git a/scripts/demo/ams/rocrate_mapping.sql b/scripts/demo/ams/rocrate_mapping.sql

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "ams-alpha",`
	`2`	`+ "name": "mebyo-data-catalog-db",`
`3`	`3`	`"private": true,`
`4`	`4`	`"scripts": {`
`5`	`5`	`"dev": "nuxt dev",`