specify · melton-jason · Jun 18, 2024 · Dec 28, 2023 · Dec 28, 2023 · Dec 28, 2023
diff --git a/specifyweb/celery_tasks.py b/specifyweb/celery_tasks.py
@@ -17,15 +17,28 @@
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()
 
+class CELERY_TASK_STATE:
+    """ Built-In Celery Task States
+    See https://docs.celeryq.dev/en/stable/userguide/tasks.html#built-in-states
+    """
+    FAILURE = 'FAILURE'
+    PENDING = 'PENDING'
+    RECEIVED = 'RECEIVED'
+    RETRY = 'RETRY'
+    REVOKED = 'REVOKED'
+    STARTED = 'STARTED'
+    SUCCESS = 'SUCCESS'
 
 @app.task(bind=True)
 def debug_task(self):
     print(f'Request: {self.request!r}')
 
+
 logger = get_task_logger(__name__)
 
 
 class LogErrorsTask(Task):
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         logger.exception('Celery task failure!!!1', exc_info=exc)
-        super(LogErrorsTask, self).on_failure(exc, task_id, args, kwargs, einfo)
+        super(LogErrorsTask, self).on_failure(
+            exc, task_id, args, kwargs, einfo)
diff --git a/specifyweb/context/openapi_schema.py b/specifyweb/context/openapi_schema.py
@@ -414,6 +414,7 @@
           "type": "string",
           "enum": [
             "array",
+            "null",
             "boolean",
             "integer",
             "number",

diff --git a/specifyweb/frontend/js_src/babel.config.cjs b/specifyweb/frontend/js_src/babel.config.cjs
@@ -19,7 +19,7 @@ module.exports = {
         ['@babel/preset-react'],
         ['@babel/preset-typescript'],
       ],
-      plugins: ['@babel/plugin-transform-modules-commonjs'],
+      plugins: ['@babel/plugin-transform-modules-commonjs', "babel-plugin-transform-import-meta"],
     },
   },
 };
diff --git a/specifyweb/frontend/js_src/jest.config.ts b/specifyweb/frontend/js_src/jest.config.ts
@@ -224,7 +224,7 @@ const config: Config.InitialOptions = {
 
   // See https://stackoverflow.com/questions/69075510/jest-tests-failing-on-d3-import
   transformIgnorePatterns: [
-    '/node_modules/(?!d3|d3-array|internmap|delaunator|robust-predicates|csv-stringify)',
+    '/node_modules/(?!d3|d3-array|internmap|delaunator|robust-predicates|csv-stringify|csv-parse)',
   ],
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them

diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/Icons.tsx b/specifyweb/frontend/js_src/lib/components/Atoms/Icons.tsx
@@ -87,6 +87,9 @@ export const icons = {
   fingerPrint: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M6.625 2.655A9 9 0 0119 11a1 1 0 11-2 0 7 7 0 00-9.625-6.492 1 1 0 11-.75-1.853zM4.662 4.959A1 1 0 014.75 6.37 6.97 6.97 0 003 11a1 1 0 11-2 0 8.97 8.97 0 012.25-5.953 1 1 0 011.412-.088z" fillRule="evenodd" /><path clipRule="evenodd" d="M5 11a5 5 0 1110 0 1 1 0 11-2 0 3 3 0 10-6 0c0 1.677-.345 3.276-.968 4.729a1 1 0 11-1.838-.789A9.964 9.964 0 005 11zm8.921 2.012a1 1 0 01.831 1.145 19.86 19.86 0 01-.545 2.436 1 1 0 11-1.92-.558c.207-.713.371-1.445.49-2.192a1 1 0 011.144-.83z" fillRule="evenodd" /><path clipRule="evenodd" d="M10 10a1 1 0 011 1c0 2.236-.46 4.368-1.29 6.304a1 1 0 01-1.838-.789A13.952 13.952 0 009 11a1 1 0 011-1z" fillRule="evenodd" /></svg>,
   gallery:<svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
   <path clipRule="evenodd" d="M5 3a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2V5a2 2 0 00-2-2H5zM5 11a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2v-2a2 2 0 00-2-2H5zM11 5a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V5zM11 13a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z" fillRule="evenodd" />
+</svg>,
+  globe: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+  <path clipRule="evenodd" fillRule="evenodd" d="M4.083 9h1.946c.089-1.546.383-2.97.837-4.118A6.004 6.004 0 004.083 9zM10 2a8 8 0 100 16 8 8 0 000-16zm0 2c-.076 0-.232.032-.465.262-.238.234-.497.623-.737 1.182-.389.907-.673 2.142-.766 3.556h3.936c-.093-1.414-.377-2.649-.766-3.556-.24-.56-.5-.948-.737-1.182C10.232 4.032 10.076 4 10 4zm3.971 5c-.089-1.546-.383-2.97-.837-4.118A6.004 6.004 0 0115.917 9h-1.946zm-2.003 2H8.032c.093 1.414.377 2.649.766 3.556.24.56.5.948.737 1.182.233.23.389.262.465.262.076 0 .232-.032.465-.262.238-.234.498-.623.737-1.182.389-.907.673-2.142.766-3.556zm1.166 4.118c.454-1.147.748-2.572.837-4.118h1.946a6.004 6.004 0 01-2.783 4.118zm-6.268 0C6.412 13.97 6.118 12.546 6.03 11H4.083a6.004 6.004 0 002.783 4.118z" />
 </svg>,
   hashtag: <svg aria-hidden className={iconClassName} fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path clipRule="evenodd" d="M9.243 3.03a1 1 0 01.727 1.213L9.53 6h2.94l.56-2.243a1 1 0 111.94.486L14.53 6H17a1 1 0 110 2h-2.97l-1 4H15a1 1 0 110 2h-2.47l-.56 2.242a1 1 0 11-1.94-.485L10.47 14H7.53l-.56 2.242a1 1 0 11-1.94-.485L5.47 14H3a1 1 0 110-2h2.97l1-4H5a1 1 0 110-2h2.47l.56-2.243a1 1 0 011.213-.727zM9.03 8l-1 4h2.938l1-4H9.031z" fillRule="evenodd" /></svg>,
   // This icon is not from Heroicons. It was drawn by @grantfitzsimmons

diff --git a/specifyweb/frontend/js_src/lib/components/Header/userToolDefinitions.ts b/specifyweb/frontend/js_src/lib/components/Header/userToolDefinitions.ts
@@ -99,6 +99,14 @@ const rawUserTools = ensure<IR<IR<Omit<MenuItem, 'name'>>>>()({
       icon: icons.rss,
     },
   },
+  [commonText.import()]: {
+    localityUpdate: {
+      title: headerText.localityUpdateTool(),
+      enabled: () => userInformation.isadmin,
+      url: '/specify/import/locality-dataset/',
+      icon: icons.globe,
+    },
+  },
   [headerText.documentation()]: {
     aboutSpecify: {
       title: welcomeText.aboutSpecify(),