feat(GoalAchievement): add remove criteria action

fix(GoalAchievement): review comments fix(GoalSuggesstions): add query limit results
taskany-inc · Jun 16, 2023 · 95e73f5 · 95e73f5
1 parent 5bce0e0
commit 95e73f5
Show file tree

Hide file tree

Showing 21 changed files with 821 additions and 596 deletions.
diff --git a/.../migrations/20230613115108_/migration.sql → .../migrations/20230616115656_/migration.sql b/.../migrations/20230613115108_/migration.sql → .../migrations/20230616115656_/migration.sql
@@ -1,7 +1,7 @@
 -- CreateTable
 CREATE TABLE "GoalAchiveCriteria" (
     "id" TEXT NOT NULL,
-    "linkedGoalId" TEXT NOT NULL,
+    "goalId" TEXT NOT NULL,
     "goalIdAsCriteria" TEXT,
     "title" TEXT NOT NULL,
     "weight" INTEGER NOT NULL,
@@ -20,10 +20,10 @@ CREATE UNIQUE INDEX "GoalAchiveCriteria_goalIdAsCriteria_key" ON "GoalAchiveCrit
 CREATE INDEX "GoalAchiveCriteria_title_idx" ON "GoalAchiveCriteria"("title");
 
 -- CreateIndex
-CREATE INDEX "GoalAchiveCriteria_linkedGoalId_idx" ON "GoalAchiveCriteria"("linkedGoalId");
+CREATE INDEX "GoalAchiveCriteria_goalId_idx" ON "GoalAchiveCriteria"("goalId");
 
 -- AddForeignKey
-ALTER TABLE "GoalAchiveCriteria" ADD CONSTRAINT "GoalAchiveCriteria_linkedGoalId_fkey" FOREIGN KEY ("linkedGoalId") REFERENCES "Goal"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "GoalAchiveCriteria" ADD CONSTRAINT "GoalAchiveCriteria_goalId_fkey" FOREIGN KEY ("goalId") REFERENCES "Goal"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "GoalAchiveCriteria" ADD CONSTRAINT "GoalAchiveCriteria_goalIdAsCriteria_fkey" FOREIGN KEY ("goalIdAsCriteria") REFERENCES "Goal"("id") ON DELETE SET NULL ON UPDATE CASCADE;

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -352,8 +352,8 @@ model GoalHistory {
 
 model GoalAchiveCriteria {
   id               String   @id @default(cuid())
-  linkedGoal       Goal     @relation("GoalCriterion", fields: [linkedGoalId], references: [id])
-  linkedGoalId     String
+  goal             Goal     @relation("GoalCriterion", fields: [goalId], references: [id])
+  goalId           String
   goalAsCriteria   Goal?    @relation("GoalAsCriteria", fields: [goalIdAsCriteria], references: [id])
   goalIdAsCriteria String?  @unique
   title            String
@@ -366,5 +366,5 @@ model GoalAchiveCriteria {
   updatedAt DateTime @default(now()) @updatedAt
 
   @@index([title])
-  @@index([linkedGoalId])
+  @@index([goalId])
 }
diff --git a/src/components/CreateCriteriaForm/CreateCreteriaForm.tsx b/src/components/CreateCriteriaForm/CreateCreteriaForm.tsx
diff --git a/...teriaForm/CreateCriteriaForm.i18n/en.json → ...ts/CriteriaForm/CriteriaForm.i18n/en.json b/...teriaForm/CreateCriteriaForm.i18n/en.json → ...ts/CriteriaForm/CriteriaForm.i18n/en.json
@@ -1,9 +1,9 @@
 {
     "Weight is required": "",
     "Weight must be integer": "",
-    "Weight": "",
+    "Weight": "No more than {upTo}",
     "Criteria or Goal": "",
-    "Add achivement criteria": "",
+    "Add achievement criteria": "",
     "Weight must be in range": "Weight must be between 1 and {upTo}",
     "Add": ""
 }
diff --git a/...eriaForm/CreateCriteriaForm.i18n/index.ts → ...s/CriteriaForm/CriteriaForm.i18n/index.ts b/...eriaForm/CreateCriteriaForm.i18n/index.ts → ...s/CriteriaForm/CriteriaForm.i18n/index.ts
diff --git a/...teriaForm/CreateCriteriaForm.i18n/ru.json → ...ts/CriteriaForm/CriteriaForm.i18n/ru.json b/...teriaForm/CreateCriteriaForm.i18n/ru.json → ...ts/CriteriaForm/CriteriaForm.i18n/ru.json
@@ -1,9 +1,9 @@
 {
     "Weight is required": "Вес обязателен",
     "Weight must be integer": "Вес должен быть числом",
-    "Weight": "Вес критерия",
+    "Weight": "Не более {upTo}",
     "Criteria or Goal": "Критерий или цель",
-    "Add achivement criteria": "Добавить критерий",
+    "Add achievement criteria": "Добавить критерий",
     "Weight must be in range": "Вес критерия должен быть от 1 до {upTo}",
     "Add": "Добавить"
 }