Merge pull request #18162 from umbraco/v15/feature/hide-icons

Feature: hide icons
umbraco · Jan 31, 2025 · 341534c · 341534c
2 parents 50ff23b + e124ce9
commit 341534c
Show file tree

Hide file tree

Showing 10 changed files with 207 additions and 461 deletions.
diff --git a/src/Umbraco.Web.UI.Client/devops/icons/index.js b/src/Umbraco.Web.UI.Client/devops/icons/index.js
@@ -46,7 +46,8 @@ const collectDictionaryIcons = async () => {
 
 				const icon = {
 					name: iconDef.name,
-					legacy: iconDef.legacy,
+					legacy: iconDef.legacy, // TODO: Deprecated, remove in v.17.
+					hidden: iconDef.legacy ?? iconDef.internal,
 					fileName: iconFileName,
 					svg,
 					output: `${iconsOutputDirectory}/${iconFileName}.ts`,
@@ -137,9 +138,11 @@ const collectDiskIcons = async (icons) => {
 
 		// Only append not already defined icons:
 		if (!icons.find((x) => x.name === iconName)) {
+			// remove legacy for v.17 (Deprecated)
 			const icon = {
 				name: iconName,
 				legacy: true,
+				hidden: true,
 				fileName: iconFileName,
 				svg,
 				output: `${iconsOutputDirectory}/${iconFileName}.ts`,
@@ -172,11 +175,13 @@ const generateJS = (icons) => {
 	const JSPath = `${moduleDirectory}/icons.ts`;
 
 	const iconDescriptors = icons.map((icon) => {
+		// remove legacy for v.17 (Deprecated)
 		return `{
 			name: "${icon.name}",
 			${icon.legacy ? 'legacy: true,' : ''}
+			${icon.hidden ? 'hidden: true,' : ''}
 			path: () => import("./icons/${icon.fileName}.js"),
-		}`.replace(/\t/g, ''); // Regex removes white space [NL]
+		}`.replace(/\t/g, '').replace(/^\s*[\r\n]/gm, ''); // Regex removes white space [NL] // + regex that removes empty lines. [NL]
 	});
 
 	const content = `export default [${iconDescriptors.join(',')}];`;

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json
@@ -641,7 +641,8 @@
 		{
 			"name": "icon-document-dashed-line",
 			"file": "file.svg",
-			"missing": "TODO:"
+			"missing": "TODO: Legacy until se have made a custom",
+			"legacy": true
 		},
 		{
 			"name": "icon-document",
@@ -2360,6 +2361,11 @@
 		},
 		{
 			"name": "icon-umb-manifest",
+			"file": "puzzle.svg",
+			"internal": true
+		},
+		{
+			"name": "icon-puzzle-piece",
 			"file": "puzzle.svg"
 		},
 		{

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts
@@ -13,7 +13,7 @@ export class UmbIconRegistryContext extends UmbContextBase<UmbIconRegistryContex
 	#manifestMap = new Map();
 	#icons = new UmbArrayState<UmbIconDefinition>([], (x) => x.name);
 	readonly icons = this.#icons.asObservable();
-	readonly approvedIcons = this.#icons.asObservablePart((icons) => icons.filter((x) => x.legacy !== true));
+	readonly approvedIcons = this.#icons.asObservablePart((icons) => icons.filter((x) => x.hidden !== true));
 
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_ICON_REGISTRY_CONTEXT);