Merge remote-tracking branch 'upstream/main' into fix_default_query

changelogs/fragments/8680.yml

@@ -0,0 +1,2 @@
+refactor:
+- Update change access modal display name ([#8680](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8680))

changelogs/fragments/8719.yml

@@ -0,0 +1,2 @@
+fix:
+- Generate short url with workspace info ([#8719](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8719))

src/core/server/index.ts

@@ -373,7 +373,12 @@ export {
 } from './metrics';
 
 export { AppCategory, WorkspaceAttribute, PermissionModeId } from '../types';
-export { DEFAULT_APP_CATEGORIES, WORKSPACE_TYPE, DEFAULT_NAV_GROUPS } from '../utils';
+export {
+  DEFAULT_APP_CATEGORIES,
+  WORKSPACE_TYPE,
+  DEFAULT_NAV_GROUPS,
+  WORKSPACE_PATH_PREFIX,
+} from '../utils';
 
 export {
   SavedObject,
@@ -553,5 +558,3 @@ export const config = {
     appenders: appendersSchema as Type<AppenderConfigType>,
   },
 };
-
-export { getRedirectUrl } from './http';

src/plugins/data/public/query/query_string/query_history.ts

@@ -14,12 +14,12 @@ export const HISTORY_KEY_PREFIX = 'query_';
 export class QueryHistory {
   private changeEmitter: BehaviorSubject<any[]>;
 
-  constructor(private readonly storage: DataStorage) {
+  constructor(private readonly sessionStorage: DataStorage) {
     this.changeEmitter = new BehaviorSubject<any[]>(this.getHistory());
   }
 
   public getHistoryKeys(): string[] {
-    return this.storage
+    return this.sessionStorage
       .keys()
       .filter((key: string) => key.startsWith(HISTORY_KEY_PREFIX))
       .sort((a, b) => {
@@ -31,7 +31,7 @@ export class QueryHistory {
 
   public getHistory(): any[] {
     return this.getHistoryKeys()
-      .map((key) => this.storage.get(key))
+      .map((key) => this.sessionStorage.get(key))
       .sort((a, b) => b.time - a.time);
   }
 
@@ -45,13 +45,13 @@ export class QueryHistory {
 
     // Check if the query already exists
     const existingKey = existingKeys.find((key) => {
-      const item = this.storage.get(key);
+      const item = this.sessionStorage.get(key);
       return item && item.query.query === query.query && item.query.language === query.language;
     });
 
     if (existingKey) {
       // If the query exists, remove it from its current position
-      this.storage.remove(existingKey);
+      this.sessionStorage.remove(existingKey);
       existingKeys.splice(existingKeys.indexOf(existingKey), 1);
     }
 
@@ -64,24 +64,24 @@ export class QueryHistory {
       dateRange,
       id: uuid.v4(),
     };
-    this.storage.set(newKey, newItem);
+    this.sessionStorage.set(newKey, newItem);
 
     // Trim the history if it exceeds the maximum size
     if (existingKeys.length >= MAX_HISTORY_SIZE) {
       const keysToRemove = existingKeys.slice(MAX_HISTORY_SIZE - 1);
-      keysToRemove.forEach((key) => this.storage.remove(key));
+      keysToRemove.forEach((key) => this.sessionStorage.remove(key));
     }
 
     // Emit the updated history
     this.changeEmitter.next(this.getHistory());
   }
 
   public clearHistory(): void {
-    this.getHistoryKeys().forEach((key) => this.storage.remove(key));
+    this.getHistoryKeys().forEach((key) => this.sessionStorage.remove(key));
     this.changeEmitter.next([]);
   }
 }
 
-export function createHistory(deps: { storage: DataStorage }): QueryHistory {
-  return new QueryHistory(deps.storage);
+export function createHistory(deps: { sessionStorage: DataStorage }): QueryHistory {
+  return new QueryHistory(deps.sessionStorage);
 }

src/plugins/data/public/query/query_string/query_string_manager.ts

@@ -54,7 +54,7 @@ export class QueryStringManager {
     private readonly notifications: NotificationsSetup
   ) {
     this.query$ = new BehaviorSubject<Query>(this.getDefaultQuery());
-    this.queryHistory = createHistory({ storage });
+    this.queryHistory = new QueryHistory(this.sessionStorage);
     this.datasetService = new DatasetService(uiSettings, this.sessionStorage);
     this.languageService = new LanguageService(this.defaultSearchInterceptor, this.storage);
   }

src/plugins/query_enhancements/public/query_assist/components/query_assist_banner.tsx

@@ -15,7 +15,7 @@ import {
 import { FormattedMessage } from '@osd/i18n/react';
 import React, { useState } from 'react';
 import { QueryEditorExtensionDependencies } from '../../../../data/public';
-import assistantMark from '../../assets/query_assist_mark.svg';
+import assistantMark from '../../assets/sparkle_mark.svg';
 import { getStorage } from '../../services';
 
 const BANNER_STORAGE_KEY = 'queryAssist:banner:show';

src/plugins/query_enhancements/public/query_assist/components/query_assist_input.tsx

@@ -7,7 +7,7 @@ import { EuiFieldText, EuiIcon, EuiOutsideClickDetector, EuiPortal } from '@elas
 import { i18n } from '@osd/i18n';
 import React, { useMemo, useState } from 'react';
 import { PersistedLog, QuerySuggestionTypes } from '../../../../data/public';
-import assistantMark from '../../assets/query_assist_mark.svg';
+import assistantMark from '../../assets/sparkle_mark.svg';
 import { getData } from '../../services';
 import { AgentError } from '../utils';
 import { WarningBadge } from './warning_badge';

src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx

@@ -16,7 +16,7 @@ import {
 } from '../../../../data/public';
 import { API } from '../../../common';
 import { ConfigSchema } from '../../../common/config';
-import assistantMark from '../../assets/query_assist_mark.svg';
+import assistantMark from '../../assets/sparkle_mark.svg';
 import {
   QueryAssistBanner,
   QueryAssistBar,

src/plugins/query_enhancements/server/routes/data_source_connection/routes.ts

@@ -31,7 +31,12 @@ export function registerDataSourceConnectionsRoutes(
         if (error.statusCode === 404 || error.statusCode === 400) {
           return response.ok({ body: [] });
         }
-        return response.custom({ statusCode: error.statusCode || 500, body: error.message });
+        // Transform 500 errors to 503 to indicate service availability issues
+        const statusCode = error.statusCode === 500 ? 503 : error.statusCode || 503;
+        return response.custom({
+          statusCode,
+          body: error.message,
+        });
       }
     }
   );

src/plugins/share/public/services/share_menu_manager.tsx

@@ -56,7 +56,7 @@ export class ShareMenuManager {
           ...options,
           menuItems,
           post: core.http.post,
-          basePath: core.http.basePath.get(),
+          basePath: core.http.basePath.getBasePath(),
         });
       },
     };

src/plugins/share/server/routes/goto.ts

@@ -35,8 +35,6 @@ import { modifyUrl } from '@osd/std';
 import { shortUrlAssertValid } from './lib/short_url_assert_valid';
 import { ShortUrlLookupService } from './lib/short_url_lookup';
 import { getGotoPath } from '../../common/short_url_routes';
-import { getWorkspaceState } from '../../../../core/server/utils';
-import { getRedirectUrl } from '../../../../core/server';
 
 export const createGotoRoute = ({
   router,
@@ -67,15 +65,7 @@ export const createGotoRoute = ({
 
         const prependedUrl = modifyUrl(url, (parts) => {
           if (!parts.hostname && parts.pathname && parts.pathname.startsWith('/')) {
-            if (getWorkspaceState(request).requestWorkspaceId) {
-              parts.pathname = getRedirectUrl({
-                request,
-                nextUrl: parts.pathname,
-                basePath,
-              });
-            } else {
-              parts.pathname = `${basePath}${parts.pathname}`;
-            }
+            parts.pathname = `${basePath}${parts.pathname}`;
           }
         });
         return response.redirected({

src/plugins/share/server/routes/lib/short_url_assert_valid.test.ts

@@ -49,6 +49,7 @@ describe('shortUrlAssertValid()', () => {
     ['path with an extra leading slash', '///app/opensearch-dashboards', HOSTNAME_ERROR], // parser detects '' as the hostname
     ['path without app', '/foo/opensearch-dashboards', PATH_ERROR], // fails because first path part is not 'app'
     ['path without appId', '/app/', PATH_ERROR], // fails because there is only one path part (leading and trailing slashes are trimmed)
+    '/w/app/dashboards', // fails because it is not a standard workspace path
   ];
 
   invalid.forEach(([desc, url, error]) => {
@@ -67,6 +68,7 @@ describe('shortUrlAssertValid()', () => {
     '/app/some?with=query',
     '/app/some?with=query#and-a-hash',
     '/app/some/deeper?with=query#and-a-hash',
+    '/w/workspaceid/app/foo',
   ];
 
   valid.forEach((url) => {

src/plugins/share/server/routes/lib/short_url_assert_valid.ts

@@ -31,6 +31,7 @@
 import { parse } from 'url';
 import { trim } from 'lodash';
 import Boom from '@hapi/boom';
+import { WORKSPACE_PATH_PREFIX } from '../../../../../core/server';
 
 export function shortUrlAssertValid(url: string) {
   const { protocol, hostname, pathname } = parse(
@@ -47,7 +48,13 @@ export function shortUrlAssertValid(url: string) {
     throw Boom.notAcceptable(`Short url targets cannot have a hostname, found "${hostname}"`);
   }
 
-  const pathnameParts = trim(pathname === null ? undefined : pathname, '/').split('/');
+  let pathnameParts = trim(pathname === null ? undefined : pathname, '/').split('/');
+
+  // Workspace introduced paths like `/w/${workspaceId}/app`
+  // ignore the first 2 elements if it starts with /w
+  if (`/${pathnameParts[0]}` === WORKSPACE_PATH_PREFIX) {
+    pathnameParts = pathnameParts.slice(2);
+  }
   if (pathnameParts[0] !== 'app' || !pathnameParts[1]) {
     throw Boom.notAcceptable(
       `Short url target path must be in the format "/app/{{appId}}", found "${pathname}"`

src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.tsx

@@ -305,7 +305,7 @@ export const WorkspaceCollaboratorTable = ({
                   values: {
                     numCollaborators: selections.length,
                     pluralSuffix: selections.length > 1 ? 's' : '',
-                    accessLevel: type,
+                    accessLevel: WORKSPACE_ACCESS_LEVEL_NAMES[type],
                   },
                 })}
           </p>