Skip to content

Commit e1be78e

Browse files
committed
update endpoint
1 parent dcf5e1a commit e1be78e

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Controllers/v1/SqlMembershipSources/SqlMembershipSourcesController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task<IActionResult> GetDefaultSourceAttributesAsync()
6666
}
6767

6868
[Authorize()]
69-
[HttpGet("defaultAttributeValues")]
69+
[HttpGet("attributeValues/{attribute}")]
7070
public async Task<IActionResult> GetDefaultSourceAttributeValuesAsync(string attribute)
7171
{
7272
try

UI/web-app/src/apis/sqlMembershipSources/SqlMembershipSourcesApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class SqlMembershipSourcesApi extends ApiBase implements ISqlMembershipSo
2121
}
2222

2323
public async fetchDefaultSqlMembershipSourceAttributeValues(attribute: string): Promise<SqlMembershipAttributeValue[]> {
24-
const response = await this.httpClient.get<SqlMembershipAttributeValue[]>('/attributesValues/' + attribute);
24+
const response = await this.httpClient.get<SqlMembershipAttributeValue[]>('/attributeValues/' + attribute);
2525
this.ensureSuccessStatusCode(response);
2626
return response.data;
2727
}

UI/web-app/src/store/sqlMembershipSources.api.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,18 @@ export const fetchAttributeValues = createAsyncThunk<GetAttributeValuesResponse,
3737
'fetchSqlFilterAttributeValues',
3838
async (request, { extra }) => {
3939
const { gmmApi } = extra.apis;
40+
let payload: GetAttributeValuesResponse;
4041
try {
41-
const response = await gmmApi.sqlMembershipSources.fetchDefaultSqlMembershipSourceAttributeValues(request.attribute);
42-
const payload: GetAttributeValuesResponse = {
43-
values: response,
44-
attribute: request.attribute,
45-
type: request.type
46-
};
42+
if (request.attribute.endsWith("_Code")) {
43+
const response = await gmmApi.sqlMembershipSources.fetchDefaultSqlMembershipSourceAttributeValues(request.attribute.slice(0, -5));
44+
payload = { values: response, attribute: request.attribute, type: request.type };
45+
}
46+
else {
47+
payload = { values: [], attribute: request.attribute, type: request.type };
48+
}
4749
return payload;
4850
} catch (error) {
49-
const payload: GetAttributeValuesResponse = {
50-
values: [],
51-
attribute: request.attribute,
52-
type: request.type
53-
};
51+
payload = { values: [], attribute: request.attribute, type: request.type };
5452
return payload;
5553
}
5654
}

0 commit comments

Comments
 (0)