Fixed issues with hyperlink selector. (#2821)

azaslonov · web-flow · commit 0e913331dfa9 · 2025-06-19T08:31:10.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
         "azure"
     ],
     "engines": {
-        "node": ">=14.18.2 <21"
+        "node": ">18 <23"
     },
     "scripts": {
         "start": "webpack-dev-server --open --config webpack.develop.js",
@@ -92,12 +92,12 @@
         "@microsoft/applicationinsights-web": "^3.0.2",
         "@monaco-editor/loader": "^1.3.3",
         "@monaco-editor/react": "^4.6.0",
-        "@paperbits/azure": "^0.1.643",
-        "@paperbits/common": "^0.1.643",
-        "@paperbits/core": "^0.1.643",
-        "@paperbits/forms": "^0.1.643",
+        "@paperbits/azure": "0.1.649",
+        "@paperbits/common": "0.1.649",
+        "@paperbits/core": "0.1.649",
+        "@paperbits/forms": "0.1.649",
         "@paperbits/react": "1.0.8",
-        "@paperbits/styles": "^0.1.643",
+        "@paperbits/styles": "0.1.649",
         "@webcomponents/custom-elements": "1.6.0",
         "@webcomponents/shadydom": "^1.11.0",
         "client-oauth2": "4.3.3",
diff --git a/src/admin/custom-widgets/customWidgetDetailsModal.tsx b/src/admin/custom-widgets/customWidgetDetailsModal.tsx
@@ -10,7 +10,7 @@ import { CustomWidgetEditorViewModel, CustomWidgetViewModel, CustomWidgetViewMod
 import { CustomWidgetHandlers, CustomWidgetModelBinder, TCustomWidgetConfig, widgetCategory } from '../../components/custom-widget';
 import { CustomWidgetModel } from '../../components/custom-widget/customWidgetModel';
 import fallbackUi from '!!raw-loader!../../components/custom-widget-list/fallbackUi.html';
-import { MapiBlobStorage } from '../../persistence';
+import { MapiBlobStorage } from '../../persistence/mapiBlobStorage.browser';
 import { ChoiceGroup, CommandBarButton, DefaultButton, IChoiceGroupOption, Icon, IIconProps, Link, Modal, PrimaryButton, Stack, Text, TextField } from '@fluentui/react';
 import { DeleteConfirmationOverlay } from '../utils/components/deleteConfirmationOverlay';
 import { CopyableTextField } from '../utils/components/copyableTextField';
diff --git a/src/admin/custom-widgets/customWidgets.tsx b/src/admin/custom-widgets/customWidgets.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Resolve } from '@paperbits/react/decorators';
 import { ViewManager } from '@paperbits/common/ui';
-import { MapiBlobStorage } from '../../persistence';
+import { MapiBlobStorage } from '../../persistence/mapiBlobStorage.browser';
 import { TCustomWidgetConfig } from '../../components/custom-widget';
 import { listConfigBlobs, loadCustomWidgetConfigs } from '../../components/custom-widget-list/loadCustomWidgetConfigs';
 import { CommandBarButton, FontIcon, IIconProps, Spinner, Stack, Text } from '@fluentui/react';
diff --git a/src/apim.design.module.ts b/src/apim.design.module.ts
@@ -3,8 +3,8 @@ import * as Constants from "./constants";
 import "./bindingHandlers/codeEditor";
 import "./bindingHandlers/copyToClipboard";
 import { UnsavedChangesRouteGuard } from "./routing/unsavedChangesRouteGuard";
-import { MapiObjectStorage, MapiBlobStorage } from "./persistence";
-import { DefaultAuthenticator } from "./authentication/defaultAuthenticator";
+import { MapiObjectStorage } from "./persistence";
+import { MapiBlobStorage } from "./persistence/mapiBlobStorage.browser";
 import { IInjector, IInjectorModule } from "@paperbits/common/injection";
 import { ConsoleLogger } from "@paperbits/common/logging";
 import { DefaultSessionManager } from "@paperbits/common/persistence/defaultSessionManager";
@@ -54,6 +54,7 @@ import { ArmService } from "./services/armService";
 import { StaticDelegationService } from "./services/staticDelegationService";
 import { NoRetryStrategy } from "./clients/retryStrategy/noRetryStrategy";
 
+
 export class ApimDesignModule implements IInjectorModule {
     public register(injector: IInjector): void {
         injector.bindModule(new SetupModule());
@@ -90,7 +91,6 @@ export class ApimDesignModule implements IInjectorModule {
         injector.bindSingleton("policyService", PolicyService);
         injector.bindSingleton("retryStrategy", NoRetryStrategy);
         injector.bindSingleton("backendService", BackendService);
-
         injector.bindSingleton("objectStorage", MapiObjectStorage);
         injector.bindSingleton("blobStorage", MapiBlobStorage);
         injector.bindToCollection("routeGuards", OldContentRouteGuard);
diff --git a/src/apim.publish.module.ts b/src/apim.publish.module.ts
@@ -3,7 +3,8 @@ import { AadConfigPublisher } from "./publishing/aadConfigPublisher";
 import { IInjector, IInjectorModule } from "@paperbits/common/injection";
 import { ConsoleLogger } from "@paperbits/common/logging";
 import { RoleBasedSecurityPublishModule } from "@paperbits/core/security/roleBasedSecurity.publish.module";
-import { MapiObjectStorage, MapiBlobStorage } from "./persistence";
+import { MapiObjectStorage } from "./persistence";
+import { MapiBlobStorage } from "./persistence/mapiBlobStorage.server";
 import { ListOfApisPublishModule } from "./components/apis/list-of-apis/listOfApis.publish.module";
 import { DetailsOfApiPublishModule } from "./components/apis/details-of-api/detailsOfApi.publish.module";
 import { HistoryOfApiPublishModule } from "./components/apis/history-of-api/historyOfApi.publish.module";
diff --git a/src/components/custom-widget-list/createWidget.ts b/src/components/custom-widget-list/createWidget.ts
@@ -6,7 +6,7 @@ import { IWidgetService } from "@paperbits/common/widgets";
 import { Component, OnMounted, Param } from "@paperbits/common/ko/decorators";
 import * as Utils from "@paperbits/common/utils";
 import { Logger } from "@paperbits/common/logging";
-import { MapiBlobStorage } from "../../persistence";
+import { MapiBlobStorage } from "../../persistence/mapiBlobStorage.browser";
 import { CustomWidgetHandlers, CustomWidgetModelBinder, TCustomWidgetConfig, widgetCategory } from "../custom-widget";
 import { CustomWidgetModel } from "./customWidgetModel";
 import template from "./createWidget.html";
diff --git a/src/components/custom-widget-list/customWidgetList.module.ts b/src/components/custom-widget-list/customWidgetList.module.ts
@@ -1,7 +1,7 @@
 import { ViewManager } from "@paperbits/common/ui";
 import { IWidgetService } from "@paperbits/common/widgets";
 import { IInjectorModule, IInjector } from "@paperbits/common/injection";
-import { MapiBlobStorage } from "../../persistence";
+import { MapiBlobStorage } from "../../persistence/mapiBlobStorage.browser";
 import { CustomWidgetHandlers, CustomWidgetModel, CustomWidgetModelBinder, widgetCategory } from "../custom-widget";
 import { ContentWorkshop } from "./customWidgetList";
 import { OperationsSectionToolButton } from "./operationsSection";
diff --git a/src/components/custom-widget-list/customWidgetList.ts b/src/components/custom-widget-list/customWidgetList.ts
@@ -2,7 +2,7 @@
 import { View, ViewManager } from "@paperbits/common/ui";
 import { IWidgetService } from "@paperbits/common/widgets";
 import { Component } from "@paperbits/common/ko/decorators";
-import { MapiBlobStorage } from "../../persistence";
+import { MapiBlobStorage } from "../../persistence/mapiBlobStorage.browser";
 import { TCustomWidgetConfig } from "../custom-widget";
 import template from "./customWidgetList.html";
 import { listConfigBlobs } from "./loadCustomWidgetConfigs";
diff --git a/src/components/custom-widget-list/loadCustomWidgetConfigs.ts b/src/components/custom-widget-list/loadCustomWidgetConfigs.ts
@@ -2,7 +2,7 @@ import { ViewManager } from "@paperbits/common/ui";
 import { OVERRIDE_PORT_KEY, OVERRIDE_DEFAULT_PORT } from "@azure/api-management-custom-widgets-scaffolder";
 import { BLOB_ROOT, BLOB_CONFIGS_FOLDER, APIM_CONFIG_FILE_NAME } from "@azure/api-management-custom-widgets-tools";
 import * as Constants from "../../constants";
-import { MapiBlobStorage } from "../../persistence";
+import { MapiBlobStorage } from "../../persistence/mapiBlobStorage.browser";
 import { TCustomWidgetConfig } from "../custom-widget";
 
 export async function listConfigBlobs(blobStorage: MapiBlobStorage): Promise<TCustomWidgetConfig[]> {
diff --git a/src/components/custom-widget/ko/customWidgetEditorViewModel.ts b/src/components/custom-widget/ko/customWidgetEditorViewModel.ts
@@ -1,5 +1,4 @@
 import * as ko from "knockout";
-import { Environment } from "@azure/api-management-custom-widgets-tools";
 import { WidgetEditor } from "@paperbits/common/widgets";
 import { Component, Event, OnMounted, Param } from "@paperbits/common/ko/decorators";
 import { SizeStylePluginConfig } from "@paperbits/styles/plugins";
@@ -8,7 +7,7 @@ import { ViewManager } from "@paperbits/common/ui";
 import { EventManager, Events } from "@paperbits/common/events";
 import { ISettingsProvider } from "@paperbits/common/configuration";
 import { iframeAllows, iframeSandboxAllows } from "../../../constants";
-import { MapiBlobStorage } from "../../../persistence";
+import { MapiBlobStorage } from "../../../persistence/mapiBlobStorage.browser";
 import { CustomWidgetModel } from "../customWidgetModel";
 import { widgetEditorSelector } from "..";
 import template from "./customWidgetEditorView.html";
diff --git a/src/components/custom-widget/ko/customWidgetViewModelBinder.ts b/src/components/custom-widget/ko/customWidgetViewModelBinder.ts
@@ -2,7 +2,7 @@ import { Environment } from "@azure/api-management-custom-widgets-tools";
 import { ViewModelBinder, WidgetState } from "@paperbits/common/widgets";
 import { StyleCompiler } from "@paperbits/common/styles";
 import { ISettingsProvider } from "@paperbits/common/configuration";
-import { MapiBlobStorage } from "../../../persistence";
+import { MapiBlobStorage } from "../../../persistence/mapiBlobStorage.browser";
 import { CustomWidgetModel } from "../customWidgetModel";
 import { CustomWidgetViewModel } from "./customWidgetViewModel";
 import { buildWidgetSource } from "./utils";
diff --git a/src/components/custom-widget/ko/utils.ts b/src/components/custom-widget/ko/utils.ts
@@ -8,7 +8,7 @@ import {
     BLOB_DATA_FOLDER
 } from "@azure/api-management-custom-widgets-tools";
 import * as Constants from "../../../constants";
-import { MapiBlobStorage } from "../../../persistence";
+import { MapiBlobStorage } from "../../../persistence/mapiBlobStorage.browser";
 import { CustomWidgetModel } from "../customWidgetModel";
 import { ISettingsProvider } from "@paperbits/common/configuration";
 import { Logger } from "@paperbits/common/logging";
diff --git a/src/persistence/index.ts b/src/persistence/index.ts
@@ -1,2 +1 @@
-export * from "./mapiObjectStorage";
-export * from "./mapiBlobStorage";
+export * from "./mapiObjectStorage";
diff --git a/src/persistence/mapiBlobStorage.browser.ts b/src/persistence/mapiBlobStorage.browser.ts
@@ -1,41 +1,34 @@
-import { AzureBlobStorage } from "@paperbits/azure";
-import { Logger } from "@paperbits/common/logging";
+import { BrowserAzureBlobStorage } from "@paperbits/azure/persistence/azureBlobStorage.browser";
 import { ISettingsProvider } from "@paperbits/common/configuration";
-import { StaticSettingsProvider } from "../configuration/staticSettingsProvider";
-import { Utils } from "../utils";
+import { Logger } from "@paperbits/common/logging/logger";
+import * as Utils from "@paperbits/common/utils";
+import { StaticSettingsProvider } from "../configuration";
 import { TenantService } from "../services/tenantService";
-import { ReadStream } from "fs";
 import { IStreamBlobStorage } from "./IStreamBlobStorage";
 
+
 const defaultContainerName = "content";
 
 export class MapiBlobStorage implements IStreamBlobStorage {
-    private storageClient: AzureBlobStorage;
+    private azureStorageClient: IStreamBlobStorage;
 
     constructor(
+        private readonly logger: Logger,
         private readonly tenantService: TenantService,
-        private readonly settingsProvider: ISettingsProvider,
-        private readonly logger: Logger
+        private readonly settingsProvider: ISettingsProvider
     ) { }
 
-    private async getStorageClient(): Promise<AzureBlobStorage> {
-        if (this.storageClient) {
-            return this.storageClient;
+    private async getStorageClient(): Promise<IStreamBlobStorage> {
+        if (this.azureStorageClient) {
+            return this.azureStorageClient;
         }
 
         let storageSettingsProvider: ISettingsProvider;
 
         const blobStorageContainer = await this.settingsProvider.getSetting<string>("blobStorageContainer");
-        const blobStorageConnectionString = await this.settingsProvider.getSetting<string>("blobStorageConnectionString");
         const blobStorageUrl = await this.settingsProvider.getSetting<string>("blobStorageUrl");
 
-        if (blobStorageConnectionString) {
-            storageSettingsProvider = new StaticSettingsProvider({
-                blobStorageConnectionString: blobStorageConnectionString,
-                blobStorageContainer: blobStorageContainer || defaultContainerName
-            });
-        }
-        else if (blobStorageUrl) {
+        if (blobStorageUrl) {
             const parsedUrl = new URL(blobStorageUrl);
 
             const containerSegment = blobStorageContainer
@@ -56,9 +49,8 @@ export class MapiBlobStorage implements IStreamBlobStorage {
             });
         }
 
-        this.storageClient = new AzureBlobStorage(storageSettingsProvider, this.logger);
-
-        return this.storageClient;
+        this.azureStorageClient = new BrowserAzureBlobStorage(storageSettingsProvider, this.logger)
+        return this.azureStorageClient;
     }
 
     /**
@@ -87,7 +79,7 @@ export class MapiBlobStorage implements IStreamBlobStorage {
      */
     public async downloadBlob?(blobKey: string): Promise<Uint8Array> {
         const client = await this.getStorageClient();
-        return await client.downloadBlob(blobKey);
+        return client.downloadBlob(blobKey);
     }
 
     /**
@@ -96,7 +88,7 @@ export class MapiBlobStorage implements IStreamBlobStorage {
      */
     public async getDownloadUrl(blobKey: string): Promise<string> {
         const client = await this.getStorageClient();
-        return await client.getDownloadUrl(blobKey);
+        return client.getDownloadUrl(blobKey);
     }
 
     /**
@@ -115,26 +107,15 @@ export class MapiBlobStorage implements IStreamBlobStorage {
      */
     public async deleteBlob(blobKey: string): Promise<void> {
         const client = await this.getStorageClient();
-        return await client.deleteBlob(blobKey);
-    }
-
-    /**
-     * Uploads specified content into storage in Node.JS
-     * @param blobKey {string} Blob key.
-     * @param content {ReadStream} Content stream.
-     * @param contentType {string} Content type, e.g. `image/png`.
-     */
-    public async uploadStreamToBlob(blobKey: string, contentStream: ReadStream, contentType?: string): Promise<void> {
-        const client = await this.getStorageClient();
-        await client.uploadStreamToBlob(blobKey, contentStream, contentType);
+        return client.deleteBlob(blobKey);
     }
 
     /**
-     * Get blob from storage in Node.JS
+     * Get blob as a stream from storage in Node.JS
      * @param blobKey {string} Blob key.
      */
     public async getBlobAsStream(blobKey: string): Promise<NodeJS.ReadableStream> {
         const client = await this.getStorageClient();
         return client.getBlobAsStream(blobKey);
     }
-}
+}
diff --git a/src/persistence/mapiBlobStorage.server.ts b/src/persistence/mapiBlobStorage.server.ts
@@ -0,0 +1,117 @@
+import { ServerAzureBlobStorage } from "@paperbits/azure/persistence/azureBlobStorage.server";
+import { ISettingsProvider } from "@paperbits/common/configuration";
+import { Logger } from "@paperbits/common/logging/logger";
+import { ReadStream } from "fs";
+import { StaticSettingsProvider } from "../configuration";
+import { TenantService } from "../services/tenantService";
+import { IStreamBlobStorage } from "./IStreamBlobStorage";
+
+const defaultContainerName = "content";
+
+export class MapiBlobStorage implements IStreamBlobStorage {
+    private azureStorageClient: IStreamBlobStorage;
+
+    constructor(
+        private readonly logger: Logger,
+        private readonly tenantService: TenantService,
+        private readonly settingsProvider: ISettingsProvider
+    ) { }
+
+    private async getStorageClient(): Promise<IStreamBlobStorage> {
+        if (this.azureStorageClient) {
+            return this.azureStorageClient;
+        }
+
+        let storageSettingsProvider: ISettingsProvider;
+
+        const blobStorageContainer = await this.settingsProvider.getSetting<string>("blobStorageContainer");
+        const blobStorageConnectionString = await this.settingsProvider.getSetting<string>("blobStorageConnectionString");
+
+        if (blobStorageConnectionString) {
+            storageSettingsProvider = new StaticSettingsProvider({
+                blobStorageConnectionString: blobStorageConnectionString,
+                blobStorageContainer: blobStorageContainer || defaultContainerName
+            });
+        }
+
+        this.azureStorageClient = new ServerAzureBlobStorage(storageSettingsProvider, this.logger)
+        return this.azureStorageClient;
+    }
+
+    /**
+     * Lists all blobs in storage or with specific prefix (in a specific "folder").
+     * @param blobPrefix Blob prefix.
+     */
+    public async listBlobs?(blobPrefix?: string): Promise<string[]> {
+        const client = await this.getStorageClient();
+        return client.listBlobs();
+    }
+
+    /**
+     * Uploads blob with specified key to storage.
+     * @param blobKey Unique blob identifier.
+     * @param content Content in form of byte array.
+     * @param contentType Content type (MIME) of the content.
+     */
+    public async uploadBlob(blobKey: string, content: Uint8Array, contentType?: string): Promise<void> {
+        const client = await this.getStorageClient();
+        return client.uploadBlob(blobKey, content, contentType);
+    }
+
+    /**
+     * Downloads blob with specified key.
+     * @param blobKey Unique blob identifier.
+     */
+    public async downloadBlob?(blobKey: string): Promise<Uint8Array> {
+        const client = await this.getStorageClient();
+        return client.downloadBlob(blobKey);
+    }
+
+    /**
+     * Returns download URL of uploaded blob.
+     * @param blobKey Unique blob identifier.
+     */
+    public async getDownloadUrl(blobKey: string): Promise<string> {
+        const client = await this.getStorageClient();
+        return client.getDownloadUrl(blobKey);
+    }
+
+    /**
+     * Returns download URL of uploaded blob without token.
+     * @param blobKey Unique blob identifier.
+     */
+    public async getDownloadUrlWithoutToken(blobKey: string): Promise<string> {
+        const url = new URL(await this.getDownloadUrl(blobKey));
+        ["sv", "st", "se", "sr", "sp", "sig"].forEach(key => url.searchParams.delete(key));
+        return url.toString();
+    }
+
+    /**
+     * Removes specified blob from memory.
+     * @param blobKey Unique blob identifier.
+     */
+    public async deleteBlob(blobKey: string): Promise<void> {
+        const client = await this.getStorageClient();
+        return client.deleteBlob(blobKey);
+    }
+
+    /**
+     * Uploads specified content into storage in Node.JS
+     * @param blobKey {string} Blob key.
+     * @param content {ReadStream} Content stream.
+     * @param contentType {string} Content type, e.g. `image/png`.
+     */
+    public async uploadStreamToBlob(blobKey: string, contentStream: ReadStream, contentType?: string): Promise<void> {
+        const client = await this.getStorageClient();
+        await client.uploadStreamToBlob(blobKey, contentStream, contentType);
+    }
+
+    /**
+     * Get blob as a stream from storage in Node.JS
+     * @param blobKey {string} Blob key.
+     */
+    public async getBlobAsStream(blobKey: string): Promise<NodeJS.ReadableStream> {
+        const client = await this.getStorageClient();
+        return client.getBlobAsStream(blobKey);
+    }
+}
diff --git a/src/publishing/customWidgetPublisher.ts b/src/publishing/customWidgetPublisher.ts
@@ -2,7 +2,7 @@ import { IPublisher } from "@paperbits/common/publishing";
 import { Logger } from "@paperbits/common/logging";
 import { IStreamBlobStorage } from "../persistence/IStreamBlobStorage";
 import { ReadStream } from "node:fs";
-import { MapiBlobStorage } from "../persistence/mapiBlobStorage";
+import { MapiBlobStorage } from "../persistence/mapiBlobStorage.server";
 import { BLOB_DATA_FOLDER, BLOB_ROOT } from "@azure/api-management-custom-widgets-tools";
 import { WellKnownEventTypes } from "../logging/wellKnownEventTypes";
 
diff --git a/src/services/provisioningService.ts b/src/services/provisioningService.ts
