Skip to content

More perf improvements #134

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 9 commits into from
Dec 22, 2022
Merged

More perf improvements #134

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d2403d
perf: reduce the number of REST API calls
fioan89 Dec 22, 2022
4927e41
fix: map "darwin" agents as macOS
fioan89 Dec 22, 2022
db7e351
fix: display unsupported OS message only when workspace is running
fioan89 Dec 22, 2022
1793f91
fix: don't wait for icons to be loaded
fioan89 Dec 22, 2022
72f30f0
impl: sort table by workspace name, template name or status
fioan89 Dec 22, 2022
8707ce7
fix: same font size for row like in the header
fioan89 Dec 22, 2022
1ea9ff4
impl: request a new toke when old one is expired
fioan89 Dec 22, 2022
e1bcd86
fix: show status color for sorted row
fioan89 Dec 22, 2022
592892c
chore: upgrade Coder max supported version to 0.13.6
fioan89 Dec 22, 2022
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
Prev Previous commit
Next Next commit
fix: same font size for row like in the header 
- resolves #132
  • Loading branch information
@fioan89
fioan89 committed Dec 22, 2022
commit 8707ce7ce9bcb66ba200e528dd1f600a7d7464cc
34 changes: 18 additions & 16 deletions src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
import com.intellij.ui.AnActionButton
import com.intellij.ui.AppIcon
import com.intellij.ui.JBColor
import com.intellij.ui.RelativeFont
import com.intellij.ui.ToolbarDecorator
import com.intellij.ui.components.JBTextField
import com.intellij.ui.components.dialog
Expand Down Expand Up @@ -643,20 +644,20 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :

override fun getTableCellRendererComponent(table: JTable?, value: Any?, selected: Boolean, focus: Boolean, row: Int, column: Int): Component {
super.getTableCellRendererComponent(table, value, selected, focus, row, column).apply {
border = JBUI.Borders.empty(10)
border = JBUI.Borders.empty(8, 8)
}
return this
}
}
}
}

private class WorkspaceNameColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
private inner class WorkspaceNameColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
override fun valueOf(workspace: WorkspaceAgentModel?): String? {
return workspace?.name
}

override fun getComparator(): Comparator<WorkspaceAgentModel>? {
override fun getComparator(): Comparator<WorkspaceAgentModel> {
return Comparator { a, b ->
if (a === b) 0
if (a == null) -1
Expand All @@ -673,20 +674,21 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
if (value is String) {
text = value
}
font = JBFont.h3().asBold()
border = JBUI.Borders.empty()

font = RelativeFont.BOLD.derive(this@CoderWorkspacesStepView.tableOfWorkspaces.tableHeader.font)
border = JBUI.Borders.empty(0, 8)
return this
}
}
}
}

private class WorkspaceTemplateNameColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
private inner class WorkspaceTemplateNameColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
override fun valueOf(workspace: WorkspaceAgentModel?): String? {
return workspace?.templateName
}

override fun getComparator(): java.util.Comparator<WorkspaceAgentModel>? {
override fun getComparator(): java.util.Comparator<WorkspaceAgentModel> {
return Comparator { a, b ->
if (a === b) 0
if (a == null) -1
Expand All @@ -697,7 +699,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
}

override fun getRenderer(item: WorkspaceAgentModel?): TableCellRenderer {
val simpleH3 = JBFont.h3()
val simpleH3 = this@CoderWorkspacesStepView.tableOfWorkspaces.tableHeader.font

val h3AttributesWithUnderlining = simpleH3.attributes as MutableMap<TextAttribute, Any>
h3AttributesWithUnderlining[TextAttribute.UNDERLINE] = UNDERLINE_ON
Expand All @@ -708,7 +710,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
if (value is String) {
text = value
}
border = JBUI.Borders.empty()
border = JBUI.Borders.empty(0, 8)

if (table.getClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW) != null) {
val mouseOverRow = table.getClientProperty(MOUSE_OVER_TEMPLATE_NAME_COLUMN_ON_ROW) as Int
Expand All @@ -724,7 +726,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
}
}

private class WorkspaceVersionColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
private inner class WorkspaceVersionColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
override fun valueOf(workspace: WorkspaceAgentModel?): String? {
return workspace?.status?.label
}
Expand All @@ -736,20 +738,20 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
if (value is String) {
text = value
}
font = JBFont.h3()
border = JBUI.Borders.empty()
font = this@CoderWorkspacesStepView.tableOfWorkspaces.tableHeader.font
border = JBUI.Borders.empty(0, 8)
return this
}
}
}
}

private class WorkspaceStatusColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
private inner class WorkspaceStatusColumnInfo(columnName: String) : ColumnInfo<WorkspaceAgentModel, String>(columnName) {
override fun valueOf(workspace: WorkspaceAgentModel?): String? {
return workspace?.agentStatus?.label
}

override fun getComparator(): java.util.Comparator<WorkspaceAgentModel>? {
override fun getComparator(): java.util.Comparator<WorkspaceAgentModel> {
return Comparator { a, b ->
if (a === b) 0
if (a == null) -1
Expand All @@ -766,8 +768,8 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
if (value is String) {
text = value
}
font = JBFont.h3()
border = JBUI.Borders.empty()
font = this@CoderWorkspacesStepView.tableOfWorkspaces.tableHeader.font
border = JBUI.Borders.empty(0, 8)
foreground = (table.model as ListTableModel<WorkspaceAgentModel>).getRowValue(row).statusColor()
return this
}
Expand Down