console: Apply code suggestions

Author: PavelJankoski

pkg/webui/console/constants/entities.js

@@ -29,3 +29,10 @@ export const entitySdkServiceMap = Object.freeze({
   users: 'Users',
   client: 'Clients',
 })
+
+export const sdkServices = {
+  [APPLICATION]: entitySdkServiceMap.application,
+  [GATEWAY]: entitySdkServiceMap.gateway,
+  [ORGANIZATION]: entitySdkServiceMap.organization,
+  [USER]: entitySdkServiceMap.users,
+}

pkg/webui/console/containers/api-key-form/create.js

@@ -94,7 +94,7 @@ const CreateForm = ({ entity, entityId }) => {
           component={Input}
         />
         <FormField
-          title={'Expiry date'}
+          title={sharedMessages.expiryDate}
           name="expires_at"
           type="date"
           encode={encodeExpiryDate}

pkg/webui/console/containers/api-key-form/edit.js

@@ -106,7 +106,7 @@ const ApiKeyEditForm = ({ entity, entityId }) => {
         component={Input}
       />
       <FormField
-        title={'Expiry date'}
+        title={sharedMessages.expiryDate}
         name="expires_at"
         type="date"
         decode={decodeExpiryDate}

pkg/webui/console/containers/api-key-form/hooks.js

@@ -16,7 +16,7 @@ import { useSelector, useDispatch } from 'react-redux'
 import { useParams } from 'react-router-dom'
 import { useCallback } from 'react'
 
-import { APPLICATION, GATEWAY, ORGANIZATION, USER } from '@console/constants/entities'
+import { APPLICATION, GATEWAY, ORGANIZATION, sdkServices, USER } from '@console/constants/entities'
 import tts from '@console/api/tts'
 
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
@@ -35,13 +35,6 @@ import {
 } from '@console/store/selectors/organizations'
 import { selectUserRights, selectUserPseudoRights } from '@console/store/selectors/users'
 
-const sdkServices = {
-  [APPLICATION]: 'Applications',
-  [GATEWAY]: 'Gateways',
-  [ORGANIZATION]: 'Organizations',
-  [USER]: 'Users',
-}
-
 const useApiKeyData = (entity, entityId) => {
   const rightsSelector = {
     [APPLICATION]: selectApplicationRights,

pkg/webui/console/containers/api-key-modal-form/create.js

@@ -16,7 +16,7 @@ import React, { useCallback } from 'react'
 import { defineMessages } from 'react-intl'
 
 import tts from '@console/api/tts'
-import { APPLICATION, GATEWAY, ORGANIZATION, USER } from '@console/constants/entities'
+import { sdkServices } from '@console/constants/entities'
 
 import FormField from '@ttn-lw/components/form/field'
 import FormSubmit from '@ttn-lw/components/form/submit'
@@ -34,13 +34,6 @@ import ApiKeyForm from './form'
 import validationSchema from './validation-schema'
 import { encodeExpiryDate, decodeExpiryDate } from './utils'
 
-const sdkServices = {
-  [APPLICATION]: 'Applications',
-  [GATEWAY]: 'Gateways',
-  [ORGANIZATION]: 'Organizations',
-  [USER]: 'Users',
-}
-
 const m = defineMessages({
   createApiKeyError: 'Failed to create API key',
 })
@@ -113,7 +106,7 @@ const CreateForm = ({ entity, entityId, handleCancel, rights, setApiKey }) => {
             fieldWidth="full"
           />
           <FormField
-            title={'Expiry date'}
+            title={sharedMessages.expiryDate}
             name="expires_at"
             type="date"
             className="item-12 md-lg:item-6"

pkg/webui/lib/shared-messages.js

@@ -267,6 +267,7 @@ export default defineMessages({
   eventsCannotShow: 'Cannot show events',
   expand: 'Expand',
   expiry: 'Expiry',
+  expiryDate: 'Expiry date',
   exportJson: 'Export as JSON',
   external: 'External',
   externalJoinServer: 'External Join Server',

pkg/webui/locales/en.json

@@ -1449,6 +1449,7 @@
   "lib.shared-messages.eventsCannotShow": "Cannot show events",
   "lib.shared-messages.expand": "Expand",
   "lib.shared-messages.expiry": "Expiry",
+  "lib.shared-messages.expiryDate": "Expiry date",
   "lib.shared-messages.exportJson": "Export as JSON",
   "lib.shared-messages.external": "External",
   "lib.shared-messages.externalJoinServer": "External Join Server",

pkg/webui/locales/ja.json

@@ -1449,6 +1449,7 @@
   "lib.shared-messages.eventsCannotShow": "イベントを表示できません",
   "lib.shared-messages.expand": "",
   "lib.shared-messages.expiry": "期限切れ",
+  "lib.shared-messages.expiryDate": "",
   "lib.shared-messages.exportJson": "JSONとしてエクスポート",
   "lib.shared-messages.external": "外部",
   "lib.shared-messages.externalJoinServer": "外部Joinサーバー",