Merge pull request #28 from cloudblue/fix/LITE-28607

LITE-28607 Better representation of DB events (created, updated) in UI
cloudblue · Sep 18, 2023 · 647c7d6 · 647c7d6
2 parents c4996dd + 5f8bc45
commit 647c7d6
Show file tree

Hide file tree

Showing 13 changed files with 468 additions and 407 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,4 +35,7 @@
   * Fixed radio buttons layout for Safari
   * Improved reliability of several UI pieces
 * 0.4.2: Backend dependencies are bumped and GitHub UI unit testing is fixed
-* 0.4.3: Backend dependencies are bumped
+* 0.4.3: Backend dependencies are bumped
+* 0.4.4:
+  * Better representation of DB events (created, updated) in UI
+  * Dependencies are bumped
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cloudblueconnect/connect-extension-runner:27.25
+FROM cloudblueconnect/connect-extension-runner:28.9
 
 COPY pyproject.toml /install_temp/.
 COPY poetry.* /install_temp/.

diff --git a/dbaas/extension.json b/dbaas/extension.json
@@ -1,9 +1,9 @@
 {
   "name": "DBaaS",
   "description": "On-demand provisioning of cloud-based database storages as a service.",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "audience": ["reseller", "distributor", "vendor"],
-  "readme_url": "https://github.com/cloudblue/connect-extension-dbaas/blob/0.4.3/README.md",
-  "changelog_url": "https://github.com/cloudblue/connect-extension-dbaas/blob/0.4.3/CHANGELOG.md",
+  "readme_url": "https://github.com/cloudblue/connect-extension-dbaas/blob/0.4.4/README.md",
+  "changelog_url": "https://github.com/cloudblue/connect-extension-dbaas/blob/0.4.4/CHANGELOG.md",
   "icon": "googleExtensionBaseline"
 }
diff --git a/dbaas/static/5e8a3053c924195caa3d.js → dbaas/static/c55edcf1aaed6138c34b.js b/dbaas/static/5e8a3053c924195caa3d.js → dbaas/static/c55edcf1aaed6138c34b.js
diff --git a/...tatic/5e8a3053c924195caa3d.js.LICENSE.txt → ...tatic/c55edcf1aaed6138c34b.js.LICENSE.txt b/...tatic/5e8a3053c924195caa3d.js.LICENSE.txt → ...tatic/c55edcf1aaed6138c34b.js.LICENSE.txt
diff --git a/dbaas/static/index.html b/dbaas/static/index.html
@@ -1 +1 @@
-<html><head><title>Lorem ipsum</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Mono:400,500|Material+Icons" rel="stylesheet"><link id="mock-favicon" rel="shortcut icon" href="#"><script defer="defer" src="5e8a3053c924195caa3d.js"></script><link href="main.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<html><head><title>Lorem ipsum</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Mono:400,500|Material+Icons" rel="stylesheet"><link id="mock-favicon" rel="shortcut icon" href="#"><script defer="defer" src="c55edcf1aaed6138c34b.js"></script><link href="main.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
diff --git a/dbaas/static/main.css b/dbaas/static/main.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudblueconnect/eaas-database-extension",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "On-demand provisioning of cloud-based database storages as a service.",
   "author": "Ingram Micro",
   "license": "Apache Software License 2.0",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ readme = "./README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-connect-eaas-core = ">=27.13,<28"
+connect-eaas-core = ">=28,<29"
 motor = "3.*"
 cryptography = "41.*"
 

diff --git a/ui/app/views/ItemDetails.spec.js b/ui/app/views/ItemDetails.spec.js
@@ -110,12 +110,12 @@ describe('ItemDetails', () => {
   });
 
   describe('#filters', () => {
-    describe('#ddmmyyyy', () => {
+    describe('#ddmmyyyy_HHMM', () => {
       it.each([
-        ['October 19, 1975 23:15:30 GMT+11:00', '19/10/1975'],
-        ['January 3, 2020 23:15:30 GMT+11:00', '03/01/2020'],
+        ['October 19, 1975 23:15:30 GMT+11:00', '19/10/1975 12:15'],
+        ['January 3, 2020 00:01:30 GMT-10:00', '03/01/2020 10:01'],
       ])('should format %j as %j', (d, f) => {
-        expect(cmp.filters.ddmmyyyy(new Date(d))).toBe(f);
+        expect(cmp.filters.ddmmyyyy_HHMM(new Date(d))).toBe(f);
       });
     });
   });

diff --git a/ui/app/views/ItemDetails.vue b/ui/app/views/ItemDetails.vue
@@ -85,11 +85,21 @@ div
 
         .item-row
           .item-label Created
-          .item-value {{ localItem.events.created.at | ddmmyyyy }}
+          .item-value
+            .detail-item
+              .detail-item__text {{ localItem.events.created.at | ddmmyyyy_HHMM }}
+              .detail-item__assistive-text(
+                v-if="localItem.events?.created?.by"
+              ) {{ localItem.events?.created?.by.name || localItem.events?.created?.by.id }}
 
         .item-row(v-if="localItem.events.updated")
           .item-label Updated
-          .item-value {{ localItem.events.updated.at | ddmmyyyy }}
+          .item-value
+            .detail-item
+              .detail-item__text {{ localItem.events.updated.at | ddmmyyyy_HHMM }}
+              .detail-item__assistive-text(
+                v-if="localItem.events?.updated?.by"
+              ) {{ localItem.events?.updated?.by.name || localItem.events?.updated?.by.id }}
 
       ui-card(title="Technical Contact")
         .detail-item
@@ -319,13 +329,15 @@ export default {
   },
 
   filters: {
-    ddmmyyyy: (dateString) => {
+    ddmmyyyy_HHMM: (dateString) => {
       const date = new Date(dateString);
       const dd = norm(date.getUTCDate());
       const mm = norm(date.getUTCMonth() + 1);
       const yyyy = date.getUTCFullYear();
+      const HH = norm(date.getUTCHours());
+      const MM = norm(date.getUTCMinutes());
 
-      return `${dd}/${mm}/${yyyy}`;
+      return `${dd}/${mm}/${yyyy} ${HH}:${MM}`;
     },
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<html><head><title>Lorem ipsum</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Roboto+Mono:400,500\|Material+Icons" rel="stylesheet"><link id="mock-favicon" rel="shortcut icon" href="#"><script defer="defer" src="5e8a3053c924195caa3d.js"></script><link href="main.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
		<html><head><title>Lorem ipsum</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Roboto+Mono:400,500\|Material+Icons" rel="stylesheet"><link id="mock-favicon" rel="shortcut icon" href="#"><script defer="defer" src="c55edcf1aaed6138c34b.js"></script><link href="main.css" rel="stylesheet"></head><body><div id="app"></div></body></html>