fixes

Author: kwhuber

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

@@ -46,11 +46,23 @@ import { AppResourcesTab, useEditorTabs } from './Tabs';
 import { getScope } from './tree';
 import type { ScopedAppResourceDir } from './types';
 import { appResourceSubTypes } from './types';
+import { replaceViewsetNameInXml } from './xmlUtils';
 
 export const AppResourceContext = React.createContext<
   SpecifyResource<SpAppResource>
 >(undefined!);
 
+const syncViewsetNameInXml = (
+  data: string | null | undefined,
+  appResource: SpecifyResource<SpAppResource | SpViewSetObject>
+): string => {
+  const viewSet = toTable(appResource, 'SpViewSetObj');
+  const name = viewSet?.get('name');
+  if (typeof data !== 'string') return data ?? '';
+  if (typeof name !== 'string' || name.length === 0) return data;
+  return replaceViewsetNameInXml(data, name);
+};
+
 export function AppResourceEditor({
   resource,
   directory,
@@ -291,9 +303,13 @@ export function AppResourceEditor({
                   typeof lastDataRef.current === 'function'
                     ? lastDataRef.current()
                     : lastDataRef.current;
+                const syncedData = syncViewsetNameInXml(
+                  data === undefined ? resourceData.data : data,
+                  appResource
+                );
                 const appResourceData = deserializeResource({
                   ...resourceData,
-                  data: data === undefined ? resourceData.data : data,
+                  data: syncedData,
                   spAppResource:
                     toTable(appResource, 'SpAppResource')?.get(
                       'resource_uri'

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

@@ -32,6 +32,7 @@ import type { AppResourcesOutlet } from './index';
 import { globalResourceKey } from './tree';
 import type { ScopedAppResourceDir } from './types';
 import { appResourceSubTypes } from './types';
+import { replaceViewsetNameInXml } from './xmlUtils';
 
 export function AppResourceView(): JSX.Element {
   return <Wrapper mode="appResources" />;
@@ -197,50 +198,33 @@ function useAppResource(
   );
 }
 
-/*
- * REFACTOR:
- * Split this function up.
- * Currently, the resource is not needed until subtype needs to be determined.
- * All the functionality that does not depend on resource should be part of a different
- * function.
- */
 function useInitialData(
   resource: SerializedResource<SpAppResource | SpViewSetObj>,
   initialDataFrom: number | undefined,
   templateFile: string | undefined
 ): string | false | undefined {
   return useAsyncState(
     React.useCallback(async () => {
-      const escapeXml = (s: string): string =>
-        s
-          .replace(/&/g, '&amp;')
-          .replace(/</g, '&lt;')
-          .replace(/>/g, '&gt;')
-          .replace(/"/g, '&quot;');
-
       const replaceViewsetName = (data: string | null | undefined): string => {
-        const xml = data ?? '';
         const resourceName = (resource as any)?.name ?? '';
-        if (typeof resourceName !== 'string' || resourceName.length === 0)
-          return xml;
-        return xml.replace(
-          /(<viewset\b[^>]*\bname=)(["])(.*?)\2/,
-          (_match, p1, p2) => `${p1}${p2}${escapeXml(resourceName)}${p2}`
-        );
+        return replaceViewsetNameInXml(data, resourceName);
       };
 
-      if (typeof initialDataFrom === 'number') {
-        const { data } = await fetchResource('SpAppResourceData', initialDataFrom);
-        return replaceViewsetName(data);
-      }
-      if (typeof templateFile === 'string') {
-       try {
-        const { data } = await ajax(`/static/config/${templateFile}`, { headers: {} });
-        return replaceViewsetName(data);
-      } catch {
-        return '';
+      if (typeof initialDataFrom === 'number')
+        return fetchResource('SpAppResourceData', initialDataFrom).then(
+          ({ data }) => replaceViewsetName(data ?? ''));
+      else if (typeof templateFile === 'string') {
+        if (templateFile.includes('..'))
+          console.error(
+            'Relative paths not allowed. Path is always relative to /static/config/'
+          );
+        else
+          return ajax(`/static/config/${templateFile}`, {
+            headers: {},
+          })
+            .then(({ data }) => replaceViewsetName(data))
+            .catch(() => '');
       }
-    }
       const subType = f.maybe(
         toResource(resource, 'SpAppResource'),
         getAppResourceType
@@ -250,15 +234,13 @@ function useInitialData(
         const useTemplate =
           typeof type.name === 'string' &&
           (!('useTemplate' in type) || type.useTemplate);
-        if (useTemplate) {
-          const { data } = await ajax(getAppResourceUrl(type.name, 'quiet'), {
+        if (useTemplate)
+          return ajax(getAppResourceUrl(type.name, 'quiet'), {
             headers: {},
-          });
-          return replaceViewsetName(data);
-        }
+          }).then(({ data }) => replaceViewsetName(data));
       }
       return false;
-    }, [initialDataFrom, templateFile, resource]),
+    }, [initialDataFrom, templateFile]),
     false
   )[0];
 }

specifyweb/frontend/js_src/lib/components/AppResources/xmlUtils.ts

@@ -0,0 +1,23 @@
+// shared utilities for XML manipulation in AppResources
+export const escapeXml = (value: string): string =>
+  value
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+
+// replace the viewset name attribute in XML content
+export const replaceViewsetNameInXml = (
+  data: string | null | undefined,
+  resourceName: string
+): string => {
+  const xml = data ?? '';
+  if (typeof resourceName !== 'string' || resourceName.length === 0)
+    return xml;
+  return xml.replace(
+    /(<viewset\b[^>]*\bname=)([\"])(.*?)\2/,
+    (_match, prefix, quote) => `${prefix}${quote}${escapeXml(resourceName)}${quote}`
+  );
+};
+
+