studiokit-scaffolding-js 7.0.10-alpha.1 → 7.0.10-next.1.1

package/README.md

@@ -105,6 +105,9 @@ Components and utils can be imported from `studiokit-scaffolding-js/lib/...`
 		* e.g. `1.0.1-alpha.1` => `1.0.1-alpha.2` for a hotfix branch
 	1. Push to gitlab. Azure DevOps will run a pipeline and publish this version to npmjs.org
 	1. Install the new version in the project(s) you are working on by updating its `package.json` and running `yarn`
+		  * As an alternative to the two steps above, if you don't need to make changes available to other devs yet you can:
+		    1. In the studiokit directory, run `yarn build` then `yarn pack`. You'll still need to have incremented the version number to avoid having it cached.
+			1. Over in the Circuit/Variate/etc. directory, run `yarn add ../studiokit-scaffolding-js/package.tgz`. 
 	1. Repeat as needed
 1. Merging
 	* After the Merge Request is approved, **remove** the "next" or "alpha" suffix from the version **before** merging to develop or master

package/lib/components/HOC/FullscreenModalComponent.d.ts

@@ -42,6 +42,7 @@ export declare function configureFullscreenModalComponent<TOwnProps extends {}>(
         componentDidUpdate(prevProps: TOwnProps & FullscreenModalOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps, prevState: FullscreenModalState): void;
         disableScroll: (e: Event) => boolean;
         onOpen: () => void;
+        onClose: () => void;
         closeModal: () => void;
         render(): React.JSX.Element;
         context: any;

package/lib/components/HOC/FullscreenModalComponent.js

@@ -83,8 +83,11 @@ function configureFullscreenModalComponent(WrappedComponent) {
                 document.documentElement.addEventListener('touchmove', _this.disableScroll);
                 _this.props.onEntering();
             };
-            _this.closeModal = function () {
+            _this.onClose = function () {
                 document.documentElement.removeEventListener('touchmove', _this.disableScroll);
+                _this.props.onExited();
+            };
+            _this.closeModal = function () {
                 if (_this.props.closeModal) {
                     _this.props.closeModal();
                     return;
@@ -128,6 +131,9 @@ function configureFullscreenModalComponent(WrappedComponent) {
             if (isOpen) {
                 this.onOpen();
             }
+            else {
+                this.onClose();
+            }
             this.setState({
                 isOpen: isOpen
             });

package/lib/redux/sagas/appInsightsSaga.js

@@ -36,7 +36,7 @@ function appInsightsSaga() {
         switch (_a.label) {
             case 0:
                 appConfig = constants_1.getAppConfig();
-                appInsightsKey = appConfig.APP_INSIGHTS_KEY;
+                appInsightsKey = appConfig.APP_INSIGHTS_CONNECTION_STRING;
                 if (!appInsightsKey) {
                     return [2 /*return*/];
                 }

package/lib/startup.js

@@ -64,10 +64,9 @@ var startup = function (appConfig, endpointMappings) {
         react_ga4_1.default.send({ hitType: 'pageview', page: window.location.pathname });
     }
     // Application Insights
-    if (appConfig.APP_INSIGHTS_KEY) {
+    if (appConfig.APP_INSIGHTS_CONNECTION_STRING) {
         var appInsightsConfig = {
-            // TODO: change to connectionString
-            instrumentationKey: appConfig.APP_INSIGHTS_KEY
+            connectionString: appConfig.APP_INSIGHTS_CONNECTION_STRING
         };
         var appInsights = new applicationinsights_web_1.ApplicationInsights({ config: appInsightsConfig });
         appInsights.loadAppInsights();
@@ -81,7 +80,7 @@ var startup = function (appConfig, endpointMappings) {
             react_ga4_1.default.send({ hitType: 'pageview', page: location.pathname, user_id: configuration_1.getUserId() });
         }
         // send pageview to Application Insights
-        if (appConfig.APP_INSIGHTS_KEY) {
+        if (appConfig.APP_INSIGHTS_CONNECTION_STRING) {
             var appInsights = configuration_1.getAppInsights();
             appInsights.trackPageView({ uri: location.pathname });
         }

package/lib/types/AppConfiguration.d.ts

@@ -25,7 +25,7 @@ export interface AppConfiguration {
     SENTRY_TRACES_SAMPLE_RATE?: number;
     SENTRY_REPLAYS_SESSION_SAMPLE_RATE?: number;
     SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE?: number;
-    APP_INSIGHTS_KEY?: string;
+    APP_INSIGHTS_CONNECTION_STRING?: string;
     CLIENT_ID: string;
     CLIENT_SECRET: string;
     IS_DOWNTIME: boolean;

package/lib/utils/events.js

@@ -22,7 +22,7 @@ var trackCustomEvent = function (event) {
             user_id: userId
         });
     }
-    if (appConfig.APP_INSIGHTS_KEY) {
+    if (appConfig.APP_INSIGHTS_CONNECTION_STRING) {
         var appInsights = constants_1.getAppInsights();
         appInsights.trackEvent({
             name: eventName,

package/lib/utils/shard.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShardKey = exports.isDemoShard = exports.isPurdueShard = void 0;
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var configuration_1 = require("../constants/configuration");
 var shard_1 = require("../constants/shard");
 var windowService_1 = require("../services/windowService");
@@ -22,15 +19,16 @@ function getShardKey(host, localhostShardKey) {
     var finalHost = host || location.host;
     var finalLocalhostShardKey = localhostShardKey || appConfig.LOCALHOST_SHARD_KEY;
     var rootDomain = appConfig.ROOT_DOMAIN;
-    if (lodash_1.default.startsWith(finalHost, 'localhost') && !!finalLocalhostShardKey) {
+    if (lodash_1.startsWith(finalHost, 'localhost') && !!finalLocalhostShardKey) {
         return finalLocalhostShardKey;
     }
-    if (lodash_1.default.startsWith(finalHost, 'localhost') ||
-        lodash_1.default.includes(finalHost, 'azurewebsites.net') ||
-        lodash_1.default.includes(finalHost, 'web.core.windows.net') ||
-        lodash_1.default.includes(finalHost, 'azureedge.net') ||
-        lodash_1.default.includes(finalHost, 'z01.azurefd.net') ||
-        lodash_1.default.includes(finalHost, 'ngrok.io')) {
+    if (lodash_1.startsWith(finalHost, 'localhost') ||
+        lodash_1.includes(finalHost, 'azurewebsites.net') ||
+        lodash_1.includes(finalHost, 'web.core.windows.net') ||
+        lodash_1.includes(finalHost, 'azureedge.net') ||
+        lodash_1.includes(finalHost, 'azurefd.net') ||
+        lodash_1.includes(finalHost, 'azurestaticapps.net') ||
+        lodash_1.includes(finalHost, 'ngrok.io')) {
         return shard_1.SHARD.PURDUE;
     }
     var urlParts = finalHost.split('.');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "7.0.10-alpha.1",
+	"version": "7.0.10-next.1.1",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",