Merge pull request #502 from OHDSI/development

Release 0.5

Author: fdefalco

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ares",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Apex Research Exploration System (ARES)",
   "author": "Frank DeFalco",
   "private": true,

package.json

@@ -1,5 +1,6 @@
 {
   "WEB_API_URL": "./",
   "WEB_API_ENABLED": false,
-  "DUCKDB_ENABLED": false
+  "DUCKDB_ENABLED": false,
+  "CDM_NETWORK_NAME": ""
 }

public/env/env.json

@@ -43,7 +43,7 @@ export default {
   thead: ({ context }) => ({
     class: [
       {
-        "bg-transparent top-0 z-[1]": context.scrollable,
+        "bg-surface-0 dark:bg-surface-700 top-0 z-[1]": context.scrollable,
       },
     ],
   }),
@@ -370,12 +370,12 @@ export default {
   },
   bodyrow: ({ context }) => ({
     class: [
-      context.selected
-        ? "bg-primary-50 text-primary-700 dark:bg-primary-300"
-        : "bg-surface-0 text-surface-600 dark:bg-surface-800",
+      // context.selected
+      //   ? "bg-primary-50 text-primary-700 dark:bg-primary-300"
+      //   : "bg-surface-0 text-surface-600 dark:bg-surface-800",
       context.stripedRows
         ? context.index % 2 === 0
-          ? "bg-surface-0 text-surface-600 dark:bg-surface-800"
+          ? "bg-surface-50 text-surface-600 dark:bg-surface-650"
           : "bg-primary-100/50 text-surface-600 dark:bg-surface-800"
         : "",
       "transition duration-200",

src/app/plugins/tailwind/components/dataTable.ts

@@ -60,6 +60,8 @@ export default {
       //Font
       "font-sans",
       "leading-none",
+      "flex",
+      "items-center",
 
       // Display
       "block",

src/app/plugins/tailwind/components/dropdown.ts

@@ -47,6 +47,8 @@ export default {
     class: [
       "leading-none",
       "block ",
+      "flex",
+      "items-center",
 
       // Spacing
       {

src/app/plugins/tailwind/components/multiSelect.ts

@@ -50,7 +50,7 @@ export default {
       "transition duration-200",
 
       // Misc
-      "overflow-hidden whitespace-nowrap cursor-pointer overflow-ellipsis",
+      "overflow-hidden whitespace-nowrap cursor-pointer text-ellipsis",
     ],
   },
   trigger: {
@@ -100,7 +100,8 @@ export default {
     root: {
       class: [
         // Space
-        "p-5",
+        "p-2",
+        // "absolute",
       ],
     },
     wrapper: {
@@ -117,7 +118,7 @@ export default {
     },
     node: {
       class: [
-        "p-1",
+        // "p-1",
         "rounded-md",
         "focus:outline-none focus:outline-offset-0 focus:ring focus:ring-inset focus:ring-primary-400/50 dark:focus:ring-primary-300/50",
       ],
@@ -131,7 +132,7 @@ export default {
         "rounded-md",
 
         // Spacing
-        "p-2",
+        // "p-2",
 
         // Colors
         "text-surface-600 dark:text-white/70",
@@ -167,7 +168,7 @@ export default {
         "border-0 rounded-full",
 
         // Size
-        "w-8 h-8",
+        "h-8",
 
         // Spacing
         "mr-2",
@@ -212,12 +213,11 @@ export default {
         "border-2",
 
         // Colors
-        "text-surface-600",
+        "text-surface-100",
         {
           "border-surface-200 bg-surface-0 dark:border-surface-700 dark:bg-surface-900":
             !context.checked,
-          "border-primary-500 bg-primary-500 dark:border-primary-400 dark:bg-primary-400":
-            context.checked,
+          "border-primary-500 dark:border-primary-400": context.checked,
         },
 
         // States
@@ -231,8 +231,6 @@ export default {
         },
 
         // Transitions
-        "transition-colors",
-        "duration-200",
 
         // Misc
         "cursor-pointer",

src/app/plugins/tailwind/components/treeSelect.ts

@@ -23,6 +23,7 @@
 
     <Panel header="Sources" v-if="store.getters.getApiData.apiSources">
       <DataTable
+        :striped-rows="store.getters.getSettings.strippedRows"
         size="small"
         paginator
         currentPageReportTemplate="{first} to {last} of {totalRecords}"