@@ -56,10 +82,12 @@ export default function PacksReadme() {
setCustomReadme(null);
}
};
- importComponent();
+ importComponent().catch((e) => {
+ console.error("Error importing custom readme component for pack. Additional information follows: \n", e);
+ });
}, []);
- const packData = useMemo(() => {
+ const packData: PackData = useMemo(() => {
const pack = packs.find((pack) => pack.name === packName);
if (pack) {
const packDataInfo: PackReadmeProps = {
@@ -91,24 +119,20 @@ export default function PacksReadme() {
latestVersion: "",
};
}, [packName]);
+
useEffect(() => {
const searchParams = window ? new URLSearchParams(window.location.search) : null;
const urlParamVersion = searchParams?.get("version");
const version = urlParamVersion || packData?.latestVersion || packData?.versions[0]?.title || "";
- let parentVersionObj: any;
if (version && !version.endsWith(".x")) {
- parentVersionObj = getParentVersion(version);
- const packDataObj = parentVersionObj?.children.find((child: any) => child.title === version);
- setSelectedPackUid(packDataObj?.packUid || "");
- setSelectedVersion(version);
+ const parentVersionObj = getParentVersion(version);
+ const packDataObj = parentVersionObj?.children.find((child) => child.title === version);
+ if (packDataObj) {
+ setSelectedPackUid(packDataObj.packUid);
+ setSelectedVersion(version);
+ }
}
}, [packData]);
- let warningContent;
- if (packData.disabled) {
- warningContent = "This pack is disabled. Upgrade to a newer version to take advantage of new features.";
- } else if (selectedPackUid && packData.packUidMap[selectedPackUid]?.deprecated) {
- warningContent = "This pack is deprecated. Upgrade to a newer version to take advantage of new features.";
- }
function versionChange(item: string) {
const [version, packUid] = item.split("===");
@@ -119,32 +143,28 @@ export default function PacksReadme() {
}
function getParentVersion(version: string) {
- return packData.versions.find((tagVersion) => tagVersion.children.find((child: any) => child.title === version));
+ return packData.versions.find((tagVersion) => tagVersion.children.find((child) => child.title === version));
}
function renderVersionOptions() {
- return packData.versions.map((tagVersion) => {
- return {
- value: tagVersion.title,
- title: tagVersion.title,
- selectable: false,
- children: tagVersion.children.map((child: any) => {
- return {
- value: `${child.title}===${child.packUid}`,
- title: {child.title},
- };
- }),
- };
- });
+ return packData.versions.map((tagVersion) => ({
+ value: tagVersion.title,
+ title: tagVersion.title,
+ selectable: false,
+ children: tagVersion.children.map((child) => ({
+ value: `${child.title}===${child.packUid}`,
+ title: {child.title},
+ })),
+ }));
}
function renderTabs() {
- let readme = selectedPackUid ? packData.packUidMap[selectedPackUid]?.readme : "";
+ const readme = selectedPackUid ? packData.packUidMap[selectedPackUid]?.readme : "";
const tabs = [
readme && {
label: `README`,
key: "1",
- children: {readme} ,
},
customReadme && {
label: `Additional Details`,
@@ -156,13 +176,11 @@ export default function PacksReadme() {
if (tabs.length > 1) {
return (
- {tabs.map((item) => {
- return (
-
- {item.children}
-
- );
- })}
+ {tabs.map((item) => (
+
+ {item.children}
+
+ ))}
);
}
@@ -195,12 +213,14 @@ export default function PacksReadme() {
.map((provider) => cloudDisplayNames[provider as keyof typeof cloudDisplayNames] || provider)
.join(", ");
}
+
function getRegistries() {
if (selectedVersion && !selectedVersion.endsWith(".x")) {
- const registerUid = packData.packUidMap[selectedPackUid]?.registryUid || "";
- return packData.selectedRepositories.find((registry) => registry.uid === registerUid)?.name || "";
+ const registryUid = packData.packUidMap[selectedPackUid]?.registryUid || "";
+ const registry = packData.selectedRepositories.find((registry) => registry.uid === registryUid);
+ return registry ? registry.name : "";
}
- const consolidatedRegistries = packData.registries.reduce((accumulator: string[], registry) => {
+ const consolidatedRegistries = packData.registries.reduce((accumulator, registry) => {
const regObj = packData.selectedRepositories.find((repo) => repo.uid === registry);
if (regObj) {
accumulator.push(regObj.name);
@@ -210,6 +230,8 @@ export default function PacksReadme() {
return consolidatedRegistries.join(", ");
}
+ console.log("packData", packData);
+
return (
@@ -230,23 +252,27 @@ export default function PacksReadme() {
dropdownStyle={{ maxHeight: 400, overflow: "auto" }}
placeholder="Search"
treeDefaultExpandAll
- onChange={(item) => versionChange(item as string)}
+ onChange={(item) => versionChange(item)}
treeData={renderVersionOptions()}
/>
-
- {`Type: ${packTypeNames[packData.type as keyof typeof packTypeNames]}`}
-
+ {`Type: ${packTypeNames[packData.type]}`}
{`Cloud Providers: ${getProviders()}`}
{`Registry: ${getRegistries()}`}
- {warningContent ? (
+ {packData.disabled ? (
+
+ Pack version v{selectedVersion} is disabled. Upgrade to a newer version to take advantage
+ of new features.
+
+ ) : selectedPackUid && packData.packUidMap[selectedPackUid]?.deprecated ? (
- {warningContent}
+ Pack version v{selectedVersion} is deprecated. Upgrade to a newer version to take advantage
+ of new features.
) : null}
diff --git a/src/components/PacksTable/PacksTable.tsx b/src/components/PacksTable/PacksTable.tsx
index f96534c7ab..685daaa994 100644
--- a/src/components/PacksTable/PacksTable.tsx
+++ b/src/components/PacksTable/PacksTable.tsx
@@ -137,6 +137,7 @@ const FilteredTable: React.FC = () => {
const [deprecatedPacks, setDeprecatedPacks] = useState
- {technologies.map(( field ) => {
+ {technologies.map((field) => {
const { title, slug, logoUrl } = field;
- return
diff --git a/src/components/Technologies/CategorySelector/CustomLabel.tsx b/src/components/Technologies/CategorySelector/CustomLabel.tsx
index 28b6dd60b3..162fda9468 100644
--- a/src/components/Technologies/CategorySelector/CustomLabel.tsx
+++ b/src/components/Technologies/CategorySelector/CustomLabel.tsx
@@ -9,9 +9,7 @@ interface CustomLabelProps {
export default function CustomLabel({ label, className = "" }: CustomLabelProps) {
return (
<>
-
- {label}
-
+ {label}
);
}
diff --git a/src/components/Technologies/CategorySelector/FilterSelect.tsx b/src/components/Technologies/CategorySelector/FilterSelect.tsx
index e2000e0982..58d091f465 100644
--- a/src/components/Technologies/CategorySelector/FilterSelect.tsx
+++ b/src/components/Technologies/CategorySelector/FilterSelect.tsx
@@ -5,17 +5,17 @@ import "./filterSelect.antd.css";
interface FilterSelectProps {
selectMode?: SelectProps["mode"];
- options: { value: string, label: string }[];
+ options: { value: string; label: string }[];
onChange: (...args: any) => void;
value: SelectProps["value"];
-};
+}
export default function FilterSelect({ selectMode, options, onChange, value }: FilterSelectProps) {
return (
- {icon}
-
- );
+ return {icon}
;
}
diff --git a/src/components/Technologies/PacksFilters.tsx b/src/components/Technologies/PacksFilters.tsx
index d428c886b6..28ea4b8256 100644
--- a/src/components/Technologies/PacksFilters.tsx
+++ b/src/components/Technologies/PacksFilters.tsx
@@ -4,21 +4,39 @@ import CustomLabel from "./CategorySelector/CustomLabel";
import FilterSelect from "./CategorySelector/FilterSelect";
import "./packsFilters.antd.css";
import { packTypeNames, cloudProviderTypes } from "../../constants/packs";
+
interface PackFiltersProps {
categories: string[];
- registries: any[];
- setSelectedSearchFilters: (...args: any[]) => void;
- selectedFilters: any;
+ registries: registry[];
+ setSelectedSearchFilters: (filters: SelectedFilters) => void;
+ selectedFilters: SelectedFilters;
+}
+
+interface registry {
+ uid: string;
+ name: string;
+}
+
+interface sources {
+ label: string;
+ value: string;
}
-const sourceList: any[] = [
+interface SelectedFilters {
+ category: string[];
+ registries: string[];
+ cloudTypes: string[];
+ source: string[];
+}
+
+const sourceList: sources[] = [
{
label: "All",
- value: "all"
+ value: "all",
},
{
label: "Verified",
- value: "verified"
+ value: "verified",
},
{
label: "Community",
@@ -26,19 +44,22 @@ const sourceList: any[] = [
},
];
-export default function PacksFilters({ categories, registries, setSelectedSearchFilters, selectedFilters }: PackFiltersProps) {
-
-
+export default function PacksFilters({
+ categories,
+ registries,
+ setSelectedSearchFilters,
+ selectedFilters,
+}: PackFiltersProps) {
return (
-
-
+
{renderPacksCategories()}
diff --git a/src/components/Technologies/TechnologyCard.tsx b/src/components/Technologies/TechnologyCard.tsx
index 345e9fc224..173a2ba90e 100644
--- a/src/components/Technologies/TechnologyCard.tsx
+++ b/src/components/Technologies/TechnologyCard.tsx
@@ -3,6 +3,12 @@ import styles from "./Technologies.module.scss";
import PackCardIcon from "./PackCardIcon";
import Link from "@docusaurus/Link";
+interface Version {
+ title: string;
+ children: {
+ title: string;
+ }[];
+}
interface TechnologyCardProps {
name?: string;
title: string;
@@ -10,11 +16,12 @@ interface TechnologyCardProps {
type?: string;
slug?: string;
version?: string;
- versions?: any;
+ versions?: Version[];
}
export default function TechnologyCard({ name, title, logoUrl, type, slug, version, versions }: TechnologyCardProps) {
- const parentVersion = versions?.find((tagVersion: any) => tagVersion.children.find((child: any) => child.title === version))?.title || "";
+ const parentVersion =
+ versions?.find((tagVersion) => tagVersion.children.find((child) => child.title === version))?.title || "";
return (
diff --git a/src/components/Technologies/packsFilters.antd.css b/src/components/Technologies/packsFilters.antd.css
index 2de6e810a7..c3320792be 100644
--- a/src/components/Technologies/packsFilters.antd.css
+++ b/src/components/Technologies/packsFilters.antd.css
@@ -1,3 +1,3 @@
.ant-select .ant-select-selector {
- border-radius:0px;
+ border-radius: 0px;
}
diff --git a/src/components/Technologies/technologies.antd.css b/src/components/Technologies/technologies.antd.css
index 3ee3260b09..3bf9b3843a 100644
--- a/src/components/Technologies/technologies.antd.css
+++ b/src/components/Technologies/technologies.antd.css
@@ -6,8 +6,8 @@
display: flex;
flex-wrap: wrap;
}
-.ant-menu-horizontal >.ant-menu-submenu:hover::after {
- border-bottom-color: transparent !important
+.ant-menu-horizontal > .ant-menu-submenu:hover::after {
+ border-bottom-color: transparent !important;
}
[data-theme="dark"] .ant-collapse-header-text {
color: whitesmoke;
diff --git a/src/constants/packs.ts b/src/constants/packs.ts
index 2db7ded672..57884d639c 100644
--- a/src/constants/packs.ts
+++ b/src/constants/packs.ts
@@ -15,7 +15,7 @@ export const packTypes = [
"system app",
] as const;
-type packType = (typeof packTypes)[number];
+// type packType = (typeof packTypes)[number];
export const packTypeNames: Record = {
"app services": "App Services",
diff --git a/src/declarations.d.ts b/src/declarations.d.ts
index 2aeaba6224..a9da8662dd 100644
--- a/src/declarations.d.ts
+++ b/src/declarations.d.ts
@@ -4,7 +4,7 @@ declare module "*.module.scss";
declare module "*.png";
-declare module '*.md' {
+declare module "*.md" {
const value: string; // markdown is just a string
export default value;
}
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index ef7f29bd74..b22afd025e 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -4,7 +4,7 @@ declare module "*.module.scss";
declare module "*.png";
-declare module '*.md' {
+declare module "*.md" {
const value: string; // markdown is just a string
export default value;
}
diff --git a/static/scripts/constants.js b/static/scripts/constants.js
index f4424021a8..47e12617c1 100644
--- a/static/scripts/constants.js
+++ b/static/scripts/constants.js
@@ -1 +1 @@
-export const BASE_URL = 'http://api.spectrocloud.com';
+export const BASE_URL = "http://api.spectrocloud.com";
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 80de3b1401..9de14de20c 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -3,7 +3,15 @@
"noEmit": true,
"allowJs": true
},
- "extends": "./tsconfig.json",
- "include": ["src/**/*.ts", "src/**/*.tsx", "./.eslintrc.js", "*.d.ts", "visuals/**/*.ts", "playwright.config.ts"],
+ "extends": ["./tsconfig.json"],
+ "include": [
+ "src/**/*.ts",
+ "src/**/*.tsx",
+ "./.eslintrc.js",
+ "*.d.ts",
+ "visuals/**/*.ts",
+ "playwright.config.ts",
+ "_partials/*.ts"
+ ],
"exclude": ["**/node_modules", "deprecated"]
}