Merge pull request #243 from thingsdb/update

Multiple updates

Author: AnjaBruls

react/src/Components/Nodes/SVGNodes/OpenNodeGraph.js

@@ -21,6 +21,7 @@ const withStores = withVlow([{
 const OpenNodeGraph = ({nodes, streamInfo}) => {
     const [open, setOpen] = React.useState(false);
     const [loading, setLoading] = React.useState(false);
+    const hasStreamInfo = nodes.length > 1;
 
     const handleLoading = React.useCallback(() => {
         setTimeout(()=> {
@@ -29,7 +30,7 @@ const OpenNodeGraph = ({nodes, streamInfo}) => {
     }, []);
 
     React.useEffect(() => {
-        if (open) {
+        if (open && hasStreamInfo) {
             setLoading(true);
             NodesActions.getStreamInfo(handleLoading);
         }
@@ -52,17 +53,17 @@ const OpenNodeGraph = ({nodes, streamInfo}) => {
             actionButtons={
                 <React.Fragment>
                     <Tooltip disableFocusListener disableTouchListener title="Refresh stream info">
-                        <Button color="primary" onClick={handleRefresh} >
+                        <Button color="primary" onClick={handleRefresh}>
                             <RefreshIcon color="primary" />
                         </Button>
                     </Tooltip>
                     <StartStopPolling onPoll={handleRefresh} title="stream info" />
                 </React.Fragment>
             }
             button={
-                <Tooltip disableFocusListener disableTouchListener title={Object.keys(streamInfo).length ? 'Ready' : 'Getting stream data...'} >
+                <Tooltip disableFocusListener disableTouchListener title={!hasStreamInfo ? 'No stream data on one node' : Object.keys(streamInfo).length ? 'Ready' : 'Getting stream data...'} >
                     <span>
-                        <Button variant="outlined" color="primary" onClick={handleClickOpen} >
+                        <Button variant="outlined" color="primary" disabled={!hasStreamInfo} onClick={handleClickOpen} >
                             {'View stream graph'}
                         </Button>
                     </span>

react/src/Components/Users/Config/UserAccess.js

@@ -50,6 +50,7 @@ const UserAccess = ({user, collections}) => {
     const getSwitches = (scope, privileges) => {
         let s = {
             full: false,
+            user: false,
             query: false,
             change: false,
             grant: false,
@@ -58,12 +59,18 @@ const UserAccess = ({user, collections}) => {
         };
 
         s.full = privileges.includes('FULL');
+        s.user = privileges.includes('USER');
         if (s.full) {
             s.query = true;
             s.change = true;
             s.grant = true;
             s.join = true;
             s.run = true;
+        } else if (s.user) {
+            s.query = true;
+            s.change = true;
+            s.join = true;
+            s.run = true;
         } else {
             s.query = privileges.includes('QUERY');
             s.change = privileges.includes('CHANGE');

react/src/Components/Utils/Language.js

@@ -37,6 +37,7 @@ export default {
             'every': 'This function tests whether all elements in the array pass a given test. It returns a boolean value.',
             'extend': 'Adds a list or tuple with items to the end of a list, and returns the new length.',
             'extend_unique': 'Adds a list or tuple with items to the end of a list, and returns the new length. Only items which do not have a duplicate in the list will be added.',
+            'fill': 'Fills a list with a given value.',
             'filter': 'When this method is used on an list or tuple, a new list is returned with elements that pass the test.',
             'find': 'This function returns the value of the first element in the list or tuple that satisfies the callback function. Otherwise nil is returned unless an alternative return value is specified.',
             'find_index': 'This function returns the index of the first element in a list or tuple that satisfies the callback function. Otherwise nil is returned.',
@@ -48,6 +49,9 @@ export default {
             'last':'Returns the last item in the list. A lookup_err() is raised when this function is used on an empty list unless a default value is given, in which case the given value will be returned.',
             'len': 'Returns the length of a list or tuple.',
             'map': 'Iterate over items in an list or tuple.',
+            'map_id': 'The function must be called on a list with things and returns a new list with the Ids of all the things.',
+            'map_type': 'The function must be called on a list with Ids (integer values) or things and returns a new list with the Ids and things converted to corresponding typed things.',
+            'map_wrap': 'The function must be called on a list with things and returns a new list with every thing wrapped according the given type.',
             'pop': 'Removes the last element from a list and returns that element. This method changes the length of the list. The pop() method works on a list type array, but not on a tuple since tuples are immutable.',
             'push': 'Adds new items to the end of an list, and returns the new length',
             'reduce': 'Executes a given reducer closure on each element of the list, resulting in a single output value.',
@@ -81,6 +85,8 @@ export default {
             'has': 'Determines if a set has a given thing.',
             'len': 'Returns the length of a set.',
             'map': 'Iterate over items in an set.',
+            'map_id': 'The function returns a list with the Ids of all the things in the set.',
+            'map_wrap': 'The function returns a list with every thing wrapped according the given type.',
             'one': 'This function returns a thing from a set. The set must contain at least one thing, otherwise a lookup_err() is raised.',
             'reduce': 'Executes a given reducer closure on every thing in the set, accumulating to a single return value.',
             'remove': 'This function can be used to remove things from a set. If a closure is used, then all things that satisfy the test are removed from the set and returned as list. The order of the removed things is not guaranteed since the set itself is unordered. It is also possible to specify things as arguments. In this case a list is returned with all the things which are removed from the set, in the order that the arguments are used. Things which are not found in the set are ignored.',
@@ -130,6 +136,7 @@ export default {
             'len': 'Returns the number of items in a thing.',
             'map': 'Iterate over all properties on a thing.',
             'remove': 'This function removes all properties from a thing that satisfies the callback function. The removed values will be returned in a new list. An empty list is returned if no values are removed.',
+            'ren': 'Rename a property on a thing.',
             'restrict': 'Set or remove a value restriction on a thing. Function restriction() can be used to view the current restriction.',
             'restriction': 'Returns the value restriction of a thing as type str or nil when the thing is not value restricted.',
             'set': 'Creates a new property on a thing. If the property already existed then the old property will be overwritten. This function is equal to an assignment except that it can be used when the name of the property is dynamic.',
@@ -161,14 +168,14 @@ export default {
         'del_type': 'Deletes an existing Type. It is not possible to delete a Type which is used by another type. You should first change or delete the other type before you are able to delete this type. See the example below.',
         'enum': 'Get an enum member by value',
         'enum_info': 'Return info about the enumerator type.',
+        'enum_map': 'Returns a thing with key/value pairs for all the members of a given enum.',
         'enums_info': 'Return info about all the enumerator types in the current scope',
         'err': 'Returns an error.',
         'change_id': 'Returns the current change Id for the running query. The return value will be nil if the query does not require a change.',
         'float': 'Returns a float from a specified value. If no value is given, the default float 0.0 is returned. If the specified value is of type raw, then the initial characters of the string are converted until a non-digit character is found. Initial white space is ignored and the number may start with an optional + or - sign. Type bool values are converted to 1.0 for true and 0.0 for false.',
         'future': 'Returns a future. It is not possible to assign a future to a collection or add the future to a list. If you do, then nil will be assigned instead.',
         'has_enum': 'Determine if the current scope has a given enumerator type',
         'has_type': 'Determines if a Type exists in the current @collection scope.',
-        'if': 'Runs a block code based on the result of a given condition.',
         'int': 'Returns an int from a specified value. If no value is given, the default integer 0 is returned. If the specified value was a float value, then the new integer value will be rounded towards zero. If the specified value is of type raw, then the initial characters of the string are converted until a non-digit character is found. Initial white space is ignored and the number may start with an optional + or - sign. Type bool values are converted to 1 for true and 0 for false.',
         'is_array': 'This function determines whether the value passed to this function is an array type or not. The functions is_lis_t and is_tuple can be used to check if the array is mutable.',
         'is_ascii': 'This function determines whether the value passed to this function is of type raw and contains only valid ascii characters.',
@@ -206,6 +213,7 @@ export default {
         'new': 'Creates a new instance of a defined Type.',
         'new_type': 'Creates a new Type. This function only creates a new type and does not allow you to specify any fields. With the set_type() function you can define the fields for the new type.',
         'now': 'Return the time in seconds since the epoch as a floating point number. If you require the same time multiple times within a query, then call now() only once and save it to a variable, for example now = now();',
+        'nse': 'This function promises ThingsDB that your code has no-side-effects and therefore does not require a change.',
         'raise': 'Raises an error.',
         'rand': 'Returns pseudo-random random number between 0.0 and 1.0.',
         'randint': 'Returns pseudo-random random integer number between a given range. The first argument specifies the start of the range and must have a value less than the second argument when specifies the end of the range. The start is inclusive and the end is exclusive, for example: randint(0, 2) will return either 0 or 1.',
@@ -215,7 +223,6 @@ export default {
         'regex': 'This function can be used to create a regular expression from a given pattern with optional flags.',
         'rename_enum': 'Rename an enum type.',
         'rename_type': 'Rename a type.',
-        'return': 'The return function moves the argument to the output of the current query/closure call. If no return is specified, then the last value will be the value which is returned. A second argument can be given to the return function which can be used to specify how deep the result should be returned. The default deep value is set to 1, but any value between 0 and 127 is possible. A query can run different procedures and/or closures which might have change the deep value. In case you need to know the current deep value, the function deep() can be used. When no arguments are used the return value will be nil.',
         'room': 'Returns a room from a specified value, that may be dynamic. If no value is given, a new room is returned.',
         'set': 'Returns a new empty set. If an array is given, then all elements in the given array must be or type thing and a new set is returned based on the given things. Instead of an array, it is also possible to provide things comma separated.',
         'set_enum': 'Create a new enumerator type',

react/src/Components/Utils/QueryInput.js

@@ -104,7 +104,7 @@ monaco.languages.setMonarchTokensProvider('mySpecialLanguage', {
             { include: '@whitespace' },
 
             // regular expression: ensure it is terminated before beginning (otherwise it is an opeator)
-            [/\/(?=([^\\\/]|\\.)+\/(i?)(\s*)(\.|;|\/|,|\)|\]|\}|$))/, { token: 'regexp', bracket: '@open', next: '@regexp' }],
+            [/\/(?=([^\\\/]|\\.)+\/([ims]*)(\s*)(\.|;|\/|,|\)|\]|\}|$))/, { token: 'regexp', bracket: '@open', next: '@regexp' }],
 
             // delimiters and operators
             [/[()\[\]]/, '@brackets'],
@@ -128,8 +128,6 @@ monaco.languages.setMonarchTokensProvider('mySpecialLanguage', {
             [/[;,.]/, 'delimiter'],
 
             // strings
-            [/"([^"\\]|\\.)*$/, 'string.invalid'],  // non-teminated string
-            [/'([^'\\]|\\.)*$/, 'string.invalid'],  // non-teminated string
             [/"/, 'string', '@string_double'],
             [/'/, 'string', '@string_single'],
             [/`/, 'string', '@string_backtick'],
@@ -157,7 +155,7 @@ monaco.languages.setMonarchTokensProvider('mySpecialLanguage', {
             [/[^\\\/]/, 'regexp'],
             [/@regexpesc/, 'regexp.escape'],
             [/\\\./, 'regexp.invalid'],
-            [/(\/)(i?)/, [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']],
+            [/(\/)([ims]*)/, [{ token: 'regexp', bracket: '@close', next: '@pop' }, 'keyword.other']],
         ],
 
         regexrange: [
@@ -183,8 +181,9 @@ monaco.languages.setMonarchTokensProvider('mySpecialLanguage', {
         ],
 
         string_backtick: [
+            [/\{\{/, 'string'],
             [/\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
-            [/[^\\`{]+/, 'string'],
+            [/[^\{`\{]+/, 'string'],
             [/@escapes/, 'string.escape'],
             [/\\./, 'string.escape.invalid'],
             [/`/, 'string', '@pop']