Merge pull request #100 from hifis-net/update_v1.13.0

Update v1.13.0

Author: cmeessen

.env.example

@@ -37,7 +37,7 @@ POSTGRES_USER=rsd
 
 # backend (postgREST)
 # consumed by services: backend
-PGRST_DB_ANON_ROLE=web_anon
+PGRST_DB_ANON_ROLE=rsd_web_anon
 PGRST_DB_SCHEMA=public
 PGRST_SERVER_PORT=3500
 

CITATION.cff

@@ -75,5 +75,5 @@ keywords:
   - Software Impact
   - Software Reuse
 license: Apache-2.0
-version: v1.12.0
-date-released: '2022-11-30'
+version: v1.13.0
+date-released: '2022-12-02'

backend-postgrest/tests/docker-compose.yml

@@ -38,8 +38,8 @@ services:
       # enable connection from outside
       - "3500:3500"
     environment:
-      - PGRST_DB_URI=postgres://authenticator:simplepassword@database:5432/rsd-db
-      - PGRST_DB_ANON_ROLE=web_anon
+      - PGRST_DB_URI=postgres://rsd_authenticator:simplepassword@database:5432/rsd-db
+      - PGRST_DB_ANON_ROLE=rsd_web_anon
       - PGRST_DB_SCHEMA=public
       - PGRST_SERVER_PORT=3500
       - PGRST_JWT_SECRET=normaly_this_is_a_secret_string_that_none_knows_BUT_this_is_just_a_test

database/001-setup-basic-roles.sql

@@ -3,24 +3,24 @@
 --
 -- SPDX-License-Identifier: Apache-2.0
 
-CREATE ROLE authenticator NOINHERIT LOGIN PASSWORD 'POSTGRES_AUTHENTICATOR_PASSWORD';
+CREATE ROLE rsd_authenticator NOINHERIT LOGIN PASSWORD 'POSTGRES_AUTHENTICATOR_PASSWORD';
 
-CREATE ROLE web_anon NOLOGIN;
+CREATE ROLE rsd_web_anon NOLOGIN;
 
-GRANT USAGE ON SCHEMA public TO web_anon;
+GRANT USAGE ON SCHEMA public TO rsd_web_anon;
 
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO web_anon;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO rsd_web_anon;
 
-GRANT web_anon TO authenticator;
+GRANT rsd_web_anon TO rsd_authenticator;
 
 CREATE ROLE rsd_admin NOLOGIN;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO rsd_admin;
 
-GRANT rsd_admin TO authenticator;
+GRANT rsd_admin TO rsd_authenticator;
 
 CREATE ROLE rsd_user NOLOGIN;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO rsd_user;
 
-GRANT rsd_user TO authenticator;
+GRANT rsd_user TO rsd_authenticator;

database/020-row-level-security.sql

@@ -149,7 +149,7 @@ CREATE POLICY admin_all_rights ON invite_maintainer_for_organisation TO rsd_admi
 -- image
 ALTER TABLE image ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON image FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON image FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY rsd_user_all_rights ON image TO rsd_user
@@ -164,7 +164,7 @@ CREATE POLICY admin_all_rights ON image TO rsd_admin
 -- software
 ALTER TABLE software ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON software FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON software FOR SELECT TO rsd_web_anon, rsd_user
 	USING (is_published);
 
 CREATE POLICY maintainer_select_related ON software FOR SELECT TO rsd_user
@@ -194,7 +194,7 @@ CREATE POLICY admin_all_rights ON software TO rsd_admin
 -- software relations
 ALTER TABLE repository_url ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON repository_url FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON repository_url FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON repository_url TO rsd_user
@@ -208,7 +208,7 @@ CREATE POLICY admin_all_rights ON repository_url TO rsd_admin
 
 ALTER TABLE license_for_software ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON license_for_software FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON license_for_software FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON license_for_software TO rsd_user
@@ -222,7 +222,7 @@ CREATE POLICY admin_all_rights ON license_for_software TO rsd_admin
 
 ALTER TABLE contributor ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON contributor FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON contributor FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON contributor TO rsd_user
@@ -236,7 +236,7 @@ CREATE POLICY admin_all_rights ON contributor TO rsd_admin
 
 ALTER TABLE testimonial ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON testimonial FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON testimonial FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON testimonial TO rsd_user
@@ -250,7 +250,7 @@ CREATE POLICY admin_all_rights ON testimonial TO rsd_admin
 -- keywords
 ALTER TABLE keyword ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON keyword FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON keyword FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY maintainer_can_insert ON keyword FOR INSERT TO rsd_user
@@ -267,7 +267,7 @@ CREATE POLICY admin_all_rights ON keyword TO rsd_admin
 -- keywords for software
 ALTER TABLE keyword_for_software ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON keyword_for_software FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON keyword_for_software FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON keyword_for_software TO rsd_user
@@ -282,7 +282,7 @@ CREATE POLICY admin_all_rights ON keyword_for_software TO rsd_admin
 -- projects
 ALTER TABLE project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (is_published);
 
 CREATE POLICY maintainer_select_related ON project FOR SELECT TO rsd_user
@@ -311,7 +311,7 @@ CREATE POLICY admin_all_rights ON project TO rsd_admin
 
 ALTER TABLE url_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON url_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON url_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON url_for_project TO rsd_user
@@ -325,7 +325,7 @@ CREATE POLICY admin_all_rights ON url_for_project TO rsd_admin
 -- project relations
 ALTER TABLE team_member ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON team_member FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON team_member FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON team_member TO rsd_user
@@ -340,7 +340,7 @@ CREATE POLICY admin_all_rights ON team_member TO rsd_admin
 -- research domain
 ALTER TABLE research_domain ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON research_domain FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON research_domain FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY admin_all_rights ON research_domain TO rsd_admin
@@ -351,7 +351,7 @@ CREATE POLICY admin_all_rights ON research_domain TO rsd_admin
 -- keywords and research domains for projects
 ALTER TABLE keyword_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON keyword_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON keyword_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON keyword_for_project TO rsd_user
@@ -365,7 +365,7 @@ CREATE POLICY admin_all_rights ON keyword_for_project TO rsd_admin
 
 ALTER TABLE research_domain_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON research_domain_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON research_domain_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON research_domain_for_project TO rsd_user
@@ -382,7 +382,7 @@ CREATE POLICY admin_all_rights ON research_domain_for_project TO rsd_admin
 -- should a mention only be visible if you can see at least one software or project for which it relates?
 ALTER TABLE mention ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON mention FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON mention FOR SELECT TO rsd_web_anon, rsd_user
 	USING (id IN (SELECT mention FROM mention_for_software) OR id IN (SELECT mention FROM output_for_project) OR id IN (SELECT mention FROM impact_for_project));
 
 CREATE POLICY maintainer_can_read ON mention FOR SELECT TO rsd_user
@@ -401,7 +401,7 @@ CREATE POLICY admin_all_rights ON mention TO rsd_admin
 
 ALTER TABLE mention_for_software ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON mention_for_software FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON mention_for_software FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_all_rights ON mention_for_software TO rsd_user
@@ -415,7 +415,7 @@ CREATE POLICY admin_all_rights ON mention_for_software TO rsd_admin
 
 ALTER TABLE output_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON output_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON output_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON output_for_project TO rsd_user
@@ -429,7 +429,7 @@ CREATE POLICY admin_all_rights ON output_for_project TO rsd_admin
 
 ALTER TABLE impact_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON impact_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON impact_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_all_rights ON impact_for_project TO rsd_user
@@ -444,7 +444,7 @@ CREATE POLICY admin_all_rights ON impact_for_project TO rsd_admin
 -- releases
 ALTER TABLE release ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON release FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON release FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_select ON release FOR SELECT TO rsd_user
@@ -457,7 +457,7 @@ CREATE POLICY admin_all_rights ON release TO rsd_admin
 
 ALTER TABLE release_content ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON release_content FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON release_content FOR SELECT TO rsd_web_anon, rsd_user
 	USING (release_id IN (SELECT id FROM release));
 
 CREATE POLICY maintainer_select ON release_content FOR SELECT TO rsd_user
@@ -501,7 +501,7 @@ CREATE POLICY admin_all_rights ON orcid_whitelist TO rsd_admin
 -- organisation
 ALTER TABLE organisation ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON organisation FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON organisation FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY maintainer_can_update ON organisation FOR UPDATE TO rsd_user
@@ -519,7 +519,7 @@ CREATE POLICY admin_all_rights ON organisation TO rsd_admin
 -- inter relations
 ALTER TABLE software_for_software ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON software_for_software FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON software_for_software FOR SELECT TO rsd_web_anon, rsd_user
 	USING (origin IN (SELECT id FROM software) AND relation IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_origin_can_read ON software_for_software FOR SELECT TO rsd_user
@@ -538,7 +538,7 @@ CREATE POLICY admin_all_rights ON software_for_software TO rsd_admin
 
 ALTER TABLE software_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON software_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON software_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software) AND project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_can_read ON software_for_project FOR SELECT TO rsd_user
@@ -560,7 +560,7 @@ CREATE POLICY admin_all_rights ON software_for_project TO rsd_admin
 
 ALTER TABLE project_for_project ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON project_for_project FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON project_for_project FOR SELECT TO rsd_web_anon, rsd_user
 	USING (origin IN (SELECT id FROM project) AND relation IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_can_read ON project_for_project FOR SELECT TO rsd_user
@@ -582,7 +582,7 @@ CREATE POLICY admin_all_rights ON project_for_project TO rsd_admin
 
 ALTER TABLE software_for_organisation ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON software_for_organisation FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON software_for_organisation FOR SELECT TO rsd_web_anon, rsd_user
 	USING (software IN (SELECT id FROM software));
 
 CREATE POLICY maintainer_can_read ON software_for_organisation FOR SELECT TO rsd_user
@@ -604,7 +604,7 @@ CREATE POLICY admin_all_rights ON software_for_organisation TO rsd_admin
 
 ALTER TABLE project_for_organisation ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON project_for_organisation FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON project_for_organisation FOR SELECT TO rsd_web_anon, rsd_user
 	USING (project IN (SELECT id FROM project));
 
 CREATE POLICY maintainer_can_read ON project_for_organisation FOR SELECT TO rsd_user
@@ -627,7 +627,7 @@ CREATE POLICY admin_all_rights ON project_for_organisation TO rsd_admin
 -- meta-pages
 ALTER TABLE meta_pages ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON meta_pages FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON meta_pages FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY admin_all_rights ON meta_pages TO rsd_admin
@@ -638,7 +638,7 @@ CREATE POLICY admin_all_rights ON meta_pages TO rsd_admin
 -- oaipmh
 ALTER TABLE oaipmh ENABLE ROW LEVEL SECURITY;
 
-CREATE POLICY anyone_can_read ON oaipmh FOR SELECT TO web_anon, rsd_user
+CREATE POLICY anyone_can_read ON oaipmh FOR SELECT TO rsd_web_anon, rsd_user
 	USING (TRUE);
 
 CREATE POLICY admin_all_rights ON oaipmh TO rsd_admin

deployment/docker-compose.yml

@@ -39,7 +39,7 @@ services:
       - 3500
     environment:
       # it needs to be here to use values from .env file
-      - PGRST_DB_URI=postgres://authenticator:${POSTGRES_AUTHENTICATOR_PASSWORD}@${POSTGRES_DB_HOST}:${POSTGRES_DB_HOST_PORT}/${POSTGRES_DB}
+      - PGRST_DB_URI=postgres://rsd_authenticator:${POSTGRES_AUTHENTICATOR_PASSWORD}@${POSTGRES_DB_HOST}:${POSTGRES_DB_HOST_PORT}/${POSTGRES_DB}
       - PGRST_DB_ANON_ROLE
       - PGRST_DB_SCHEMA
       - PGRST_SERVER_PORT

docker-compose.yml

@@ -40,7 +40,7 @@ services:
       - 3500
     environment:
       # it needs to be here to use values from .env file
-      - PGRST_DB_URI=postgres://authenticator:${POSTGRES_AUTHENTICATOR_PASSWORD}@${POSTGRES_DB_HOST}:${POSTGRES_DB_HOST_PORT}/${POSTGRES_DB}
+      - PGRST_DB_URI=postgres://rsd_authenticator:${POSTGRES_AUTHENTICATOR_PASSWORD}@${POSTGRES_DB_HOST}:${POSTGRES_DB_HOST_PORT}/${POSTGRES_DB}
       - PGRST_DB_ANON_ROLE
       - PGRST_DB_SCHEMA
       - PGRST_SERVER_PORT

frontend/components/layout/CardGrid.tsx

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 dv4all
+//
+// SPDX-License-Identifier: Apache-2.0
+
+type CardTitleProps = {
+  title: string,
+  children: any,
+  className?: string
+}
+
+/**
+ * Card title max 3 lines with line clamp
+ * @returns 
+ */
+export default function CardTitle({title,children,className=''}:CardTitleProps) {
+  return (
+    <h2
+      title={title}
+      className={`group-hover:text-white line-clamp-3 max-h-[6.5rem] ${className}`}
+    >
+      {children}
+    </h2>
+  )
+}