Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Teams form fields titles and description from Apigee Edge to Apigee #1026

Merged
merged 3 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apigee_edge_teams.team_settings:
title: 'Apigee Edge Teams: Team settings'
title: 'Apigee Teams: Team settings'
base_route_name: apigee_edge_teams.settings.team
names:
- apigee_edge_teams.team_settings

apigee_edge_teams.team_app_settings:
title: 'Apigee Edge Teams: Team App settings'
title: 'Apigee Teams: Team App settings'
base_route_name: apigee_edge_teams.settings.team_app
names:
- apigee_edge_teams.team_app_settings
2 changes: 1 addition & 1 deletion modules/apigee_edge_teams/apigee_edge_teams.info.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Apigee Edge Teams
name: Apigee Teams
description: Provides shared app functionality by allowing developers to be organised into teams.
package: Apigee

Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_edge_teams/apigee_edge_teams.install
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function apigee_edge_teams_requirements($phase) {
t("The Teams module functionality is not available for monetization enabled org on Apigee X / Hybrid and should be uninstalled, because <a href=':url' target='_blank'>AppGroup APIs are not supported in Apigee X / Hybrid orgs with monetization enabled</a>.", $url) :
t("The Teams module functionality is not available for monetization enabled org on Apigee X / Hybrid because <a href=':url' target='_blank'>AppGroup APIs are not supported in Apigee X / Hybrid orgs with monetization enabled</a>.", $url);
$requirements['apigee_edge_teams_not_supported'] = [
'title' => t('Apigee Edge Teams'),
'title' => t('Apigee Teams'),
'description' => $message,
'severity' => REQUIREMENT_ERROR,
];
Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_edge_teams/src/Form/TeamMemberSyncForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$this->sdkConnector->testConnection();
}
catch (\Exception $exception) {
$this->messenger()->addError($this->t('Cannot connect to Apigee Edge server. Please ensure that <a href=":link">Apigee Edge connection settings</a> are correct.', [
$this->messenger()->addError($this->t('Cannot connect to Apigee server. Please ensure that <a href=":link">Apigee connection settings</a> are correct.', [
':link' => Url::fromRoute('apigee_edge.settings')->toString(),
]));
return $form;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS')
// retrieved then return an empty list.
$query->condition('mail', 0);
$context = Error::decodeException($exception);
$this->logger->error("Unable to retrieve list of developer email addresses from Apigee Edge. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
$this->logger->error("Unable to retrieve list of developer email addresses from Apigee. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
return $query;
}

Expand Down Expand Up @@ -221,7 +221,7 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS')
'%team' => $team_name,
];
$context += Error::decodeException($exception);
$this->logger->error("Unable to retrieve list of %team team from Apigee Edge. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
$this->logger->error("Unable to retrieve list of %team team from Apigee. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Apigee Edge Teams: Invitation tests'
name: 'Apigee Teams: Invitation tests'
type: module
description: 'Support module for the Apigee Edge Teams invitation tests.'
description: 'Support module for the Apigee Teams invitation tests.'
core_version_requirement: ^10
package: Testing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Apigee Edge Teams: Testing'
name: 'Apigee Teams: Testing'
type: module
description: 'Support module for the Apigee Edge Teams tests.'
description: 'Support module for the Apigee Teams tests.'
core_version_requirement: ^10
package: Testing

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ protected function teamExpansionTest() {
$this->drupalGet(Url::fromRoute('apigee_edge_teams.settings.team.permissions'));
// Check whether the permission group labels and the permission labels and
// descriptions are visible.
$this->assertSession()->pageTextContains('Apigee Edge Teams: Testing');
$this->assertSession()->pageTextContains('Apigee Teams: Testing');
$this->assertSession()->pageTextContains('Team permission test');
$this->assertSession()->pageTextContains('Team permission test 1');
$this->assertSession()->pageTextContains('This is the 1st team test permission.');
Expand Down
Loading