minor: remove wrong license and apply suggestions

research-software-directory · Sep 4, 2023 · a567a45 · a567a45
1 parent a9704a7
commit a567a45
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/database/022-create-maintenance-tables.sql b/database/022-create-maintenance-tables.sql
@@ -6,20 +6,21 @@
 -- SPDX-License-Identifier: Apache-2.0
 
 CREATE TABLE global_announcement (
-    id UUID DEFAULT gen_random_uuid() PRIMARY KEY,
-    text VARCHAR(200),
-    enabled BOOLEAN DEFAULT FALSE NOT NULL,
-    created_at TIMESTAMPTZ NOT NULL,
-    updated_at TIMESTAMPTZ NOT NULL
+--	trick to only have one row in this table:
+	id BOOLEAN DEFAULT TRUE PRIMARY KEY CHECK (id),
+	text VARCHAR(2000),
+	enabled BOOLEAN DEFAULT FALSE NOT NULL,
+	created_at TIMESTAMPTZ NOT NULL,
+	updated_at TIMESTAMPTZ NOT NULL
 );
 
 CREATE FUNCTION sanitise_insert_global_announcement () RETURNS TRIGGER LANGUAGE plpgsql AS
 $$
 BEGIN
-    NEW.id = gen_random_uuid();
-    NEW.created_at = LOCALTIMESTAMP;
-    NEW.updated_at = NEW.created_at;
-    return NEW;
+	NEW.id = TRUE;
+	NEW.created_at = LOCALTIMESTAMP;
+	NEW.updated_at = NEW.created_at;
+	return NEW;
 END
 $$;
 
@@ -28,10 +29,10 @@ CREATE TRIGGER sanitise_insert_global_announcement BEFORE INSERT ON global_annou
 CREATE FUNCTION sanitise_update_global_announcement() RETURNS TRIGGER LANGUAGE plpgsql AS
 $$
 BEGIN
-    NEW.id = OLD.id;
-    NEW.created_at = OLD.created_at;
-    NEW.updated_at = LOCALTIMESTAMP;
-    return NEW;
+	NEW.id = OLD.id;
+	NEW.created_at = OLD.created_at;
+	NEW.updated_at = LOCALTIMESTAMP;
+	return NEW;
 END
 $$;
 
@@ -42,3 +43,5 @@ ALTER TABLE global_announcement ENABLE ROW LEVEL SECURITY;
 CREATE POLICY anyone_can_read ON global_announcement FOR SELECT TO rsd_web_anon, rsd_user USING (TRUE);
 
 CREATE POLICY admin_all_rights ON global_announcement TO rsd_admin USING (TRUE) WITH CHECK (TRUE);
+
+INSERT INTO global_announcement (id) VALUES (TRUE)
diff --git a/frontend/components/admin/announcements/AnnouncementsForm.tsx b/frontend/components/admin/announcements/AnnouncementsForm.tsx
@@ -40,7 +40,7 @@ export default function AnnouncementsForm({data}: { data: AnnouncementItem|null
     if (resp.status === 200) {
       // use values returned from api
       const update = {
-        id: resp.message?.id ?? null,
+        id: resp.message?.id ?? true,
         enabled: resp.message.enabled ?? false,
         text: resp.message.text ?? null
       }
@@ -86,8 +86,8 @@ export default function AnnouncementsForm({data}: { data: AnnouncementItem|null
               message: 'Minimum length is 3.'
             },
             maxLength: {
-              value: 300,
-              message: 'Maximum length is 300.'
+              value: 2000,
+              message: 'Maximum length is 2000.'
             }
           }}
         />

diff --git a/frontend/components/admin/announcements/apiAnnouncement.tsx b/frontend/components/admin/announcements/apiAnnouncement.tsx
@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 //
 // SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: EUPL-1.2
 
 import {createJsonHeaders, extractReturnMessage, getBaseUrl} from '~/utils/fetchHelpers'
 import logger from '~/utils/logger'
@@ -15,7 +14,7 @@ export type NewAnnouncement = {
 }
 
 export type AnnouncementItem = NewAnnouncement & {
-  id: string
+  id: boolean
 }
 
 export async function getAnnouncement(token?:string) {