(core) updates from grist-core

app/client/ui/CustomSectionConfig.ts

@@ -551,10 +551,12 @@ export class CustomSectionConfig extends Disposable {
     // Options for the select-box (all widgets definitions and Custom URL)
     const options = Computed.create(holder, use => [
       {label: 'Custom URL', value: 'custom'},
-      ...(use(this._widgets) || []).map(w => ({
-        label: w.source?.name ? `${w.name} (${w.source.name})` : w.name,
-        value: (w.source?.pluginId || '') + ':' + w.widgetId,
-      })),
+      ...(use(this._widgets) || [])
+           .filter(w => w?.published !== false)
+           .map(w => ({
+             label: w.source?.name ? `${w.name} (${w.source.name})` : w.name,
+             value: (w.source?.pluginId || '') + ':' + w.widgetId,
+           })),
     ]);
     function buildPrompt(level: AccessLevel|null) {
       if (!level) {

app/common/CustomWidget.ts

@@ -31,6 +31,11 @@ export interface ICustomWidget {
    */
   renderAfterReady?: boolean;
 
+  /**
+   * If set to false, do not offer to user in UI.
+   */
+  published?: boolean;
+
   /**
    * If the widget came from a plugin, we track that here.
    */

app/common/gristUrls.ts

@@ -167,6 +167,12 @@ export interface OrgUrlInfo {
   orgInPath?: string;     // If /o/{orgInPath} should be used to access the requested org.
 }
 
+function isDocInternalUrl(host: string) {
+  if (!process.env.APP_DOC_INTERNAL_URL) { return false; }
+  const internalUrl = new URL('/', process.env.APP_DOC_INTERNAL_URL);
+  return internalUrl.host === host;
+}
+
 /**
  * Given host (optionally with port), baseDomain, and pluginUrl, determine whether to interpret host
  * as a custom domain, a native domain, or a plugin domain.
@@ -184,8 +190,10 @@ export function getHostType(host: string, options: {
 
   const hostname = host.split(":")[0];
   if (!options.baseDomain) { return 'native'; }
-  if (hostname !== 'localhost' && !hostname.endsWith(options.baseDomain)) { return 'custom'; }
-  return 'native';
+  if (hostname === 'localhost' || isDocInternalUrl(host) || hostname.endsWith(options.baseDomain)) {
+    return 'native';
+  }
+  return 'custom';
 }
 
 export function getOrgUrlInfo(newOrg: string, currentHost: string, options: OrgUrlOptions): OrgUrlInfo {

app/server/lib/WidgetRepository.ts

@@ -209,8 +209,8 @@ class CachedWidgetRepository extends WidgetRepositoryImpl {
     return list;
   }
 
-  public testOverrideUrl(url: string) {
-    super.testOverrideUrl(url);
+  public testOverrideUrl(overrideUrl: string) {
+    super.testOverrideUrl(overrideUrl);
     this._cache.reset();
   }
 }
@@ -267,7 +267,7 @@ export function getWidgetsInPlugins(gristServer: GristServer,
         gristServer.getTag() + '/widgets/' + plugin.id + '/';
     places.push({
       urlBase,
-      dir: plugin.path,
+      dir: path.resolve(plugin.path, path.dirname(components.widgets)),
       file: path.join(plugin.path, components.widgets),
       name: plugin.manifest.name || plugin.id,
       pluginId: plugin.id,