Address PR comments

t pus

Author: yashwin

client/a8c-for-agencies/sections/partner-directory/components/hooks/use-form-selectors.ts

@@ -28,31 +28,32 @@ export function useFormSelectors() {
 		headless_wordpress_and_woo: translate( 'Headless WordPress & Woo' ),
 	};
 
+	// Always sort the industries alphabetically
 	const availableIndustries: Record< string, string > = {
-		technology_and_it_services: translate( 'Technology & IT Services' ),
+		agriculture_and_farming: translate( 'Agriculture & Farming' ),
+		arts_and_culture: translate( 'Arts & Culture' ),
+		automotive_and_transportation: translate( 'Automotive & Transportation' ),
+		construction_and_engineering: translate( 'Construction & Engineering' ),
+		education_and_e_learning: translate( 'Education & E-Learning' ),
 		e_commerce_and_retail: translate( 'E-commerce & Retail' ),
+		energy_and_utilities: translate( 'Energy & Utilities' ),
+		entertainment_and_media: translate( 'Entertainment & Media' ),
+		environmental_and_sustainability: translate( 'Environmental & Sustainability' ),
+		events_and_conferences: translate( 'Events & Conferences' ),
+		fashion_and_beauty: translate( 'Fashion & Beauty' ),
 		finance_and_insurance: translate( 'Finance & Insurance' ),
+		food_and_beverage: translate( 'Food & Beverage' ),
+		government_and_public_services: translate( 'Government & Public Services' ),
 		healthcare_and_medical: translate( 'Healthcare & Medical' ),
-		education_and_e_learning: translate( 'Education & E-Learning' ),
-		real_estate_and_property: translate( 'Real Estate & Property' ),
-		travel_and_hospitality: translate( 'Travel & Hospitality' ),
-		nonprofits_and_ngos: translate( 'Nonprofits & NGOs' ),
 		legal_and_professional_services: translate( 'Legal & Professional Services' ),
-		entertainment_and_media: translate( 'Entertainment & Media' ),
-		construction_and_engineering: translate( 'Construction & Engineering' ),
-		automotive_and_transportation: translate( 'Automotive & Transportation' ),
-		government_and_public_services: translate( 'Government & Public Services' ),
-		marketing_and_advertising: translate( 'Marketing & Advertising' ),
-		food_and_beverage: translate( 'Food & Beverage' ),
+		logistics_and_supply_chain: translate( 'Logistics & Supply Chain' ),
 		manufacturing_and_industry: translate( 'Manufacturing & Industry' ),
-		energy_and_utilities: translate( 'Energy & Utilities' ),
+		marketing_and_advertising: translate( 'Marketing & Advertising' ),
+		nonprofits_and_ngos: translate( 'Nonprofits & NGOs' ),
+		real_estate_and_property: translate( 'Real Estate & Property' ),
 		sports_and_recreation: translate( 'Sports & Recreation' ),
-		agriculture_and_farming: translate( 'Agriculture & Farming' ),
-		arts_and_culture: translate( 'Arts & Culture' ),
-		environmental_and_sustainability: translate( 'Environmental & Sustainability' ),
-		fashion_and_beauty: translate( 'Fashion & Beauty' ),
-		logistics_and_supply_chain: translate( 'Logistics & Supply Chain' ),
-		events_and_conferences: translate( 'Events & Conferences' ),
+		technology_and_it_services: translate( 'Technology & IT Services' ),
+		travel_and_hospitality: translate( 'Travel & Hospitality' ),
 	};
 
 	const availableProducts: Record< string, string > = {
@@ -88,7 +89,7 @@ export function useFormSelectors() {
 		availableLanguages,
 		availableProducts,
 		availableDirectories,
-		availableIndustries: Object.fromEntries( Object.entries( availableIndustries ).sort() ),
+		availableIndustries,
 		oldIndustries,
 	};
 }

client/a8c-for-agencies/sections/partner-directory/components/industries-selector.tsx

@@ -30,15 +30,12 @@ const IndustriesSelector = ( { setIndustries, industries }: Props ) => {
 		[ availableIndustriesByLabel, setIndustries ]
 	);
 
-	// Get the selected industries by label
+	// Get the selected industries by label, and remove any duplicates
 	const selectedIndustriesByLabel = Array.from(
 		new Set(
 			industries.flatMap( ( slug ) => {
 				const key = slug as string;
-				const value =
-					key in oldIndustries
-						? availableIndustries[ oldIndustries[ key ] ]
-						: availableIndustries[ key ];
+				const value = availableIndustries[ oldIndustries[ key ] ?? key ];
 				return value ? [ value ] : [];
 			} )
 		)