add more address fields to user form

update query key to cache selected fields if different from default

Author: JohnDuprey

src/components/CippComponents/CippFormUserSelector.jsx

@@ -30,7 +30,9 @@ export const CippFormUserSelector = ({
         dataKey: "Results",
         labelField: (option) => `${option.displayName} (${option.userPrincipalName})`,
         valueField: valueField ? valueField : "id",
-        queryKey: `ListUsers-${currentTenant?.value ? currentTenant.value : selectedTenant}`,
+        queryKey: `ListUsers-${currentTenant?.value ? currentTenant.value : selectedTenant}-${
+          select ? select : "default"
+        }`,
         data: {
           Endpoint: "users",
           manualPagination: true,

src/components/CippFormPages/CippAddEditUser.jsx

@@ -254,26 +254,35 @@ const CippAddEditUser = (props) => {
         <CippFormComponent
           type="textField"
           fullWidth
-          label="Postal Code"
-          name="postalCode"
+          label="City"
+          name="city"
           formControl={formControl}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
         <CippFormComponent
           type="textField"
           fullWidth
-          label="Country"
-          name="country"
+          label="State/Province"
+          name="state"
           formControl={formControl}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
         <CippFormComponent
           type="textField"
           fullWidth
-          label="City"
-          name="city"
+          label="Postal Code"
+          name="postalCode"
+          formControl={formControl}
+        />
+      </Grid>
+      <Grid size={{ md: 6, xs: 12 }}>
+        <CippFormComponent
+          type="textField"
+          fullWidth
+          label="Country"
+          name="country"
           formControl={formControl}
         />
       </Grid>

src/pages/identity/administration/users/add.jsx

@@ -56,7 +56,7 @@ const Page = () => {
             label="Copy properties from another user"
             multiple={false}
             select={
-              "id,userPrincipalName,displayName,givenName,surname,mailNickname,jobTitle,department,streetAddress,postalCode,companyName,mobilePhone,businessPhones,usageLocation,office"
+              "id,userPrincipalName,displayName,givenName,surname,mailNickname,jobTitle,department,streetAddress,city,state,postalCode,companyName,mobilePhone,businessPhones,usageLocation,office"
             }
             addedField={{
               groupType: "calculatedGroupType",
@@ -69,6 +69,8 @@ const Page = () => {
               jobTitle: "jobTitle",
               department: "department",
               streetAddress: "streetAddress",
+              city: "city",
+              state: "state",
               postalCode: "postalCode",
               companyName: "companyName",
               mobilePhone: "mobilePhone",