Skip to content
Jump to bottom

CFM-205_Return_type_labels_with_objects_in_the_MVEA_api_calls #73

Merged
merged 1 commit into from
Feb 10, 2023
+21 −8
Merged

CFM-205_Return_type_labels_with_objects_in_the_MVEA_api_calls #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/src/Controller/ApiV2Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,20 @@ public function index() {
if(!empty($link->attr) && !empty($link->value)) {
$query = $query->where([$this->$modelsName->getAlias().'.'.$link->attr => $link->value]);
}


// This will produce a nested object which is very useful for vue integration
if($this->request->getQuery('extended') !== null) {
$modelContain = [];
$associations = $this->$modelsName->associations();
foreach($associations->getByType(['BelongsTo']) as $a) {
$modelContain[] = $a->getClassName();
}

if(!empty($modelContain)) {
$query = $query->contain($modelContain);
}
}

if($modelsName == 'AuthenticationEvents') {
// Special case for filtering on authenticated identifier. There is a
// similar filter in AuthenticationEventsController::beforeFilter.
Expand Down
14 changes: 7 additions & 7 deletions app/webroot/js/comanage/components/mvea/mvea-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {
</div>
<div class="field-data data-label">
<span v-if="this.mvea.primary_name" class="mr-1 badge bg-outline-secondary primary">{{ this.txt.primary }}</span>
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
<span v-if="this.mvea.language" class="mr-1 badge bg-light">{{ calcLangHR(this.mvea.language) }}</span>
</div>
</li>
Expand All @@ -61,7 +61,7 @@ export default {
</div>
<div class="field-data data-label">
<span v-if="!(this.mvea.verified)" class="mr-1 badge bg-warning unverified">{{ this.txt.unverified }}</span>
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
<!-- Identifiers -->
Expand All @@ -71,7 +71,7 @@ export default {
</div>
<div class="field-data data-label">
<span v-if="this.mvea.login" class="mr-1 badge bg-outline-secondary login">{{ this.txt.login }}</span>
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
<!-- Ad Hoc Attributes -->
Expand All @@ -97,7 +97,7 @@ export default {
</address>
</div>
<div class="field-data data-label">
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
<!-- Telephone Numbers -->
Expand All @@ -106,7 +106,7 @@ export default {
<a href="#" class="nospin">{{ this.mvea.country_code }} {{ this.mvea.area_code }} {{ this.mvea.number }}</a>
</div>
<div class="field-data data-label">
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
<!-- Urls -->
Expand All @@ -116,7 +116,7 @@ export default {
<a :href="this.mvea.url" class="canvas-url-link" :title="this.txt.visit"><span class="material-icons">north_east</span></a>
</div>
<div class="field-data data-label">
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
<!-- Pronouns -->
Expand All @@ -125,7 +125,7 @@ export default {
<a href="#" class="nospin">{{ this.mvea.type_id }}</a>
</div>
<div class="field-data data-label">
<span class="mr-1 badge bg-light">type: {{ this.mvea.type_id }}</span>
<span class="mr-1 badge bg-light">{{ this.mvea.type.display_name }}</span>
</div>
</li>
`
Expand Down