Merge branch 'develop' of https://github.com/BlueBrain/nexus-web into…

… chore/add-vs-debugger # Conflicts: # src/shared/containers/ResourceViewActionsContainer.tsx
BlueBrain · Dec 6, 2023 · f5f38d5 · f5f38d5
2 parents 40d85db + 4a6f0ce
commit f5f38d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/shared/containers/ResourceListContainer.tsx b/src/shared/containers/ResourceListContainer.tsx
@@ -1,11 +1,8 @@
 import * as React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useNexusContext } from '@bbp/react-nexus';
-import {
-  DEFAULT_ELASTIC_SEARCH_VIEW_ID,
-  ElasticSearchViewQueryResponse,
-  Resource,
-} from '@bbp/nexus-sdk';
+import { DEFAULT_ELASTIC_SEARCH_VIEW_ID, Resource } from '@bbp/nexus-sdk';
+import { isEmpty } from 'lodash';
 
 import ResourceListComponent, {
   ResourceBoardList,
@@ -152,7 +149,7 @@ const ResourceListContainer: React.FunctionComponent<{
                             '@id': list.query.q,
                           },
                         },
-                      ],
+                      ].filter(query => !isEmpty(query)),
                     },
                   },
                   {
@@ -168,7 +165,7 @@ const ResourceListContainer: React.FunctionComponent<{
                             _self: list.query.q,
                           },
                         },
-                      ],
+                      ].filter(query => !isEmpty(query)),
                     },
                   },
                 ],

diff --git a/src/shared/containers/ResourceViewActionsContainer.tsx b/src/shared/containers/ResourceViewActionsContainer.tsx
@@ -422,15 +422,17 @@ const ResourceViewActionsContainer: React.FC<{
                 name="tag"
                 rules={[
                   {
-                    required: true,
-                    whitespace: true,
-                    pattern: /^\S+$/g,
-                    message: 'Tag must not contains spaces',
+                    pattern: /^[\x00-\x7F]/,
+                    message: 'Tag should include only ASCII characters.',
                   },
                   {
-                    pattern: /^[a-zA-Z0-9_-]+$/,
+                    max: 64,
+                    message: 'Tag should not exceed 64 characters.',
+                  },
+                  {
+                    pattern: /^(?!latest$)/,
                     message:
-                      'Tag should include only letters, numbers, underscores, and dashes.',
+                      "Please choose a different name, 'latest' is a reserved word.",
                   },
                 ]}
                 style={{ marginBottom: 8 }}