Merge branch 'master' of github.com:dmm-com/airone into feature/spanner

Author: syucream

.github/workflows/build-frontend.yml

@@ -51,6 +51,8 @@ jobs:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
       - name: build
         run: npm run build:development
+      - name: build(library)
+        run: npm run build:lib
   test:
     runs-on: ubuntu-latest
     permissions:

.github/workflows/release-pagoda-core.yml

@@ -0,0 +1,37 @@
+name: Release pagoda-core npm package for custom views to GitHub npm Registry
+
+on:
+  push:
+    tags:
+      # NOTE it should be pagoda-core-<major>.<minor>.<patch>
+      - 'pagoda-core-*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          registry-url: https://npm.pkg.github.com/
+          scope: "@dmm-com"
+      - name: Get tag name
+        id: get_tag
+        run: echo "tag=${GITHUB_REF#refs/tags/pagoda-core-}" >> $GITHUB_OUTPUT
+      - name: Set version
+        run: |
+          npm version "${GITHUB_REF#refs/tags/pagoda-core-}" --no-git-tag-version
+      - name: Install dependencies
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Build library
+        run: npm run build:lib
+      - name: Publish package
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -172,6 +172,7 @@ static_root
 node_modules
 static/js/ui.js*
 coverage
+frontend/dist
 
 # local django configuration
 airone/settings.py

CHANGELOG.md

@@ -3,14 +3,40 @@
 ## In development
 
 ### Added
-* Enable to pass general external parameters(`extendedGeneralParameters`) to React-UI
-  implementation via Django template.
-  Contributed by @userlocalhost, @hinashi
+* Introduced a new feature to identify Item using another names that are related with
+  specific Item (it is named as Alias).
+  Contributed by @hinashi, @userlocalhost
 
 ### Changed
 
 ### Fixed
 
+## v3.114.0
+
+### Fixed
+* Fixed not being able to cancel a job from the Job menu.
+  Contributed by @hinashi
+
+## v3.113.0
+
+### Fixed
+* Fix Elasticsearch update on entry deletion.
+  Contributed by @tsunoda-takahiro
+
+## v3.112.0
+
+### Fixed
+* Fixed problem that might raise ElasticsearchException depends on context by
+  SearchChain processing.
+  Contributed by @hinashi, @userlocalhost
+
+## v3.111.0
+
+### Added
+* Enable to pass general external parameters(`extendedGeneralParameters`) to React-UI
+  implementation via Django template.
+  Contributed by @userlocalhost, @hinashi
+
 ## v3.110.0
 
 ### Added

airone/lib/test.py

@@ -148,13 +148,6 @@ def add_entry(self, user: User, name: str, schema: Entity, values={}, is_public=
 
         return entry
 
-
-class AironeViewTest(AironeTestCase):
-    def setUp(self):
-        super(AironeViewTest, self).setUp()
-
-        self.client = Client()
-
     def _do_login(self, uname, is_superuser=False) -> User:
         # create test user to authenticate
         user = User(username=uname, is_superuser=is_superuser)
@@ -171,6 +164,13 @@ def admin_login(self) -> User:
     def guest_login(self, uname="guest") -> User:
         return self._do_login(uname)
 
+
+class AironeViewTest(AironeTestCase):
+    def setUp(self):
+        super(AironeViewTest, self).setUp()
+
+        self.client = Client()
+
     def open_fixture_file(self, fname):
         test_file_path = inspect.getfile(self.__class__)
         test_base_path = os.path.dirname(test_file_path)

airone/settings_common.py

@@ -276,7 +276,7 @@ class Common(Configuration):
 
     try:
         proc = subprocess.Popen(
-            "cd %s && git describe --tags" % BASE_DIR,
+            "cd %s && git tag --points-at | grep -v pagoda-core- | head -1" % BASE_DIR,
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,

api_v1/entry/serializer.py

@@ -302,15 +302,22 @@ def _do_forward_search(sub_query, sub_query_result):
             ]
 
             # get Entry informations from result
+            # NOTE: small limit(=1000) is workaround to prevent overload
             try:
                 search_result = AdvancedSearchService.search_entries(
-                    user, entity_id_list, hint_attrs, limit=99999
+                    user,
+                    entity_id_list,
+                    hint_attrs,
+                    limit=CONFIG.SEARCH_CHAIN_ACCEPTABLE_RESULT_COUNT,
                 )
             except Exception as e:
                 Logger.warning("Search Chain API error:%s" % e)
                 raise ElasticsearchException()
 
-            if search_result.ret_count > CONFIG.SEARCH_CHAIN_ACCEPTABLE_RESULT_COUNT:
+            # All results of this request would be joined and pass to next request. It might be
+            # huge request and leads to glitch of Elasticsearch by just a single request.
+            # This is our original curcit breaker to prevent overload because of them.
+            if len(search_result.ret_values) > CONFIG.SEARCH_CHAIN_ACCEPTABLE_RESULT_COUNT:
                 Logger.warning("Search Chain API error: SEARCH_CHAIN_ACCEPTABLE_RESULT_COUNT")
                 raise ElasticsearchException()
 

api_v1/tests/entry/test_api_search_chain.py

@@ -1,6 +1,6 @@
 import copy
 import json
-from unittest import mock
+from unittest import mock, skip
 
 from airone.lib.test import AironeViewTest
 from airone.lib.types import AttrType
@@ -1326,6 +1326,10 @@ def test_search_backward_chain_exceeding_search_limit(self):
             ),
         )
 
+    @skip("""
+    A situation that raises ElasticsearchException because of exceeding search count because of
+    installing workaround limitation cap won't be happened.
+    """)
     def test_search_chain_when_result_exceeds_acceptable_count(self):
         # Change configuration to test processing for acceptable result from elasticsearch
         ENTRY_CONFIG.conf["SEARCH_CHAIN_ACCEPTABLE_RESULT_COUNT"] = 2

api_v1/tests/test_api.py

@@ -338,6 +338,23 @@ def side_effect():
         # checking that CREATING flag is unset after finishing this processing
         self.assertFalse(entry.get_status(Entry.STATUS_CREATING))
 
+    def test_create_entry_when_duplicated_alias_exists(self):
+        user = self.guest_login()
+
+        model = self.create_entity(user, "Mountain")
+        item = self.add_entry(user, "Everest", model)
+        item.add_alias("Chomolungma")
+
+        # send request to try to create Item that has duplicated name with another Alias
+        params = {
+            "entity": model.name,
+            "name": "Chomolungma",
+            "attrs": {},
+        }
+        resp = self.client.post("/api/v1/entry", json.dumps(params), "application/json")
+        self.assertEqual(resp.status_code, 400)
+        self.assertEqual(resp.json(), {"result": "Duplicate named Alias is existed"})
+
     def test_post_entry_with_invalid_params(self):
         admin = self.admin_login()
 
@@ -395,6 +412,7 @@ def test_post_entry_with_invalid_params(self):
         # is created at the last request to create 'valid-entry'.
         params = {"name": "valid-entry", "entity": entity.name, "attrs": {"ref": "r-1"}}
         resp = self.client.post("/api/v1/entry", json.dumps(params), "application/json")
+        print("[onix-test] resp: %s" % str(resp.content.decode("utf-8")))
         self.assertEqual(resp.status_code, 200)
 
         entry = Entry.objects.get(schema=entity, name="valid-entry")

api_v1/views.py

@@ -77,16 +77,30 @@ def _update_entry_name(entry):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
+            # Get target Item from ID
             entry = Entry.objects.get(id=sel.validated_data["id"])
+
+            # Check user has permission to update this Item
             if not request.user.has_permission(entry, ACLType.Writable):
                 return Response(
                     {"result": "Permission denied to update entry"},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
+
+            # Abort updating processing when duplicated named Alias exists
+            if not sel.validated_data["entity"].is_available(
+                sel.validated_data["name"], [entry.id]
+            ):
+                return Response(
+                    {"result": "Duplicate named Alias is existed"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
             will_notify_update_entry = _update_entry_name(entry)
 
         elif Entry.objects.filter(**entry_condition).exists():
             entry = Entry.objects.get(**entry_condition)
+
             if not request.user.has_permission(entry, ACLType.Writable):
                 return Response(
                     {"result": "Permission denied to update entry"},
@@ -95,6 +109,13 @@ def _update_entry_name(entry):
             will_notify_update_entry = _update_entry_name(entry)
 
         else:
+            # Abort creating Item when duplicated named Alias exists
+            if not sel.validated_data["entity"].is_available(entry_condition["name"]):
+                return Response(
+                    {"result": "Duplicate named Alias is existed"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
             # This is the processing just in case for safety not to create duplicate Entries
             # when multiple requests passed through existance check. Even through multiple
             # requests coming here, Django prevents from creating multiple Entries.

apiclient/typescript-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmm-com/airone-apiclient-typescript-fetch",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "AirOne APIv2 client in TypeScript",
   "main": "src/autogenerated/index.ts",
   "scripts": {