From 10275e0339c7420e1e64f485f4f0747c7c4faa6a Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Thu, 26 Aug 2021 16:28:18 -0600 Subject: [PATCH 1/2] GH-1090 - move center align to table-row-container (#1099) * move center align to table-row-container * fix lint --- webapp/src/components/table/table.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webapp/src/components/table/table.scss b/webapp/src/components/table/table.scss index f9e89dfe9..00d591baa 100644 --- a/webapp/src/components/table/table.scss +++ b/webapp/src/components/table/table.scss @@ -93,7 +93,6 @@ font-size: 14px; position: relative; text-overflow: ellipsis; - align-items: center; &:hover { background-color: rgba(var(--center-channel-color-rgb), 0.05); @@ -197,6 +196,10 @@ .table-row-container { width: fit-content; + + .octo-table-cell { + align-items: center; + } } .octo-table-footer { From c3f59931260480aa7fcae07b4a9eabaf5453b509 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Thu, 26 Aug 2021 18:33:51 -0700 Subject: [PATCH 2/2] Fix #1106. Hydrate blocks on sync. (#1107) Co-authored-by: Scott Bishel --- webapp/src/wsclient.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/wsclient.ts b/webapp/src/wsclient.ts index bf574e33a..4972be640 100644 --- a/webapp/src/wsclient.ts +++ b/webapp/src/wsclient.ts @@ -2,6 +2,7 @@ // See LICENSE.txt for license information. import {Utils} from './utils' import {Block} from './blocks/block' +import {OctoUtils} from './octoUtils' // These are outgoing commands to the server type WSCommand = { @@ -232,7 +233,7 @@ class WSClient { private queueUpdateNotification(block: Block) { this.updatedBlocks = this.updatedBlocks.filter((o) => o.id !== block.id) // Remove existing queued update - this.updatedBlocks.push(block) + this.updatedBlocks.push(OctoUtils.hydrateBlock(block)) if (this.updateTimeout) { clearTimeout(this.updateTimeout) this.updateTimeout = undefined