resolve conflict while merging

Author: Thomasr

client/packages/lowcoder/src/comps/utils/remote.ts

@@ -39,7 +39,7 @@ export function parseCompType(compType: string) {
 }
 
 export async function getNpmPackageMeta(packageName: string) {
-  const res = await axios.get<NpmPackageMeta>(`${NPM_REGISTRY_URL}/${packageName}/`);
+  const res = await axios.get<NpmPackageMeta>(`${NPM_REGISTRY_URL}/${packageName}`);
   if (res.status >= 400) {
     return null;
   }

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -2623,6 +2623,8 @@ export const en = {
     "APIConsumptionDescription": "Here you can see the API Consumption for All Apps in the Current Workspace.",
     "overallAPIConsumption": "Overall API Consumption in this Workspace till now",
     "lastMonthAPIConsumption": "Last Month API Consumption, in this Workspace",
+    "npmRegistryTitle": "Custom NPM Registry",
+    "npmRegistryHelp": "Setup a custom NPM Registry to enable fetching of plugins from a private NPM registry.",
     "showHeaderInPublicApps": "Show Header In Public View",
     "showHeaderInPublicAppsHelp": "Set visibility of header in public view for all apps",
   },
@@ -2988,6 +2990,20 @@ export const en = {
     "createAppContent": "Welcome! Click 'App' and Start to Create Your First Application.",
     "createAppTitle": "Create App"
   },
+  "npmRegistry": {
+    "npmRegistryEnable": "Enable custom NPM Registry",
+    "npmRegistryUrl": "NPM Registry Url",
+    "npmRegistryUrlRequired": "Please input the registry URL",
+    "npmRegistryUrlInvalid": "Please input a valid URL",
+    "npmRegistryScope": "Package Scope",
+    "npmRegistryPattern": "Pattern",
+    "npmRegistryPatternInvalid": "Please input a valid pattern (starting with @ for oragnizations).",
+    "npmRegistryAuth": "Authentication",
+    "npmRegistryAuthType": "Authentication Type",
+    "npmRegistryAuthCredentials": "Authentication Credentials",
+    "npmRegistryAuthCredentialsRequired": "Please input the registry credentials",
+    "npmRegistryAuthCredentialsHelp": "For basic auth provide the base64 encoded username and password in the format 'base64(username:password)', for token auth provide the token.",
+  },
 
 
   // nineteenth part

client/packages/lowcoder/src/pages/editor/right/PluginPanel/PluginItem.tsx

@@ -67,7 +67,7 @@ export function PluginItem(props: PluginViewProps) {
 
   useEffect(() => {
     setLoading(true);
-    axios.get<NpmPackageMeta>(`${NPM_REGISTRY_URL}/${name}/`).then((res) => {
+    axios.get<NpmPackageMeta>(`${NPM_REGISTRY_URL}/${name}`).then((res) => {
       if (res.status >= 400) {
         return;
       }

client/packages/lowcoder/src/pages/setting/advanced/AdvancedSetting.tsx

@@ -2,7 +2,7 @@ import { EmptyContent } from "components/EmptyContent";
 import { HelpText } from "components/HelpText";
 import { GreyTextColor } from "constants/style";
 import { CustomModal, CustomSelect, TacoButton } from "lowcoder-design";
-import React, { lazy, useEffect, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { fetchCommonSettings, setCommonSettings } from "redux/reduxActions/commonSettingsActions";
 import { getCommonSettings } from "redux/selectors/commonSettingSelectors";
@@ -25,6 +25,8 @@ import { getGlobalSettings } from "comps/utils/globalSettings";
 import { fetchJSLibrary } from "util/jsLibraryUtils";
 import { evalFunc } from "lowcoder-core";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
+import { NpmRegistryConfig } from "@lowcoder-ee/components/NpmRegistryConfig";
+import { NpmRegistryConfigEntry } from "@lowcoder-ee/redux/reducers/uiReducers/commonSettingsReducer";
 import { default as Switch } from "antd/es/switch";
 
 const CodeEditor = lazy(
@@ -306,6 +308,20 @@ export function AdvancedSetting() {
             />
           )}
         </div>
+        <div className="section-title">{trans("advanced.npmRegistryTitle")}</div>
+        <HelpText style={{ marginBottom: 12 }}>{trans("advanced.npmRegistryHelp")}</HelpText>
+        <div className="section-content">
+          <div>
+            <NpmRegistryConfig initialData={settings.npmRegistries?.at(0)} onSave={(config: NpmRegistryConfigEntry|null) => { 
+              // Wrap in array to enable future option for multiple registries
+              if (config === null) {
+                handleSave("npmRegistries")([]);
+              } else {
+                handleSave("npmRegistries")([config]);
+              }
+            }} />
+          </div>
+        </div>
         {extraAdvanceSettings}
         <div className="section-title">{trans("advanced.APIConsumption")}</div>
         <HelpText style={{ marginBottom: 12 }}>{trans("advanced.APIConsumptionDescription")}</HelpText>

server/node-service/src/plugins/index.ts

@@ -8,7 +8,6 @@ import couchdbPlugin from "./couchdb";
 import wooCommercePlugin from "./woocommerce";
 import openAiPlugin from "./openAi";
 import athenaPlugin from "./athena";
-// we have troubles with the Binaries and need to fix it asap
 // import duckdbPlugin from "./duckdb";
 import lambdaPlugin from "./lambda";
 import googleCloudStorage from "./googleCloudStorage";