From 780d06220a206c0990d70e1062c9788018b03edc Mon Sep 17 00:00:00 2001 From: Nichollette Date: Fri, 10 Nov 2023 13:32:29 -0500 Subject: [PATCH 01/16] upgraded controller tests to check last_updated date, checked with fourmat --- src/tests/test_controller.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/tests/test_controller.py b/src/tests/test_controller.py index bd9d95f7..ea8c0be8 100644 --- a/src/tests/test_controller.py +++ b/src/tests/test_controller.py @@ -4,7 +4,7 @@ import json import os import time -from datetime import datetime, timezone +from datetime import datetime, timedelta, timezone import elasticsearch import pytest @@ -380,6 +380,10 @@ def test_refresh_status(): assert mygene.webdoc.timestamp > datetime(2020, 1, 1) _ts0 = mygene.webdoc.timestamp + original_last_updated = mygene.last_updated.replace(microsecond=0, tzinfo=None) + one_hour_before = (datetime.now() - timedelta(hours=1)).replace(microsecond=0) + assert original_last_updated > one_hour_before + mygene.save() refresh() @@ -393,9 +397,15 @@ def test_refresh_status(): assert "components" in mygene assert mygene.webdoc.timestamp > _ts0 + current_last_updated = mygene.last_updated.replace(microsecond=0, tzinfo=None) + assert current_last_updated == original_last_updated + mygene.save() refresh() + # confirm last_updated is not changed after refresh + assert mygene.last_updated.replace(microsecond=0, tzinfo=None) == current_last_updated + mygene_doc = SmartAPIDoc.get(MYGENE_ID) assert mygene_doc._status.refresh_status == 200 assert "components" in mygene_doc @@ -408,6 +418,9 @@ def test_refresh_status(): mygene.save() refresh() + # confirm last_updated is not changed after refresh + assert mygene.last_updated.replace(microsecond=0, tzinfo=None) == current_last_updated + mygene_doc = SmartAPIDoc.get(MYGENE_ID) assert mygene_doc._status.refresh_status == 404 assert "components" in mygene_doc @@ -432,6 +445,9 @@ def test_refresh_status(): mygene.save() refresh() + # confirm last_updated is not changed after refresh + assert mygene.last_updated.replace(microsecond=0, tzinfo=None) == current_last_updated + mygene_doc = SmartAPIDoc.get(MYGENE_ID) assert mygene_doc._status.refresh_status == 499 assert "components" in mygene_doc From ec8525f897a9c0ec98c4602cd1b6024b03ffd897 Mon Sep 17 00:00:00 2001 From: Nichollette Date: Fri, 10 Nov 2023 13:33:13 -0500 Subject: [PATCH 02/16] simple fix for last_updated setting --- src/controller/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controller/base.py b/src/controller/base.py index 553f5531..f2e688ac 100644 --- a/src/controller/base.py +++ b/src/controller/base.py @@ -377,4 +377,4 @@ def update(self, content): self._status = self.STATUS.NOT_MODIFIED.value else: # raw field changed self._status = self.STATUS.UPDATED.value - self._entity.raw = content.raw + self._entity.raw = content.raw From 8c78e11b46533aba2554a0a30650ddfd19d9d48b Mon Sep 17 00:00:00 2001 From: Marco Cano Date: Thu, 8 Feb 2024 13:13:26 -0800 Subject: [PATCH 03/16] feat: :sparkles: metakg overview --- web-app/src/assets/app.css | 4 +- web-app/src/components/EntityPill.vue | 29 +++++++++- web-app/src/components/RegistryItem.vue | 14 +++++ web-app/src/components/RegistryMetaKG.vue | 70 +++++++++++++++++++---- web-app/src/components/SimpleNetwork.vue | 58 ++++++++++++++++++- 5 files changed, 157 insertions(+), 18 deletions(-) diff --git a/web-app/src/assets/app.css b/web-app/src/assets/app.css index 52f22e56..9433acce 100644 --- a/web-app/src/assets/app.css +++ b/web-app/src/assets/app.css @@ -511,10 +511,10 @@ a.middle-indicator-text { .clearButtonSmall { background-color: rgba(255, 255, 255, 0.1); padding: 3px 5px; - border: solid rgb(250, 109, 0) 2px; + border: solid rgb(158, 0, 250) 2px; border-radius: 10px; text-decoration: none; - color: rgb(250, 109, 0); + color: rgb(187, 0, 250); font-size: 0.9em; font-weight: light; font-variant: small-caps; diff --git a/web-app/src/components/EntityPill.vue b/web-app/src/components/EntityPill.vue index aa96f3bf..2c6f4291 100644 --- a/web-app/src/components/EntityPill.vue +++ b/web-app/src/components/EntityPill.vue @@ -6,7 +6,17 @@
    -
  • {{ item }}
    • +
  • {{ item }}
    • +
  • + See All ({{ subjects.length }}) +
@@ -17,13 +27,28 @@ export default { name: 'EntityPill', data: function () { return { - badgeID: Math.floor(Math.random() * 90000) + 10000 + badgeID: Math.floor(Math.random() * 90000) + 10000, + limit: 7 }; }, props: ['object', 'subjects'], computed: { color: function () { return this.$store.getters.getEntityColor(this.object); + }, + subjects_viewed: function () { + if (this.subjects.length < this.limit) { + return this.subjects; + } else { + return this.subjects.slice(0, this.limit); + } + }, + viewingAll: function () { + if (this.subjects.length <= this.limit) { + return true; + } else { + return false; + } } } }; diff --git a/web-app/src/components/RegistryItem.vue b/web-app/src/components/RegistryItem.vue index 83366b4b..d4cd599e 100644 --- a/web-app/src/components/RegistryItem.vue +++ b/web-app/src/components/RegistryItem.vue @@ -47,6 +47,20 @@ + + MetaKG + +