Merge pull request #969 from jetstreamapp/chore/nx-19

Chore/nx-19

.env.example

@@ -46,9 +46,9 @@ AUTH0_M2M_DOMAIN='dev-ce6oji5b.us.auth0.com'
 
 PRISMA_DEBUG='false'
 
-NX_AUTH_AUDIENCE='http://getjetstream.app/app_metadata'
-NX_ROLLBAR_KEY=''
-NX_AMPLITUDE_KEY=''
+NX_PUBLIC_AUTH_AUDIENCE='http://getjetstream.app/app_metadata'
+NX_PUBLIC_ROLLBAR_KEY=''
+NX_PUBLIC_AMPLITUDE_KEY=''
 
 # Used to save feedback as a github issue and run some build commands
 # Also required for the release process

.github/workflows/ci.yml

@@ -11,9 +11,9 @@ env:
  CONTENTFUL_SPACE: wuv9tl5d77ll
  CONTENTFUL_TOKEN: ${{ secrets.CONTENTFUL_TOKEN }}
  NX_CLOUD_DISTRIBUTED_EXECUTION: false
- NX_AMPLITUDE_KEY: ${{ secrets.NX_AMPLITUDE_KEY }}
- NX_AUTH_AUDIENCE: http://getjetstream.app/app_metadata
- NX_ROLLBAR_KEY: ${{ secrets.NX_ROLLBAR_KEY }}
+ NX_PUBLIC_AMPLITUDE_KEY: ${{ secrets.NX_PUBLIC_AMPLITUDE_KEY }}
+ NX_PUBLIC_AUTH_AUDIENCE: http://getjetstream.app/app_metadata
+ NX_PUBLIC_ROLLBAR_KEY: ${{ secrets.NX_PUBLIC_ROLLBAR_KEY }}
 
 jobs:
  # Build application
@@ -79,10 +79,10 @@ jobs:
  JETSTREAM_CLIENT_URL: http://localhost:3333/app
  JETSTREAM_SERVER_DOMAIN: localhost:3333
  JETSTREAM_SERVER_URL: http://localhost:3333
- NX_AMPLITUDE_KEY: ${{ secrets.NX_AMPLITUDE_KEY }}
- NX_AUTH_AUDIENCE: http://getjetstream.app/app_metadata
+ NX_PUBLIC_AMPLITUDE_KEY: ${{ secrets.NX_PUBLIC_AMPLITUDE_KEY }}
+ NX_PUBLIC_AUTH_AUDIENCE: http://getjetstream.app/app_metadata
  NX_CLOUD_DISTRIBUTED_EXECUTION: false
- NX_ROLLBAR_KEY: ${{ secrets.NX_ROLLBAR_KEY }}
+ NX_PUBLIC_ROLLBAR_KEY: ${{ secrets.NX_PUBLIC_ROLLBAR_KEY }}
  SFDC_CALLBACK_URL: http://localhost:3333/oauth/sfdc/callback
  SFDC_CONSUMER_KEY: ${{ secrets.SFDC_CONSUMER_KEY }}
  SFDC_CONSUMER_SECRET: ${{ secrets.SFDC_CONSUMER_SECRET }}

.gitignore

@@ -57,4 +57,5 @@ package-lock.json
 **/playwright-report
 **/playwright/.cache
 
-.nx/cache
+.nx/cache
+.nx/workspace-data

.prettierignore

@@ -4,4 +4,5 @@
 /coverage
 .docusaurus/
 
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data

apps/api/.env.development

@@ -13,7 +13,7 @@ JETSTREAM_CLIENT_URL="http://localhost:4200/app"
 JETSTREAM_SERVER_DOMAIN="localhost:3333"
 JETSTREAM_SERVER_URL="http://localhost:3333"
 
-NX_AUTH_AUDIENCE="http://getjetstream.app/app_metadata"
+NX_PUBLIC_AUTH_AUDIENCE="http://getjetstream.app/app_metadata"
 NX_BRANCH="main"
 NX_SFDC_API_VERSION="60.0"
 

apps/api/.env.production

@@ -13,7 +13,7 @@ JETSTREAM_CLIENT_URL="https://getjetstream.app/app"
 JETSTREAM_SERVER_DOMAIN="getjetstream.app"
 JETSTREAM_SERVER_URL="https://getjetstream.app"
 
-NX_AUTH_AUDIENCE="http://getjetstream.app/app_metadata"
+NX_PUBLIC_AUTH_AUDIENCE="http://getjetstream.app/app_metadata"
 NX_BRANCH="main"
 NX_SFDC_API_VERSION="61.0"
 

apps/jetstream/src/environments/environment.prod.ts

@@ -1,9 +1,9 @@
 export const environment = {
  name: 'Jetstream',
  production: true,
- rollbarClientAccessToken: import.meta.env.NX_ROLLBAR_KEY,
- amplitudeToken: import.meta.env.NX_AMPLITUDE_KEY,
- authAudience: import.meta.env.NX_AUTH_AUDIENCE,
+ rollbarClientAccessToken: import.meta.env.NX_PUBLIC_ROLLBAR_KEY,
+ amplitudeToken: import.meta.env.NX_PUBLIC_AMPLITUDE_KEY,
+ authAudience: import.meta.env.NX_PUBLIC_AUTH_AUDIENCE,
  MODE: import.meta.env.MODE,
  BASE_URL: import.meta.env.BASE_URL,
  PROD: import.meta.env.PROD,

apps/jetstream/src/environments/environment.test.ts

@@ -1,9 +1,9 @@
 export const environment = {
  name: 'JetstreamTest',
  production: true,
- rollbarClientAccessToken: process.env.NX_ROLLBAR_KEY,
- amplitudeToken: process.env.NX_AMPLITUDE_KEY,
- authAudience: process.env.NX_AUTH_AUDIENCE,
+ rollbarClientAccessToken: process.env.NX_PUBLIC_ROLLBAR_KEY,
+ amplitudeToken: process.env.NX_PUBLIC_AMPLITUDE_KEY,
+ authAudience: process.env.NX_PUBLIC_AUTH_AUDIENCE,
  // MODE: import.meta.env.MODE,
  // BASE_URL: import.meta.env.BASE_URL,
  // PROD: import.meta.env.PROD,

apps/jetstream/src/environments/environment.ts

@@ -4,9 +4,9 @@
 export const environment = {
  name: 'JetstreamDev',
  production: false,
- rollbarClientAccessToken: import.meta.env.NX_ROLLBAR_KEY,
- amplitudeToken: import.meta.env.NX_AMPLITUDE_KEY,
- authAudience: import.meta.env.NX_AUTH_AUDIENCE,
+ rollbarClientAccessToken: import.meta.env.NX_PUBLIC_ROLLBAR_KEY,
+ amplitudeToken: import.meta.env.NX_PUBLIC_AMPLITUDE_KEY,
+ authAudience: import.meta.env.NX_PUBLIC_AUTH_AUDIENCE,
  MODE: import.meta.env.MODE,
  BASE_URL: import.meta.env.BASE_URL,
  PROD: import.meta.env.PROD,

docker-compose.e2e.yml

@@ -28,9 +28,9 @@ services:
  SFDC_CONSUMER_SECRET: '${SFDC_CONSUMER_SECRET}'
  SFDC_CONSUMER_KEY: '${SFDC_CONSUMER_KEY}'
  SFDC_CALLBACK_URL: '${SFDC_CALLBACK_URL}'
- NX_ROLLBAR_KEY: '${NX_ROLLBAR_KEY}'
- NX_AMPLITUDE_KEY: '${NX_AMPLITUDE_KEY}'
- NX_AUTH_AUDIENCE: '${NX_AUTH_AUDIENCE}'
+ NX_PUBLIC_ROLLBAR_KEY: '${NX_PUBLIC_ROLLBAR_KEY}'
+ NX_PUBLIC_AMPLITUDE_KEY: '${NX_PUBLIC_AMPLITUDE_KEY}'
+ NX_PUBLIC_AUTH_AUDIENCE: '${NX_PUBLIC_AUTH_AUDIENCE}'
  ports:
  - '3333:3333'
  - '9229:9229'

libs/api-config/src/lib/env-config.ts

@@ -102,5 +102,5 @@ export const ENV = {
  // HONEYCOMB
  HONEYCOMB_ENABLED: ensureBoolean(process.env.HONEYCOMB_ENABLED),
  HONEYCOMB_API_KEY: process.env.HONEYCOMB_API_KEY,
- AUTH_AUDIENCE: process.env.NX_AUTH_AUDIENCE,
+ AUTH_AUDIENCE: process.env.NX_PUBLIC_AUTH_AUDIENCE,
 };

libs/features/automation-control/src/automation-control-soql-utils.tsx

@@ -1,5 +1,5 @@
 import { logger } from '@jetstream/shared/client-logger';
-import { composeQuery, getField } from 'soql-parser-js';
+import { composeQuery, getField } from '@jetstreamapp/soql-parser-js';
 
 /**
  * SOQL QUERIES

libs/features/create-object-and-fields/src/create-new-object/create-object-utils.ts

@@ -1,9 +1,9 @@
 import { queryAll, sobjectOperation } from '@jetstream/shared/data';
 import { REGEX, splitArrayToMaxSize } from '@jetstream/shared/utils';
 import { Maybe, ObjectPermissionRecordInsert, RecordResult, SalesforceOrgUi, TabPermissionRecordInsert } from '@jetstream/types';
+import { composeQuery, getField } from '@jetstreamapp/soql-parser-js';
 import JSZip from 'jszip';
 import partition from 'lodash/partition';
-import { composeQuery, getField } from 'soql-parser-js';
 import { CreateFieldParams, CreateObjectPayload } from './create-object-types';
 
 export function generateApiNameFromLabel(value: string) {

libs/features/deploy/src/utils/deploy-metadata.utils.tsx

@@ -30,13 +30,13 @@ import {
  setColumnFromType,
  Spinner,
 } from '@jetstream/ui';
+import { composeQuery, getField, Query } from '@jetstreamapp/soql-parser-js';
 import { formatISO } from 'date-fns/formatISO';
 import { parseISO } from 'date-fns/parseISO';
 import JSZip from 'jszip';
 import localforage from 'localforage';
 import isString from 'lodash/isString';
 import { SELECT_COLUMN_KEY, SelectColumn } from 'react-data-grid';
-import { composeQuery, getField, Query } from 'soql-parser-js';
 
 const MAX_HISTORY_ITEMS = 500;
 

libs/features/manage-permissions/src/utils/permission-manager-utils.ts

@@ -28,7 +28,7 @@ import {
  TabVisibilityPermissionRecord,
  TabVisibilityPermissionRecordForSave,
 } from '@jetstream/types';
-import { Query, WhereClause, composeQuery, getField } from 'soql-parser-js';
+import { Query, WhereClause, composeQuery, getField } from '@jetstreamapp/soql-parser-js';
 
 const MAX_OBJ_IN_QUERY = 100;
 

libs/features/query/src/QueryBuilder/QueryBuilderSoqlUpdater.tsx

@@ -1,8 +1,8 @@
 import { fromQueryState } from '@jetstream/ui-core';
 import { composeSoqlQuery } from '@jetstream/ui-core/shared';
+import { GroupByFieldClause, GroupByFnClause, Query } from '@jetstreamapp/soql-parser-js';
 import { FunctionComponent, useEffect } from 'react';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
-import { GroupByFieldClause, GroupByFnClause, Query } from 'soql-parser-js';
 
 /**
  * This component ensures that the entire state tree is not re-rendered each time some query element needs to be modified

libs/features/query/src/QueryOptions/ManualSoql.tsx

@@ -1,11 +1,11 @@
 import { ANALYTICS_KEYS } from '@jetstream/shared/constants';
 import { CheckboxToggle, Grid, GridCol, Icon, Popover, PopoverRef, Spinner, Textarea } from '@jetstream/ui';
+import { useAmplitude } from '@jetstream/ui-core';
+import { formatQuery, isQueryValid } from '@jetstreamapp/soql-parser-js';
 import Editor, { OnMount } from '@monaco-editor/react';
 import type { editor } from 'monaco-editor';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import { formatQuery, isQueryValid } from 'soql-parser-js';
-import { useAmplitude } from '@jetstream/ui-core';
 import RestoreQuery from '../QueryBuilder/RestoreQuery';
 
 export interface ManualSoqlProps {

libs/features/query/src/QueryResults/BulkUpdateFromQuery/BulkUpdateFromQueryModal.tsx

@@ -28,10 +28,10 @@ import {
  fetchRecordsWithRequiredFields,
  useDeployRecords,
 } from '@jetstream/ui-core';
+import { Query } from '@jetstreamapp/soql-parser-js';
 import isNumber from 'lodash/isNumber';
 import { ChangeEvent, FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react';
 import { atom, useRecoilCallback, useRecoilState, useResetRecoilState } from 'recoil';
-import { Query } from 'soql-parser-js';
 import BulkUpdateFromQueryRecordSelection from './BulkUpdateFromQueryRecordSelection';
 
 const MAX_BATCH_SIZE = 10000;

libs/features/query/src/QueryResults/BulkUpdateFromQuery/BulkUpdateFromQueryRecordSelection.tsx

@@ -1,8 +1,8 @@
 import { formatNumber } from '@jetstream/shared/ui-utils';
 import { SalesforceRecord } from '@jetstream/types';
 import { RADIO_ALL_BROWSER, RADIO_ALL_SERVER, RADIO_FILTERED, RADIO_SELECTED, Radio, RadioGroup } from '@jetstream/ui';
+import { Query } from '@jetstreamapp/soql-parser-js';
 import { Fragment, FunctionComponent } from 'react';
-import { Query } from 'soql-parser-js';
 
 export interface BulkUpdateFromQueryRecordSelectionProps {
  disabled?: boolean;

libs/features/query/src/QueryResults/QueryResults.tsx

@@ -51,12 +51,12 @@ import {
  useAmplitude,
 } from '@jetstream/ui-core';
 import { getFlattenSubqueryFlattenedFieldMap } from '@jetstream/ui-core/shared';
+import { FieldSubquery, Query, composeQuery, isFieldSubquery, parseQuery } from '@jetstreamapp/soql-parser-js';
 import classNames from 'classnames';
 import React, { Fragment, FunctionComponent, useCallback, useEffect, useRef, useState } from 'react';
 import { Link, NavLink, useLocation, useNavigate } from 'react-router-dom';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { filter } from 'rxjs/operators';
-import { FieldSubquery, Query, composeQuery, isFieldSubquery, parseQuery } from 'soql-parser-js';
 import QueryHistory, { QueryHistoryRef } from '../QueryHistory/QueryHistory';
 import IncludeDeletedRecordsToggle from '../QueryOptions/IncludeDeletedRecords';
 import useQueryRestore from '../utils/useQueryRestore';

libs/features/query/src/QueryResults/QueryResultsDownloadButton.tsx

@@ -3,9 +3,9 @@ import { ANALYTICS_KEYS } from '@jetstream/shared/constants';
 import { AsyncJobNew, BulkDownloadJob, FileExtCsvXLSXJsonGSheet, Maybe, QueryResultsColumn, SalesforceOrgUi } from '@jetstream/types';
 import { DownloadFromServerOpts, Icon, RecordDownloadModal } from '@jetstream/ui';
 import { applicationCookieState, fromJetstreamEvents, fromQueryState, useAmplitude } from '@jetstream/ui-core';
+import { composeQuery, parseQuery } from '@jetstreamapp/soql-parser-js';
 import { Fragment, FunctionComponent, useState } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
-import { composeQuery, parseQuery } from 'soql-parser-js';
 
 export interface QueryResultsDownloadButtonProps {
  selectedOrg: SalesforceOrgUi;

libs/features/query/src/QueryResults/QueryResultsMoreActions.tsx

@@ -4,10 +4,9 @@ import { formatNumber, useNonInitialEffect } from '@jetstream/shared/ui-utils';
 import { REGEX, pluralizeIfMultiple } from '@jetstream/shared/utils';
 import { AsyncJobNew, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { DropDown, Input, getSfdcRetUrl, salesforceLoginAndRedirect, useConfirmation } from '@jetstream/ui';
-import { fromJetstreamEvents } from '@jetstream/ui-core';
+import { fromJetstreamEvents, useAmplitude } from '@jetstream/ui-core';
+import { Query } from '@jetstreamapp/soql-parser-js';
 import { Fragment, FunctionComponent, useState } from 'react';
-import { Query } from 'soql-parser-js';
-import { useAmplitude } from '@jetstream/ui-core';
 import BulkUpdateFromQueryModal from './BulkUpdateFromQuery/BulkUpdateFromQueryModal';
 import QueryResultsGetRecAsApexModal from './QueryResultsGetRecAsApexModal';
 

libs/features/query/src/QueryResults/QueryResultsSoqlPanel.tsx

@@ -2,10 +2,10 @@ import { useDebounce, useNonInitialEffect } from '@jetstream/shared/ui-utils';
 import { SalesforceOrgUi } from '@jetstream/types';
 import { CheckboxToggle, Grid, Icon, Panel, Textarea, Tooltip } from '@jetstream/ui';
 import { fromQueryHistoryState } from '@jetstream/ui-core';
+import { formatQuery, parseQuery } from '@jetstreamapp/soql-parser-js';
 import Editor, { OnMount, useMonaco } from '@monaco-editor/react';
 import type { editor } from 'monaco-editor';
 import { FunctionComponent, useEffect, useReducer, useRef, useState } from 'react';
-import { formatQuery, parseQuery } from 'soql-parser-js';
 import SaveFavoriteSoql from '../QueryOptions/SaveFavoriteSoql';
 
 type Action =

libs/features/query/src/QueryResults/useQueryResultsFetchMetadata.ts

@@ -1,7 +1,7 @@
 import { logger } from '@jetstream/shared/client-logger';
 import { Field, Maybe, SalesforceOrgUi } from '@jetstream/types';
+import { Query } from '@jetstreamapp/soql-parser-js';
 import { useCallback, useEffect, useState } from 'react';
-import { Query } from 'soql-parser-js';
 import { fetchMetadataFromSoql } from '../utils/query-soql-utils';
 
 /**

libs/features/query/src/utils/__tests__/query-soql-utils.spec.ts

@@ -1,4 +1,4 @@
-import { FieldType as QueryFieldType, parseQuery } from 'soql-parser-js';
+import { FieldType as QueryFieldType, parseQuery } from '@jetstreamapp/soql-parser-js';
 import { SoqlMetadataTree, __TEST_EXPORTS__ } from '../query-soql-utils';
 
 const {

libs/features/query/src/utils/query-restore-utils.ts

@@ -26,7 +26,6 @@ import {
  SalesforceOrgUi,
 } from '@jetstream/types';
 import { fromQueryState } from '@jetstream/ui-core';
-import isString from 'lodash/isString';
 import {
  Condition,
  DateLiteral,
@@ -43,7 +42,8 @@ import {
  Query,
  FieldType as QueryFieldType,
  WhereClause,
-} from 'soql-parser-js';
+} from '@jetstreamapp/soql-parser-js';
+import isString from 'lodash/isString';
 import {
  BASE_FIELD_SEPARATOR,
  CHILD_FIELD_SEPARATOR,

libs/features/query/src/utils/query-soql-utils.ts

@@ -3,15 +3,15 @@ import { describeGlobal, describeSObject } from '@jetstream/shared/data';
 import { getFieldKey } from '@jetstream/shared/ui-utils';
 import { orderValues } from '@jetstream/shared/utils';
 import { DescribeGlobalSObjectResult, DescribeSObjectResult, Field, Maybe, SalesforceOrgUi } from '@jetstream/types';
-import isString from 'lodash/isString';
 import {
  Query,
  FieldType as QueryFieldType,
  WhereClause,
  isOrderByField,
  isValueCondition,
  isWhereOrHavingClauseWithRightCondition,
-} from 'soql-parser-js';
+} from '@jetstreamapp/soql-parser-js';
+import isString from 'lodash/isString';
 import { getQueryFieldBaseKey, getSubqueryFieldBaseKey } from './query-fields-utils';
 
 export interface SoqlMetadataTree {

libs/features/query/src/utils/useQueryRestore.tsx

@@ -4,10 +4,10 @@ import { getErrorMessageAndStackObj } from '@jetstream/shared/utils';
 import { Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { fireToast } from '@jetstream/ui';
 import { fromQueryState, selectedOrgState } from '@jetstream/ui-core';
+import { Query, parseQuery } from '@jetstreamapp/soql-parser-js';
 import isString from 'lodash/isString';
 import { useEffect, useRef, useState } from 'react';
 import { useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
-import { Query, parseQuery } from 'soql-parser-js';
 import { QueryRestoreErrors, UserFacingRestoreError, restoreQuery } from './query-restore-utils';
 
 const ERROR_MESSAGES = {

libs/features/update-records/src/selection/MassUpdateRecordsApplyToAllRow.tsx

@@ -10,8 +10,8 @@ import {
  transformationCriteriaListItems,
  transformationOptionListItems,
 } from '@jetstream/ui-core';
+import { isQueryValid } from '@jetstreamapp/soql-parser-js';
 import { FunctionComponent, useEffect, useState } from 'react';
-import { isQueryValid } from 'soql-parser-js';
 
 export interface MassUpdateRecordsApplyToAllRowProps {
  commonFields: ListItem[];

libs/monaco-configuration/src/lib/language-soql.ts

@@ -1,8 +1,8 @@
 // Used SQL as a starting point
 // https://github.com/microsoft/monaco-languages/blob/main/src/sql/sql.ts
 // TODO: consider open sourcing the apex part
+import { formatQuery } from '@jetstreamapp/soql-parser-js';
 import type * as monaco from 'monaco-editor';
-import { formatQuery } from 'soql-parser-js';
 
 type Monaco = typeof monaco;
 

libs/salesforce-api/src/lib/api-query.ts

@@ -1,6 +1,6 @@
 import { flattenQueryColumn, getErrorMessage } from '@jetstream/shared/utils';
 import { QueryColumnsSfdc, QueryResult, QueryResults, QueryResultsColumns } from '@jetstream/types';
-import { Query, parseQuery } from 'soql-parser-js';
+import { Query, parseQuery } from '@jetstreamapp/soql-parser-js';
 import { ApiConnection } from './connection';
 import { SalesforceApi } from './utils';
 

libs/shared/ui-core-shared/src/query-soql-utils.ts

@@ -3,7 +3,6 @@ import { describeGlobal, describeSObject } from '@jetstream/shared/data';
 import { getFieldKey } from '@jetstream/shared/ui-utils';
 import { orderValues } from '@jetstream/shared/utils';
 import { DescribeGlobalSObjectResult, DescribeSObjectResult, Field, Maybe, SalesforceOrgUi } from '@jetstream/types';
-import isString from 'lodash/isString';
 import {
  OrderByFieldClause,
  Query,
@@ -12,7 +11,8 @@ import {
  isOrderByField,
  isValueCondition,
  isWhereOrHavingClauseWithRightCondition,
-} from 'soql-parser-js';
+} from '@jetstreamapp/soql-parser-js';
+import isString from 'lodash/isString';
 import { getQueryFieldBaseKey, getSubqueryFieldBaseKey } from './query-fields-utils';
 
 export interface SoqlMetadataTree {

libs/shared/ui-core-shared/src/query-utils.ts

@@ -1,12 +1,12 @@
 import { convertFiltersToWhereClause } from '@jetstream/shared/ui-utils';
 import { groupByFlat } from '@jetstream/shared/utils';
 import { ErrorResult, ExpressionType, Field, FieldType, Maybe, SalesforceRecord } from '@jetstream/types';
+import { FieldSubquery, HavingClause, Query, WhereClause, composeQuery, getFlattenedFields } from '@jetstreamapp/soql-parser-js';
 import { formatISO } from 'date-fns/formatISO';
 import { parseISO } from 'date-fns/parseISO';
 import isNil from 'lodash/isNil';
 import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
-import { FieldSubquery, HavingClause, Query, WhereClause, composeQuery, getFlattenedFields } from 'soql-parser-js';
 
 export interface EditFromErrors {
  hasErrors: boolean;