diff --git a/apiserver/plane/api/serializers/cycle.py b/apiserver/plane/api/serializers/cycle.py index 1abd63b7f..664368033 100644 --- a/apiserver/plane/api/serializers/cycle.py +++ b/apiserver/plane/api/serializers/cycle.py @@ -14,6 +14,11 @@ from plane.db.models import Cycle, CycleIssue, CycleFavorite class CycleWriteSerializer(BaseSerializer): + def validate(self, data): + if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None): + raise serializers.ValidationError("Start date cannot exceed end date") + return data + class Meta: model = Cycle fields = "__all__" @@ -35,6 +40,11 @@ class CycleSerializer(BaseSerializer): started_estimates = serializers.IntegerField(read_only=True) workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace") project_detail = ProjectLiteSerializer(read_only=True, source="project") + + def validate(self, data): + if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None): + raise serializers.ValidationError("Start date cannot exceed end date") + return data def get_assignees(self, obj): members = [ diff --git a/apiserver/plane/api/serializers/module.py b/apiserver/plane/api/serializers/module.py index a82a0f39f..aaabd4ae0 100644 --- a/apiserver/plane/api/serializers/module.py +++ b/apiserver/plane/api/serializers/module.py @@ -40,6 +40,11 @@ class ModuleWriteSerializer(BaseSerializer): "updated_at", ] + def validate(self, data): + if data.get("start_date", None) is not None and data.get("target_date", None) is not None and data.get("start_date", None) > data.get("target_date", None): + raise serializers.ValidationError("Start date cannot exceed target date") + return data + def create(self, validated_data): members = validated_data.pop("members_list", None) diff --git a/apps/app/constants/workspace.ts b/apps/app/constants/workspace.ts index eeb5e2730..0683e39af 100644 --- a/apps/app/constants/workspace.ts +++ b/apps/app/constants/workspace.ts @@ -1,9 +1,9 @@ // services images import GithubLogo from "public/services/github.png"; import JiraLogo from "public/services/jira.png"; -import CSVLogo from "public/services/csv.png"; -import ExcelLogo from "public/services/excel.png"; -import JSONLogo from "public/services/json.png"; +import CSVLogo from "public/services/csv.svg"; +import ExcelLogo from "public/services/excel.svg"; +import JSONLogo from "public/services/json.svg"; export const ROLE = { 5: "Guest", diff --git a/apps/app/public/services/csv.png b/apps/app/public/services/csv.png deleted file mode 100644 index 3c35eb9f7..000000000 Binary files a/apps/app/public/services/csv.png and /dev/null differ diff --git a/apps/app/public/services/csv.svg b/apps/app/public/services/csv.svg new file mode 100644 index 000000000..adea1ddc9 --- /dev/null +++ b/apps/app/public/services/csv.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apps/app/public/services/excel.png b/apps/app/public/services/excel.png deleted file mode 100644 index d271880f6..000000000 Binary files a/apps/app/public/services/excel.png and /dev/null differ diff --git a/apps/app/public/services/excel.svg b/apps/app/public/services/excel.svg new file mode 100644 index 000000000..86fb8e64b --- /dev/null +++ b/apps/app/public/services/excel.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/apps/app/public/services/json.png b/apps/app/public/services/json.png deleted file mode 100644 index a5d0dfd22..000000000 Binary files a/apps/app/public/services/json.png and /dev/null differ diff --git a/apps/app/public/services/json.svg b/apps/app/public/services/json.svg new file mode 100644 index 000000000..4c2df2222 --- /dev/null +++ b/apps/app/public/services/json.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + +