@galadrim/galadmin 0.1.13 → 0.1.18

package/src/front/node_modules/.cache/terser-webpack-plugin/index-v5/{00/5e/b17bf1abeab91c9bd796e2ee20864302b0fbd97fbcb81be3bb565f70c486 → 0d/89/d99652dba5f73c4101373f4b2c9aabadbe9f3857c9421c62e61ff66caad3}

@@ -1,2 +1,2 @@
 
-53137e1160cab746761473b2b77e9ff54ef69b0a	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002Fmain.b69f1464.chunk.js\",\"contentHash\":\"69f3177cb9bad9d8952f\"}","integrity":"sha512-d7ucDJkmaAH4Iq04fE2463cpdBhHbhhxAcqjBl7VH922piJ/StSoVoDtCFCf3dmb9CkLDd2+26mFHSm2gbENbg==","time":1673515363373,"size":370798}
+57dbf1fd4b9176e2a4374c6b8825efc655523944	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002Fmain.06236740.chunk.js\",\"contentHash\":\"4d4fcb1c3d37403eb7e4\"}","integrity":"sha512-GNslX+Y6oOySMqjP2z+med/b0P1k97dzGKIJBgQ8SfRL+mWSAPAmiGe+5tOnsht7/WLDAw5i7AlRR/mLQuua/Q==","time":1678196111980,"size":374439}

package/src/front/node_modules/.cache/terser-webpack-plugin/index-v5/{f3/67/591e18ebf4c0bef454dd26c51b3a6caca691338ed27811d59ddef26e7031 → 1a/b8/bc69b6c33a11502667cb59add9db2987fe400f0ce7def96861b03ef6755c}

@@ -1,2 +1,2 @@
 
-af149589627391ff754b163bac667e02166aa02c	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002F2.778cdac1.chunk.js\",\"contentHash\":\"ce4b87f45f8664279b8c\"}","integrity":"sha512-oKUC63w2hvwLizaNdXGsmdkFeSOt4CUjdpoBBN9yZFRUw6u14avXlZQ1pFksz8b2JRBYmAkuA4y0RL6gOSifyQ==","time":1673457067006,"size":1867086}
+acc223450f70fdf33fbcdda25b519b8885088453	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002F2.b3d419cf.chunk.js\",\"contentHash\":\"3fe10656615aefe7146c\"}","integrity":"sha512-9gW/ZT7u4VtVLIaEQ4NNPFA76aNOEn7Hb4Bc9gdov1jZR1Dh3cx/TODtcW1iXiBAgj0J00czg+hGS6AV2w7B2Q==","time":1678196114932,"size":1867077}

package/src/front/node_modules/.cache/terser-webpack-plugin/index-v5/87/08/421190bfe6e50816e059da6c33526c9943732ef856ebd2752d0cbfb4a852

@@ -1,2 +1,2 @@
 
-f71c419fca72668555a5e94e37a2e3a509bcc56a	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002Fruntime-main.2084140f.js\",\"contentHash\":\"21b0955fafaa36835c2c\"}","integrity":"sha512-EIHWkk+Hu8omZttNSZyf/dcQREufSs8WYrDS8rrnA4aKRWlIARB00JVPiR1DRsuEMh2l+YSkkh+tpa2nXovJ6g==","time":1673457063542,"size":17514}
+3b44085565191f670dacf4eed32a1afe760e57e1	{"key":"{\"terser\":\"5.7.1\",\"terser-webpack-plugin\":\"4.2.3\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.[cm]?js(\\\\?.*)?$\", \"i\"),\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"parse\":{\"ecma\":8},\"compress\":{\"ecma\":5,\"warnings\":false,\"comparisons\":false,\"inline\":2},\"mangle\":{\"safari10\":true},\"keep_classnames\":false,\"keep_fnames\":false,\"output\":{\"ecma\":5,\"comments\":false,\"ascii_only\":true},\"ecma\":5}},\"name\":\"static\\u002Fjs\\u002Fruntime-main.2084140f.js\",\"contentHash\":\"21b0955fafaa36835c2c\"}","integrity":"sha512-EIHWkk+Hu8omZttNSZyf/dcQREufSs8WYrDS8rrnA4aKRWlIARB00JVPiR1DRsuEMh2l+YSkkh+tpa2nXovJ6g==","time":1678196112018,"size":17514}

package/src/front/src/components/Input.js

@@ -21,7 +21,7 @@ export default ({ column, onChange, initialData }) => {
         return (
             <select
                 onChange={(e) => onChange({ [column.name]: e.target.value })}
-                defaultValue={initialData?.[column.name]}
+                defaultValue={initialData?.[column.name] || column.defaultOption}
             >
                 {column.optional ? <option value='NULL'>-</option> : null}
                 <option value='0'>Non</option>
@@ -42,7 +42,7 @@ export default ({ column, onChange, initialData }) => {
         return (
             <select
                 onChange={(e) => onChange({ [column.name]: e.target.value })}
-                defaultValue={initialData?.[column.name]}
+                defaultValue={initialData?.[column.name] || column.defaultOption}
             >
                 {column.optional ? <option value='NULL'>-</option> : null}
                 {Object.keys(column.options).map(key => <option value={key} key={key}>{column.options[key]}</option>)}

package/src/front/src/pages/Record.js

@@ -58,7 +58,7 @@ export default () => {
                             filteredColumns.map((column, index) => (
                                 <div class='showRecordField' key={index}>
                                     <div class='formLabel'>{column.label}</div>
-                                    <div class='formValue'>{getFormattedValue(column, record, false) || "-"}</div>
+                                    <div class='formValue'>{getFormattedValue(column, record, config, false) || "-"}</div>
                                 </div>
                             ))
                             : null}

package/src/front/src/pages/Records.js

@@ -194,7 +194,7 @@ export default () => {
                                         e.stopPropagation()
                                     }}><div class={`checkbox ${selectedRecordIds.includes(recordId) ? "checked" : ""}`}></div></td>}
                                     {filteredColumns.map((column, index) => (
-                                        <td key={index}>{getFormattedValue(column, record, true)}</td>
+                                        <td key={index}>{getFormattedValue(column, record, config, true)}</td>
                                     ))}
                                 </tr>
                             )

package/src/front/src/utils/getFormattedValue.js

@@ -1,7 +1,15 @@
 import evalExpression from "./evalExpression"
+import {
+    Link
+} from "react-router-dom";
 
-export default (column, record, onTable) => {
-    if (column.showAsPicture) {
+export default (column, record, config, onTable) => {
+    const foreignViewIndex = column.dataType === 'foreign' ? config.views.findIndex(x => x.tableName === column.table) : -1
+    if (column.dataType === 'foreign' && column.formatValue && foreignViewIndex > -1) {
+        return <Link to={`/record/${foreignViewIndex}/${record[column.name]}`} dangerouslySetInnerHTML={{ __html: record[`__formatValue-${column.__id__}__`] }} />
+    } else if (column.dataType === 'foreign' && column.formattedValue && foreignViewIndex > -1) {
+        return <Link to={`/record/${foreignViewIndex}/${record[column.name]}`}>{evalExpression(column.formattedValue, record)}</Link>
+    } else if (column.showAsPicture) {
         const imageUrl = column.baseUrl + record[column.pathField];
         return record[column.pathField] ? (
             <a href={imageUrl} target='_blank'>