Skip to content

Commit

Permalink
Merge branch 'preview' into feat-home-widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
sangeethailango authored Jan 3, 2025
2 parents e6d68ee + e4f9d02 commit 7a2577a
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 4 deletions.
120 changes: 120 additions & 0 deletions apiserver/plane/db/migrations/0089_workspacehomepreference_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
# Generated by Django 4.2.17 on 2025-01-02 07:47

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import uuid


class Migration(migrations.Migration):

dependencies = [
("db", "0088_sticky_sort_order_workspaceuserlink"),
]

operations = [
migrations.CreateModel(
name="WorkspaceHomePreference",
fields=[
(
"created_at",
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
),
(
"updated_at",
models.DateTimeField(
auto_now=True, verbose_name="Last Modified At"
),
),
(
"deleted_at",
models.DateTimeField(
blank=True, null=True, verbose_name="Deleted At"
),
),
(
"id",
models.UUIDField(
db_index=True,
default=uuid.uuid4,
editable=False,
primary_key=True,
serialize=False,
unique=True,
),
),
("key", models.CharField(max_length=255)),
("is_enabled", models.BooleanField(default=True)),
("config", models.JSONField(default=dict)),
(
"created_by",
models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="%(class)s_created_by",
to=settings.AUTH_USER_MODEL,
verbose_name="Created By",
),
),
(
"updated_by",
models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="%(class)s_updated_by",
to=settings.AUTH_USER_MODEL,
verbose_name="Last Modified By",
),
),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="workspace_user_home_preferences",
to=settings.AUTH_USER_MODEL,
),
),
(
"workspace",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="workspace_user_home_preferences",
to="db.workspace",
),
),
],
options={
"verbose_name": "Workspace Home Preference",
"verbose_name_plural": "Workspace Home Preferences",
"db_table": "workspace_home_preferences",
"ordering": ("-created_at",),
},
),
migrations.AddConstraint(
model_name="workspacehomepreference",
constraint=models.UniqueConstraint(
condition=models.Q(("deleted_at__isnull", True)),
fields=("workspace", "user", "key"),
name="workspace_user_home_preferences_unique_workspace_user_key_when_deleted_at_null",
),
),
migrations.AlterUniqueTogether(
name="workspacehomepreference",
unique_together={("workspace", "user", "key", "deleted_at")},
),
migrations.AlterField(
model_name="page",
name="name",
field=models.TextField(blank=True),
),
migrations.AlterField(
model_name="sticky",
name="name",
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name='workspacehomepreference',
name='sort_order',
field=models.PositiveIntegerField(default=65535),
),
]
2 changes: 1 addition & 1 deletion apiserver/plane/db/models/page.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Page(BaseModel):
workspace = models.ForeignKey(
"db.Workspace", on_delete=models.CASCADE, related_name="pages"
)
name = models.CharField(max_length=255, blank=True)
name = models.TextField(blank=True)
description = models.JSONField(default=dict, blank=True)
description_binary = models.BinaryField(null=True)
description_html = models.TextField(blank=True, default="<p></p>")
Expand Down
2 changes: 1 addition & 1 deletion apiserver/plane/db/models/sticky.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


class Sticky(BaseModel):
name = models.TextField()
name = models.TextField(null=True, blank=True)

description = models.JSONField(blank=True, default=dict)
description_html = models.TextField(blank=True, default="<p></p>")
Expand Down
2 changes: 1 addition & 1 deletion apiserver/plane/db/models/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,4 @@ class Meta:
ordering = ("-created_at",)

def __str__(self):
return f"{self.workspace.id} {self.url}"
return f"{self.workspace.id} {self.url}"
1 change: 1 addition & 0 deletions packages/types/src/charts.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export type TStackedBarChartProps<K extends string, T extends string> = {
export type TreeMapItem = {
name: string;
value: number;
label?: string;
textClassName?: string;
icon?: React.ReactElement;
} & (
Expand Down
4 changes: 3 additions & 1 deletion web/core/components/core/charts/tree-map/map-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const CustomTreeMapContent = ({
height,
name,
value,
label,
fillColor,
fillClassName,
textClassName,
Expand Down Expand Up @@ -109,10 +110,11 @@ export const CustomTreeMapContent = ({
x={pX + TEXT_PADDING_LEFT}
y={pY + pHeight - TEXT_PADDING_LEFT}
textAnchor="start"
className={cn("text-xs", textClassName || "text-custom-text-300")}
className={cn("text-xs font-light tracking-wider", textClassName || "text-custom-text-300")}
fill="currentColor"
>
{value?.toLocaleString()}
{label && ` ${label}`}
</text>
</g>
);
Expand Down

0 comments on commit 7a2577a

Please sign in to comment.