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

Feat/gw 4201 show message and fixed form in gcs settings #2946

Conversation

fezzlk
Copy link
Contributor

@fezzlk fezzlk commented Oct 23, 2020

IS_GCS_ENV_PRIORITIZED が true の時に GCS 設定画面に info アラートを出すようにしました。(環境変数名は GW-4194で変更予定です)

Screen Shot 2020-10-23 at 19 01 17

@@ -535,7 +535,7 @@
"missing mandatory configs": "The following mandatory items are not set in either database nor environment variables.",
"Local": {
"name": "ID/Password",
"note for the only env option": "The LOCAL authentication is limited by the value of environment variable.<br>To change this setting, please change to false or delete the value of the environment variable <code>{{env}}/code> .",
"note for the only env option": "The LOCAL authentication is limited by the value of environment variable.<br>To change this setting, please change to false or delete the value of the environment variable <code>{{env}}</code> .",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo(今ストーリーとは関係なし)

@@ -522,7 +522,7 @@
"missing mandatory configs": "The following mandatory items are not set in either database nor environment variables.",
"Local": {
"name": "ID/Password",
"note for the only env option": "The LOCAL authentication is limited by the value of environment variable.<br>To change this setting, please change to false or delete the value of the environment variable <code>{{env}}/code> .",
"note for the only env option": "The LOCAL authentication is limited by the value of environment variable.<br>To change this setting, please change to false or delete the value of the environment variable <code>{{env}}</code> .",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo(今ストーリーとは関係なし)

</tbody>
</table>
<>
{gcsUseOnlyEnvVars && (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gcs設定テーブルの上にアラートを設置

dangerouslySetInnerHTML={{ __html: t('admin:app_setting.note_for_the_only_env_option', { env: 'IS_GCS_ENV_PRIORITIZED' }) }}
/>
)}
<table className={`table settings-table ${gcsUseOnlyEnvVars && 'use-only-env-vars'}`}>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

以下三箇所のフォームに readOnly={gcsUseOnlyEnvVars} を追加しました

@yuki-takei yuki-takei merged commit 72eaa47 into feat/GW-3658-can-use-GCP-from-db-vars Oct 23, 2020
@yuki-takei yuki-takei deleted the feat/gw-4201-show-message-and-fixed-form-in-gcs-settings branch October 23, 2020 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants