Added basics of an API and frontend for managing type metadata

Type metadata is information about types and fields, as hardcoded in the app.
EHRI · Aug 2, 2024 · 6cf3826 · 6cf3826
1 parent 9de1af7
commit 6cf3826
Show file tree

Hide file tree

Showing 116 changed files with 20,110 additions and 16,611 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -201,7 +201,6 @@ module.exports = function (grunt) {
             expand: true,
             cwd: 'node_modules/vue/dist',
             src: [
-              'vue.global.js',
               'vue.runtime.global.js'
             ],
             dest: paths.adminJsLib

diff --git a/build.sbt b/build.sbt
@@ -57,8 +57,8 @@ val coreDependencies = backendDependencies ++ Seq(
   "com.typesafe.akka" %% "akka-http-xml"   % akkaHttpVersion,
 
   // Anorm DB lib
-  "org.playframework.anorm" %% "anorm" % "2.6.10",
-  "org.playframework.anorm" %% "anorm-postgres" % "2.6.10",
+  "org.playframework.anorm" %% "anorm" % "2.7.0",
+  "org.playframework.anorm" %% "anorm-postgres" % "2.7.0",
 
   // Commons IO
   "commons-io" % "commons-io" % "2.5",

diff --git a/conf/evolutions/default/1.sql b/conf/evolutions/default/1.sql
@@ -358,9 +358,42 @@ CREATE INDEX coreference_value_text ON coreference_value(text);
 CREATE INDEX coreference_value_target_id ON coreference_value(target_id);
 CREATE INDEX coreference_value_set_id ON coreference_value(set_id);
 
+CREATE TABLE entity_type_meta(
+    entity_type VARCHAR(50) NOT NULL PRIMARY KEY,
+    name        VARCHAR(100) NOT NULL,
+    description TEXT,
+    created     TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated     TIMESTAMP
+);
+
+CREATE INDEX entity_type_meta_entity_type ON entity_type_meta(entity_type);
+
+CREATE TABLE field_meta(
+    entity_type VARCHAR(50) NOT NULL,
+    id          VARCHAR(50) NOT NULL,
+    name        VARCHAR(100) NOT NULL,
+    description TEXT,
+    usage       VARCHAR(50),
+    category    VARCHAR(50),
+    default_val TEXT,
+    see_also    TEXT[],
+    created     TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated     TIMESTAMP,
+    PRIMARY KEY (entity_type, id),
+    CONSTRAINT field_meta_entity_type
+        FOREIGN KEY (entity_type)
+            REFERENCES entity_type_meta (entity_type)
+            ON DELETE CASCADE
+            ON UPDATE CASCADE
+);
+
+CREATE INDEX field_meta_entity_type ON field_meta(entity_type);
+CREATE INDEX field_meta_id ON field_meta(id);
 
  # --- !Downs
 
+DROP TABLE IF EXISTS field_meta CASCADE;
+DROP TABLE IF EXISTS entity_type_meta CASCADE;
 DROP TABLE IF EXISTS coreference CASCADE;
 DROP TABLE IF EXISTS coreference_value CASCADE;
 DROP TABLE IF EXISTS cleanup_action_redirect CASCADE;

diff --git a/modules/admin/app/assets/css/admin/_admin.scss b/modules/admin/app/assets/css/admin/_admin.scss
@@ -470,11 +470,13 @@ body.spa-app {
 }
 
 .app-content {
+  @extend %expanding-column;
+}
+
+.app-content-inner {
   @include make-container();
   @include make-container-max-widths();
-  flex: 1;
-  display: flex;
-  flex-direction: column;
+  @extend %expanding-column;
   margin-top: $margin-md;
 }
 

diff --git a/modules/admin/app/assets/css/apps.scss b/modules/admin/app/assets/css/apps.scss
@@ -0,0 +1,85 @@
+@import "lib/docview-portal/css/portal.scss";
+
+//Admin
+@import "./admin/admin";
+@import "./admin/forms";
+
+// Styling common to docview VueJS applications
+
+#app-error-notice {
+  position: absolute;
+  bottom: $margin-sm;
+  right: $margin-sm;
+  padding: $margin-xs $margin-sm;
+  z-index: 100;
+
+  .close {
+    margin-left: $margin-xs;
+    margin-top: -3px;
+    cursor: pointer;
+  }
+}
+
+.modal {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.modal-alert {
+  z-index: 1000;
+  display: flex !important;
+
+  .modal-content {
+    box-shadow: $box-shadow-lg;
+  }
+}
+
+.modal-content.resizable {
+  min-height: 30rem;
+}
+
+.modal-content.resizable > .modal-body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.modal-resize-handle {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  display: inline;
+  width: 1rem;
+  height: 1rem;
+  cursor: nwse-resize;
+}
+
+.modal-resize-handle:after {
+  content:'';
+  display:block;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid $ehri-border-gray;
+  width: 2px;
+  height: 5px;
+  position: absolute;
+  pointer-events: none;
+  right: -1px;
+  bottom: 1px;
+  transform: rotate(135deg);
+}
+
+.options-form {
+  padding: $margin-md;
+  input:invalid {
+    background-color: lighten($danger, 40%);
+  }
+}
+
+.resizable .options-form {
+  flex: 1;
+}
+
+.options-form .small.form-text {
+  color: $text-muted;
+}
+
diff --git a/modules/admin/app/assets/css/datasets.scss b/modules/admin/app/assets/css/datasets.scss
@@ -1,8 +1,4 @@
-@import "lib/docview-portal/css/portal.scss";
-
-//Admin
-@import "./admin/admin";
-@import "./admin/forms";
+@import "apps";
 
 $active-table-row: #e7f1ff;
 
@@ -165,60 +161,6 @@ $active-table-row: #e7f1ff;
   flex: 1;
   justify-content: flex-end;
 }
-
-#app-error-notice {
-  position: absolute;
-  bottom: $margin-sm;
-  right: $margin-sm;
-  padding: $margin-xs $margin-sm;
-  z-index: 100;
-
-  .close {
-    margin-left: $margin-xs;
-    margin-top: -3px;
-    cursor: pointer;
-  }
-}
-
-.modal {
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-.modal-content.resizable {
-  min-height: 30rem;
-}
-
-.modal-content.resizable > .modal-body {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-}
-
-.modal-resize-handle {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  display: inline;
-  width: 1rem;
-  height: 1rem;
-  cursor: nwse-resize;
-}
-
-.modal-resize-handle:after {
-  content:'';
-  display:block;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid $ehri-border-gray;
-  width: 2px;
-  height: 5px;
-  position: absolute;
-  pointer-events: none;
-  right: -1px;
-  bottom: 1px;
-  transform: rotate(135deg);
-}
-
 #stage-tabs,
 #dataset-manager-tabs
 {
@@ -236,15 +178,6 @@ $active-table-row: #e7f1ff;
   margin-bottom: $margin-sm;
 }
 
-.modal-alert {
-  z-index: 1000;
-  display: flex !important;
-
-  .modal-content {
-    box-shadow: $box-shadow-lg;
-  }
-}
-
 .file-picker {
   display: flex;
   align-items: center;
@@ -676,6 +609,7 @@ $active-table-row: #e7f1ff;
     // strange gaps.
     border-collapse: separate;
     border-spacing: 0;
+    border: none; // table doesn't need a double border, however cells do have one
   }
 
   // Sticky headers. Note: applying `position: sticky` to `thead`
@@ -985,21 +919,6 @@ $active-table-row: #e7f1ff;
   background-color: $gray-100;
 }
 
-.options-form {
-  padding: $margin-md;
-  input:invalid {
-    background-color: lighten($danger, 40%);
-  }
-}
-
-.resizable .options-form {
-  flex: 1;
-}
-
-.options-form .small.form-text {
-  color: $text-muted;
-}
-
 .data-manager-form-item {
   margin-bottom: $margin-xs;
   @include make-row();

diff --git a/modules/admin/app/assets/css/dmeditor.scss b/modules/admin/app/assets/css/dmeditor.scss
@@ -0,0 +1,14 @@
+@import "apps";
+
+$active-table-row: #e7f1ff;
+
+.app-wrapper {
+  background-color: $white;
+}
+
+// Make content area scrollable, this prevents
+// weird behaviour with modal popups
+.app-content {
+  overflow: auto;
+  flex-basis: 0;
+}
diff --git a/modules/admin/app/assets/css/vocabeditor.scss b/modules/admin/app/assets/css/vocabeditor.scss
@@ -3,6 +3,7 @@
 //Admin
 @import "./admin/admin";
 @import "./admin/forms";
+//@import "apps"; // import this after compat check
 
 .footer-buttons {
   margin-top: $margin-sm;

diff --git a/modules/admin/app/assets/js/datasets/app.vue b/modules/admin/app/assets/js/datasets/app.vue
@@ -45,7 +45,7 @@ export default {
 </script>
 
 <template>
-  <div class="app-content">
+  <div class="app-content-inner">
     <div v-if="error" id="app-error-notice" class="alert alert-danger alert-dismissable">
       <span class="close" v-on:click="error = null">&times;</span>
       {{error}}

diff --git a/modules/admin/app/assets/js/datasets/components/_modal-alert.vue b/modules/admin/app/assets/js/datasets/components/_modal-alert.vue
@@ -44,8 +44,8 @@ export default {
           <slot></slot>
         </div>
         <div class="modal-footer">
-          <button v-if="cancel" type="button" class="btn" v-on:click="$emit('close')" autofocus>{{ cancel }}</button>
-          <button v-if="accept" type="button" class="btn" v-bind:class="'btn-' + cls" v-on:click="$emit('accept')">
+          <button v-if="cancel" type="button" class="btn cancel" v-on:click="$emit('close')" autofocus>{{ cancel }}</button>
+          <button v-if="accept" type="button" class="btn accept" v-bind:class="'btn-' + cls" v-on:click="$emit('accept')">
             {{ accept }}
           </button>
         </div>

diff --git a/modules/admin/app/assets/js/datasets/components/_modal-batch-ops.vue b/modules/admin/app/assets/js/datasets/components/_modal-batch-ops.vue
@@ -341,7 +341,7 @@ export default {
       <div v-if="tab === 'copy'" class="form-group">
         <label class="form-label" for="from-dataset">
           Source dataset
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <select v-model="copyFrom" class="form-control" id="from-dataset">
           <option v-bind:value="null" disabled selected hidden>(required)</option>
@@ -352,7 +352,7 @@ export default {
       <div v-if="tab === 'copy'" class="form-group">
         <label class="form-label" for="copy-type">
           Copy configuration
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <select v-model="copyType" class="form-control" id="copy-type">
           <option v-bind:value="null" disabled>(required)</option>

diff --git a/modules/admin/app/assets/js/datasets/components/_modal-cleanup-config.vue b/modules/admin/app/assets/js/datasets/components/_modal-cleanup-config.vue
@@ -62,7 +62,7 @@ export default {
       <div class="form-group">
         <label class="form-label" for="opt-cleanup-msg">
           Cleanup log message
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <input v-bind:disabled="cleanupRunning" type="text" v-model="data"
                id="opt-cleanup-msg" class="form-control" placeholder="Heuristic cleanup for update on..."/>

diff --git a/modules/admin/app/assets/js/datasets/components/_modal-dataset-config.vue b/modules/admin/app/assets/js/datasets/components/_modal-dataset-config.vue
@@ -137,7 +137,7 @@ export default {
       <div class="form-group" v-if="info === null">
         <label class="form-label" for="dataset-id">
           Identifier
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <input v-model="id"
                v-bind:class="{'is-invalid': !isValidIdentifier}"
@@ -157,14 +157,14 @@ export default {
       <div class="form-group">
         <label class="form-label" for="dataset-name">
           Name
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <input type="text" v-model="name" id="dataset-name" class="form-control" placeholder="(required)"/>
       </div>
       <div class="form-group">
         <label class="form-label" for="dataset-src">
           Type
-          <span class="required-input">*</span>
+          <span class="input-mandatory">*</span>
         </label>
         <select v-model="src" class="form-control" id="dataset-src">
           <option v-bind:value="null" disabled selected hidden>(required)</option>

diff --git a/modules/admin/app/assets/js/datasets/dashboard-app.vue b/modules/admin/app/assets/js/datasets/dashboard-app.vue
@@ -28,7 +28,7 @@ export default {
 </script>
 
 <template>
-  <div id="dashboard-container" class="app-content">
+  <div id="dashboard-container" class="app-content-inner">
     <div v-if="error" id="app-error-notice" class="alert alert-danger alert-dismissable">
       <span class="close" v-on:click="error = null">&times;</span>
       {{error}}