From 8380792557d680b9024d957d8714c83e79bebf43 Mon Sep 17 00:00:00 2001
From: Lykke Axlin <lykkeaxlin@hotmail.com>
Date: Tue, 9 Nov 2021 15:21:06 +0100
Subject: [PATCH] made responsible field mandatory

Signed-off-by: Lykke Axlin <lykkeaxlin@hotmail.com>

Co-authored-by: klaraab <klarabroman@live.se>
---
 .../migrations/20211020073922_add_columns.js  | 45 +++++++++++++++++++
 plugins/bazaar/README.md                      |  2 +-
 .../ProjectDialog/ProjectDialog.tsx           |  7 +--
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 plugins/bazaar-backend/migrations/20211020073922_add_columns.js

diff --git a/plugins/bazaar-backend/migrations/20211020073922_add_columns.js b/plugins/bazaar-backend/migrations/20211020073922_add_columns.js
new file mode 100644
index 0000000000..d4cb87bd82
--- /dev/null
+++ b/plugins/bazaar-backend/migrations/20211020073922_add_columns.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('metadata', table => {
+    table
+      .text('size')
+      .defaultTo('medium')
+      .notNullable()
+      .comment('The estimated magnitude of the project');
+    table
+      .text('start_date')
+      .comment('Optional start date of the project (ISO 8601 format)');
+    table
+      .text('end_date')
+      .comment('Optional end date of the project (ISO 8601 format)');
+    table
+      .text('responsible')
+      .notNullable()
+      .comment('Contact person of the project');
+  });
+};
+
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('metadata', table => {
+    table
+      .dropColumn('size')
+      .dropColumn('start_date')
+      .dropColumn('end_date')
+      .dropColumn('responsible');
+  });
+};
diff --git a/plugins/bazaar/README.md b/plugins/bazaar/README.md
index c807b94639..f07e751984 100644
--- a/plugins/bazaar/README.md
+++ b/plugins/bazaar/README.md
@@ -82,12 +82,12 @@ The following fields are mandatory:
 - announcement - present your idea and what skills you are looking for
 - status - whether or not the project has started
 - size - small, medium or large
+- responsible - main contact person of the project
 
 The other fields are:
 
 - start date
 - end date
-- responsible - main contact person of the project
 - community link - link where the project members can chat, e.g. Teams or Discord link
 
 When the project is added, you will see the Bazaar information in the Bazaar card on the entity page. There you can join a project, edit or delete it.
diff --git a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
index 6e1c64588a..a65122b26e 100644
--- a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
+++ b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
@@ -173,18 +173,19 @@ export const ProjectDialog = ({
             options={['small', 'medium', 'large']}
           />
 
-          <DoubleDateSelector setValue={setValue} control={control} />
-
           <InputField
             error={errors.responsible}
             control={control}
             rules={{
-              required: false,
+              required: true,
             }}
             inputType="responsible"
+            helperText="please enter a contact person"
             placeholder="Contact person of the project"
           />
 
+          <DoubleDateSelector setValue={setValue} control={control} />
+
           <InputField
             error={errors.community}
             control={control}