Skip to content

Commit c6d6550

Browse files
Rishichandra Wawhalawjchenvijayprasanna13hgiasacabhi40308
authored and
hasura-bot
committed
[feature branch] EE Lite Trials
PR-URL: hasura/graphql-engine-mono#8208 Co-authored-by: awjchen <[email protected]> Co-authored-by: Vijay Prasanna <[email protected]> Co-authored-by: Toan Nguyen <[email protected]> Co-authored-by: Abhijeet Khangarot <[email protected]> Co-authored-by: Solomon <[email protected]> Co-authored-by: gneeri <[email protected]> GitOrigin-RevId: 454ee0dea636da77e43810edb2f427137027956c
1 parent f2b76b7 commit c6d6550

File tree

320 files changed

+12280
-3301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+12280
-3301
lines changed

‎cabal.project.freeze

+3
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ constraints: any.Cabal ==3.6.3.0,
9191
any.cryptohash-md5 ==0.11.101.0,
9292
any.cryptohash-sha1 ==0.11.101.0,
9393
any.cryptonite ==0.30,
94+
any.cryptostore ==0.3.0.0,
9495
any.data-binary-ieee754 ==0.4.4,
9596
any.data-bword ==0.1.0.2,
9697
any.data-checked ==0.3,
@@ -197,6 +198,7 @@ constraints: any.Cabal ==3.6.3.0,
197198
any.iso8601-time ==0.1.5,
198199
any.isomorphism-class ==0.1.0.7,
199200
any.jose ==0.9,
201+
any.jwt ==0.11.0,
200202
any.kan-extensions ==5.2.5,
201203
any.keys ==3.12.3,
202204
any.kriti-lang ==0.3.3,
@@ -335,6 +337,7 @@ constraints: any.Cabal ==3.6.3.0,
335337
any.tasty-bench ==0.3.2,
336338
any.template-haskell ==2.18.0.0,
337339
any.template-haskell-compat-v0208 ==0.1.9.1,
340+
any.temporary ==1.3,
338341
any.terminal-size ==0.3.3,
339342
any.terminfo ==0.4.1.5,
340343
any.text ==1.2.5.0,

‎dc-agents/dc-api-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hasura/dc-api-types",
3-
"version": "0.28.0",
3+
"version": "0.29.0",
44
"description": "Hasura GraphQL Engine Data Connector Agent API types",
55
"author": "Hasura (https://github.com/hasura/graphql-engine)",
66
"license": "Apache-2.0",

‎dc-agents/dc-api-types/src/agent.openapi.json

+4
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,9 @@
507507
"explain": {
508508
"$ref": "#/components/schemas/ExplainCapabilities"
509509
},
510+
"licensing": {
511+
"$ref": "#/components/schemas/Licensing"
512+
},
510513
"metrics": {
511514
"$ref": "#/components/schemas/MetricsCapabilities"
512515
},
@@ -703,6 +706,7 @@
703706
"ExplainCapabilities": {},
704707
"RawCapabilities": {},
705708
"DatasetCapabilities": {},
709+
"Licensing": {},
706710
"ConfigSchemaResponse": {
707711
"nullable": false,
708712
"properties": {

‎dc-agents/dc-api-types/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export type { GraphQLType } from './models/GraphQLType';
5656
export type { InsertCapabilities } from './models/InsertCapabilities';
5757
export type { InsertFieldSchema } from './models/InsertFieldSchema';
5858
export type { InsertMutationOperation } from './models/InsertMutationOperation';
59+
export type { Licensing } from './models/Licensing';
5960
export type { MetricsCapabilities } from './models/MetricsCapabilities';
6061
export type { MutationCapabilities } from './models/MutationCapabilities';
6162
export type { MutationOperation } from './models/MutationOperation';

‎dc-agents/dc-api-types/src/models/Capabilities.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { ComparisonCapabilities } from './ComparisonCapabilities';
66
import type { DataSchemaCapabilities } from './DataSchemaCapabilities';
77
import type { DatasetCapabilities } from './DatasetCapabilities';
88
import type { ExplainCapabilities } from './ExplainCapabilities';
9+
import type { Licensing } from './Licensing';
910
import type { MetricsCapabilities } from './MetricsCapabilities';
1011
import type { MutationCapabilities } from './MutationCapabilities';
1112
import type { QueryCapabilities } from './QueryCapabilities';
@@ -19,6 +20,7 @@ export type Capabilities = {
1920
data_schema?: DataSchemaCapabilities;
2021
datasets?: DatasetCapabilities;
2122
explain?: ExplainCapabilities;
23+
licensing?: Licensing;
2224
metrics?: MetricsCapabilities;
2325
mutations?: MutationCapabilities;
2426
queries?: QueryCapabilities;

‎dc-agents/dc-api-types/src/models/Licensing.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* istanbul ignore file */
2+
/* tslint:disable */
3+
/* eslint-disable */
4+
5+
export type Licensing = {
6+
};
7+

‎dc-agents/package-lock.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dc-agents/reference/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dc-agents/reference/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@fastify/cors": "^8.1.0",
25-
"@hasura/dc-api-types": "0.28.0",
25+
"@hasura/dc-api-types": "0.29.0",
2626
"fastify": "^4.13.0",
2727
"mathjs": "^11.0.0",
2828
"pino-pretty": "^8.0.0",

‎dc-agents/sqlite/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dc-agents/sqlite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@fastify/cors": "^8.1.0",
25-
"@hasura/dc-api-types": "0.28.0",
25+
"@hasura/dc-api-types": "0.29.0",
2626
"fastify-metrics": "^9.2.1",
2727
"fastify": "^4.13.0",
2828
"nanoid": "^3.3.4",

‎frontend/.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313

1414
// adding this setting per this discussion on github:
1515
// https://github.com/nrwl/nx/issues/9465#issuecomment-1080093295
16-
"typescript.preferences.importModuleSpecifier": "project-relative"
16+
"typescript.preferences.importModuleSpecifier": "project-relative",
17+
"git.ignoreLimitWarning": true
1718
}

‎frontend/apps/console-ee-e2e/src/e2e/data/dynamicDbRouting/dynamicDbRouting.e2e.cy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Metadata } from '@hasura/console-legacy-ce';
22
import { readMetadata } from '../../../utils/checkMetadataPayload';
33

4-
describe('Dynamic Db Routing', () => {
4+
xdescribe('Dynamic Db Routing', () => {
55
before(() => {
66
cy.visit('/data/manage/connect/');
77

‎frontend/libs/console/legacy-ce/src/index.ts

+11
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,17 @@ export {
6969
addUserProperties,
7070
programmaticallyTraceError,
7171
REDACT_EVERYTHING,
72+
InitializeTelemetry,
7273
} from './lib/features/Analytics';
7374
export { CloudOnboarding } from './lib/features/CloudOnboarding';
7475
export { prefetchSurveysData } from './lib/features/Surveys';
7576
export { prefetchOnboardingData } from './lib/features/CloudOnboarding/OnboardingWizard';
77+
export {
78+
prefetchEELicenseInfo,
79+
NavbarButton as EntepriseNavbarButton,
80+
WithEELiteAccess,
81+
useEELiteAccess,
82+
} from './lib/features/EETrial';
7683
export { default as PageNotFound } from './lib/components/Error/PageNotFound';
7784
export * from './lib/new-components/Button/';
7885
export * from './lib/new-components/Tooltip/';
@@ -130,6 +137,10 @@ export {
130137
export { ReactQueryProvider, reactQueryClient } from './lib/lib/reactQuery';
131138

132139
export { PrometheusSettings } from './lib/features/Prometheus';
140+
export { QueryResponseCaching } from './lib/features/QueryResponseCaching';
141+
export { MultipleAdminSecretsPage } from './lib/features/EETrial';
142+
export { MultipleJWTSecretsPage } from './lib/features/EETrial';
143+
export { SingleSignOnPage } from './lib/features/EETrial';
133144

134145
export { OpenTelemetryFeature } from './lib/features/OpenTelemetry';
135146

‎frontend/libs/console/legacy-ce/src/lib/Endpoints.ts

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ export const getEndpoints = (globals: typeof consoleGlobals) => {
1313
graphQLUrl: `${baseUrl}/v1/graphql`,
1414
relayURL: `${baseUrl}/v1beta1/relay`,
1515
query: `${baseUrl}/v2/query`,
16+
entitlement: `${baseUrl}/v1/entitlement`,
17+
license: `${baseUrl}/v1/entitlement/license`,
1618
metadata: `${baseUrl}/v1/metadata`,
1719
// metadata: `${baseUrl}/v1/query`,
1820
queryV2: `${baseUrl}/v2/query`,
@@ -30,6 +32,8 @@ export const getEndpoints = (globals: typeof consoleGlobals) => {
3032
globals.luxDataHost
3133
}/v1/graphql`,
3234
prometheusUrl: `${baseUrl}/v1/metrics`,
35+
registerEETrial: `https://licensing.pro.hasura.io/v1/graphql`,
36+
// registerEETrial: `http://licensing.lux-dev.hasura.me/v1/graphql`,
3337
};
3438

3539
return endpoints;

‎frontend/libs/console/legacy-ce/src/lib/components/Common/Common.module.scss

-2
Original file line numberDiff line numberDiff line change
@@ -1561,8 +1561,6 @@ code {
15611561
margin-bottom: 2px;
15621562
align-self: flex-end;
15631563
padding-top: 8px;
1564-
border-color: rgba(0, 0, 0, 0.1);
1565-
border-top-width: 1px;
15661564
position: sticky;
15671565
bottom: 0;
15681566
background-color: #f8fafb;

‎frontend/libs/console/legacy-ce/src/lib/components/Login/Login.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { verifyLogin } from './Actions';
1616
import { CLI_CONSOLE_MODE } from '../../constants';
1717
import { getAdminSecret } from '../Services/ApiExplorer/ApiRequest/utils';
1818
import { ConnectInjectedProps } from '../../types';
19+
import { isProConsole } from '../../utils/proConsole';
1920

2021
import hasuraLogo from './black-logo.svg';
2122
import hasuraEELogo from './black-logo-ee.svg';
@@ -149,12 +150,11 @@ const Login: React.FC<ConnectInjectedProps> = ({ dispatch, children }) => {
149150
);
150151
};
151152

152-
const showLogo =
153-
globals.consoleType === 'pro' || globals.consoleType === 'pro-lite' ? (
154-
<img className="flex w-36 mx-auto" src={hasuraEELogo} alt="Hasura EE" />
155-
) : (
156-
<img src={hasuraLogo} alt="Hasura" />
157-
);
153+
const showLogo = isProConsole(globals) ? (
154+
<img className="flex w-36 mx-auto" src={hasuraEELogo} alt="Hasura EE" />
155+
) : (
156+
<img src={hasuraLogo} alt="Hasura" />
157+
);
158158

159159
return (
160160
<div className="flex justify-center items-center min-h-screen bg-gray-100">

‎frontend/libs/console/legacy-ce/src/lib/components/Services/Actions/Containers/Main.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Container extends React.Component {
1313
render() {
1414
const { children } = this.props;
1515

16-
const currentLocation = location.pathname;
16+
const currentLocation = window.location.pathname;
1717

1818
const sidebarContent = (
1919
<ul className="bootstrap-jail">
@@ -26,7 +26,11 @@ class Container extends React.Component {
2626
<Link className={styles.linkBorder} to={appPrefix + '/manage'}>
2727
Manage
2828
</Link>
29-
<LeftSidebar appPrefix={appPrefix} {...this.props} />
29+
<LeftSidebar
30+
appPrefix={appPrefix}
31+
{...this.props}
32+
allowOpenApiImport
33+
/>
3034
</li>
3135
<li
3236
role="presentation"

‎frontend/libs/console/legacy-ce/src/lib/components/Services/Actions/Landing/Main.js

+18-23
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { appPrefix, pageTitle } from '../constants';
88
import globals from '../../../../Globals';
99
import { Button } from '../../../../new-components/Button';
1010
import TopicDescription from '../../Common/Landing/TopicDescription';
11-
import { isImportFromOpenAPIEnabled } from '../../../../utils';
1211
import { FaEdit, FaFileImport } from 'react-icons/fa';
1312
import { Badge } from '../../../../new-components/Badge';
1413

@@ -65,29 +64,25 @@ class Landing extends React.Component {
6564
<div className={'flex'}>
6665
<h2 className="font-bold text-3xl pr-3">Actions</h2>
6766
{getAddBtn()}
68-
{isImportFromOpenAPIEnabled(window.__env) && (
69-
<Analytics
70-
name="action-tab-btn-import-action-from-openapi"
71-
passHtmlAttributesToChildren
67+
<Analytics
68+
name="action-tab-btn-import-action-from-openapi"
69+
passHtmlAttributesToChildren
70+
>
71+
<Button
72+
icon={<FaFileImport />}
73+
className="ml-2"
74+
onClick={() => {
75+
dispatch(
76+
push(`${globals.urlPrefix}${appPrefix}/manage/add-oas`)
77+
);
78+
}}
7279
>
73-
<Button
74-
icon={<FaFileImport />}
75-
className="ml-2"
76-
onClick={() => {
77-
dispatch(
78-
push(
79-
`${globals.urlPrefix}${appPrefix}/manage/add-oas`
80-
)
81-
);
82-
}}
83-
>
84-
Import from OpenAPI
85-
<Badge className="ml-2 font-xs" color="purple">
86-
New
87-
</Badge>
88-
</Button>
89-
</Analytics>
90-
)}
80+
Import from OpenAPI
81+
<Badge className="ml-2 font-xs" color="purple">
82+
New
83+
</Badge>
84+
</Button>
85+
</Analytics>
9186
</div>
9287
<hr className="mt-5 mb-5" />
9388
{getIntroSection()}

‎frontend/libs/console/legacy-ce/src/lib/components/Services/Actions/Sidebar/LeftSidebar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { browserHistory, Link } from 'react-router';
66

77
import LeftSubSidebar from '../../../Common/Layout/LeftSubSidebar/LeftSubSidebar';
88
import styles from '../../../Common/Layout/LeftSubSidebar/LeftSubSidebar.module.scss';
9-
import { isProConsole } from '../../../../utils';
109
import { Badge } from '../../../../new-components/Badge';
1110
import globals from '../../../../Globals';
1211

@@ -15,6 +14,7 @@ const LeftSidebar = ({
1514
common: { currentAction },
1615
actions,
1716
readOnlyMode,
17+
allowOpenApiImport,
1818
}) => {
1919
const [searchText, setSearchText] = React.useState('');
2020

@@ -109,7 +109,7 @@ const LeftSidebar = ({
109109
addTestString={'actions-sidebar-add-table'}
110110
childListTestString={'actions-table-links'}
111111
addBtn={
112-
isProConsole(window.__env) ? (
112+
allowOpenApiImport ? (
113113
<div
114114
className={`col-xs-4 text-center ${styles.padd_left_remove} ${styles.sidebarCreateTable}`}
115115
>

0 commit comments

Comments
 (0)