Skip to content

LITE-28607 Better representation of DB events (created, updated) in UI #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2023
Merged

LITE-28607 Better representation of DB events (created, updated) in UI #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/.
Expand Down
6 changes: 3 additions & 3 deletions dbaas/extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions dbaas/static/5e8a3053c924195caa3d.js → dbaas/static/c55edcf1aaed6138c34b.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...tatic/5e8a3053c924195caa3d.js.LICENSE.txt → ...tatic/c55edcf1aaed6138c34b.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dbaas/static/index.html
View file
Open in desktop
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>
2 changes: 1 addition & 1 deletion dbaas/static/main.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
818 changes: 432 additions & 386 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"

Expand Down
8 changes: 4 additions & 4 deletions ui/app/views/ItemDetails.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});
Expand Down
20 changes: 16 additions & 4 deletions ui/app/views/ItemDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}`;
},
},

Expand Down