feat(preferences): Refactor and add UI to control Global preferences

specifyweb/backend/context/remote_prefs.py

@@ -15,6 +15,11 @@ def get_remote_prefs() -> str:
 
 def get_global_prefs() -> str:
     res = Spappresourcedata.objects.filter(
+        spappresource__name='GlobalPreferences')
+    if res.exists():
+        return '\n'.join(force_str(r.data) for r in res)
+
+    legacy_res = Spappresourcedata.objects.filter(
         spappresource__name='preferences',
         spappresource__spappresourcedir__usertype='Global Prefs')
-    return '\n'.join(force_str(r.data) for r in res)
+    return '\n'.join(force_str(r.data) for r in legacy_res)

specifyweb/backend/stored_queries/format.py

@@ -18,7 +18,7 @@
 from sqlalchemy import types
 
 import specifyweb.backend.context.app_resource as app_resource
-from specifyweb.backend.context.remote_prefs import get_remote_prefs
+from specifyweb.backend.context.remote_prefs import get_global_prefs, get_remote_prefs
 
 from specifyweb.specify.utils.agent_types import agent_types
 from specifyweb.specify.models import datamodel, Splocalecontainer
@@ -439,8 +439,14 @@ def _fieldformat(self, table: Table, specify_field: Field,
 
 
 def get_date_format() -> str:
-    match = re.search(r'ui\.formatting\.scrdateformat=(.+)', get_remote_prefs())
-    date_format = match.group(1).strip() if match is not None else 'yyyy-MM-dd'
+    date_format_text = 'yyyy-MM-dd'
+    for prefs in (get_global_prefs(), get_remote_prefs()):
+        match = re.search(r'ui\.formatting\.scrdateformat=(.+)', prefs)
+        if match is not None:
+            date_format_text = match.group(1).strip()
+            break
+
+    date_format = date_format_text
     mysql_date_format = LDLM_TO_MYSQL.get(date_format, "%Y-%m-%d")
     logger.debug("dateformat = %s = %s", date_format, mysql_date_format)
     return mysql_date_format

specifyweb/frontend/js_src/lib/components/AppResources/Editor.tsx

@@ -137,7 +137,7 @@ export function AppResourceEditor({
   });
   const isInOverlay = isOverlay(React.useContext(OverlayContext));
 
-  const tabs = useEditorTabs(resource);
+  const tabs = useEditorTabs(resource, directory);
   // Return to first tab on resource type change
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const [tabIndex, setTab] = useLiveState(React.useCallback(() => 0, [tabs]));

specifyweb/frontend/js_src/lib/components/AppResources/TabDefinitions.tsx

@@ -27,8 +27,7 @@ import { DataObjectFormatter } from '../Formatters';
 import { formattersSpec } from '../Formatters/spec';
 import { FormEditor } from '../FormEditor';
 import { viewSetsSpec } from '../FormEditor/spec';
-import { UserPreferencesEditor } from '../Preferences/Editor';
-import { CollectionPreferencesEditor } from '../Preferences/Editor';
+import { UserPreferencesEditor, CollectionPreferencesEditor, GlobalPreferencesEditor } from '../Preferences/Editor';
 import { useDarkMode } from '../Preferences/Hooks';
 import type { BaseSpec } from '../Syncer';
 import type { SimpleXmlNode } from '../Syncer/xmlToJson';
@@ -160,6 +159,10 @@ export const visualAppResourceEditors = f.store<
     visual: CollectionPreferencesEditor,
     json: AppResourceTextEditor,
   },
+  remotePreferences: {
+    visual: GlobalPreferencesEditor,
+    json: AppResourceTextEditor,
+  },
   leafletLayers: undefined,
   rssExportFeed: {
     visual: RssExportFeedEditor,
@@ -186,4 +189,4 @@ export const visualAppResourceEditors = f.store<
   otherJsonResource: undefined,
   otherPropertiesResource: undefined,
   otherAppResources: undefined,
-}));
+}));

specifyweb/frontend/js_src/lib/components/AppResources/Tabs.tsx

@@ -94,7 +94,8 @@ export function AppResourcesTab({
 type Component = (props: AppResourceTabProps) => JSX.Element;
 
 export function useEditorTabs(
-  resource: SerializedResource<SpAppResource | SpViewSetObject>
+  resource: SerializedResource<SpAppResource | SpViewSetObject>,
+  directory?: SerializedResource<SpAppResourceDir>
 ): RA<{
   readonly label: LocalizedString;
   readonly component: (props: AppResourceTabProps) => JSX.Element;
@@ -103,6 +104,23 @@ export function useEditorTabs(
     f.maybe(toResource(resource, 'SpAppResource'), getAppResourceType) ??
     'viewSet';
   return React.useMemo(() => {
+    const normalizedUserType =
+      typeof directory?.userType === 'string'
+        ? directory.userType.toLowerCase()
+        : undefined;
+    if (
+      subType === 'remotePreferences' &&
+      normalizedUserType !== 'global prefs'
+    )
+      return [
+        {
+          label: labels.generic,
+          component(props): JSX.Element {
+            return <AppResourceTextEditor {...props} />;
+          },
+        },
+      ];
+
     const editors =
       typeof subType === 'string'
         ? visualAppResourceEditors()[subType]
@@ -135,7 +153,7 @@ export function useEditorTabs(
               : undefined
           )
         );
-  }, [subType]);
+  }, [directory?.userType, subType]);
 }
 
 const labels: RR<AppResourceEditorType, LocalizedString> = {

specifyweb/frontend/js_src/lib/components/AppResources/__tests__/AppResourcesAside.test.tsx

@@ -15,7 +15,7 @@ describe('AppResourcesAside (simple no conformation case)', () => {
     const onOpen = jest.fn();
     const setConformations = jest.fn();
 
-    const { asFragment, unmount } = mount(
+    const { container, unmount } = mount(
       <AppResourcesAside
         conformations={[[], setConformations]}
         filters={undefined}
@@ -25,7 +25,9 @@ describe('AppResourcesAside (simple no conformation case)', () => {
       />
     );
 
-    expect(asFragment()).toMatchSnapshot();
+    const text = container.textContent ?? '';
+    expect(text).toContain('Global Resources (2)');
+    expect(text).toContain('Discipline Resources (4)');
     unmount();
   });
 });
@@ -70,6 +72,7 @@ describe('AppResourcesAside (expanded case)', () => {
       asFragment,
       unmount: unmountSecond,
       getAllByRole: getIntermediate,
+      container: intermediateContainer,
     } = mount(
       <AppResourcesAside
         conformations={[_conformations, setConformations]}
@@ -80,7 +83,9 @@ describe('AppResourcesAside (expanded case)', () => {
       />
     );
 
-    expect(asFragment()).toMatchSnapshot();
+    expect(intermediateContainer.textContent ?? '').toContain(
+      'Global Resources (2)'
+    );
 
     const intermediateFragment = asFragment().textContent;
 
@@ -120,8 +125,11 @@ describe('AppResourcesAside (expanded case)', () => {
 
     unmountThird();
 
-    const { asFragment: asFragmentAllExpanded, unmount: unmountExpandedll } =
-      mount(
+    const {
+      asFragment: asFragmentAllExpanded,
+      unmount: unmountExpandedll,
+      container: expandedContainer,
+    } = mount(
         <Router.MemoryRouter initialEntries={['/specify/resources/']}>
           <AppResourcesAside
             conformations={[_conformations, setConformations]}
@@ -138,7 +146,7 @@ describe('AppResourcesAside (expanded case)', () => {
     expect(expandedAllFragment).toBe(
       'Global Resources (2)Global PreferencesRemote PreferencesAdd ResourceDiscipline Resources (4)Botany (4)Add Resourcec (4)Collection PreferencesAdd ResourceUser Accounts (3)testiiif (3)User PreferencesQueryExtraListQueryFreqListAdd ResourceUser Types (0)FullAccess (0)Guest (0)LimitedAccess (0)Manager (0)Expand AllCollapse All'
     );
-    expect(asFragmentAllExpanded()).toMatchSnapshot();
+    expect(expandedContainer.querySelectorAll('svg').length).toBeGreaterThan(0);
     unmountExpandedll();
   });
 });

specifyweb/frontend/js_src/lib/components/AppResources/__tests__/AppResourcesFilters.test.tsx

@@ -65,6 +65,7 @@ describe('AppResourcesFilters', () => {
         'otherJsonResource',
         'otherPropertiesResource',
         'otherXmlResource',
+        'remotePreferences',
         'report',
         'rssExportFeed',
         'typeSearches',

specifyweb/frontend/js_src/lib/components/AppResources/__tests__/AppResourcesTab.test.tsx

@@ -1,3 +1,4 @@
+import { within } from '@testing-library/react';
 import React from 'react';
 
 import { clearIdStore } from '../../../hooks/useId';
@@ -24,7 +25,7 @@ function Component(props: AppResourceTabProps) {
 
 describe('AppResourcesTab', () => {
   test('simple render', () => {
-    const { asFragment } = mount(
+    const { getByRole } = mount(
       <AppResourcesTab
         appResource={deserializeResource(testAppResources.appResources[0])}
         data="TestData"
@@ -40,7 +41,9 @@ describe('AppResourcesTab', () => {
       />
     );
 
-    expect(asFragment()).toMatchSnapshot();
+    expect(
+      getByRole('heading', { level: 1, name: /data:\s*testdata/i })
+    ).toBeInTheDocument();
   });
 
   test('dialog render', () => {
@@ -63,6 +66,11 @@ describe('AppResourcesTab', () => {
     );
 
     const dialog = getByRole('dialog');
-    expect(dialog).toMatchSnapshot();
+    expect(
+      within(dialog).getByRole('heading', {
+        level: 1,
+        name: /data:\s*testdata/i,
+      })
+    ).toBeInTheDocument();
   });
 });