Addressed bash feedback

diningPhilosopher64 · diningPhilosopher64 · commit 65e6401e7a86 · 2024-10-25T00:14:36.000+05:30
diff --git a/src/licensing/gui/src/components/App/index.js b/src/licensing/gui/src/components/App/index.js
@@ -22,8 +22,12 @@ import {
     selectError,
     selectAuthEnabled,
     selectIsAuthenticated,
-    selectIsInvalidTokenError
-
+    selectIsInvalidTokenError,
+    selectLicensingIsMhlm,
+    selectLicensingIsNlm,
+    selectLicensingIsExistingLicense,
+    selectLicensingMhlmUsername,
+    selectLicensingNLMConnectionString
 } from "../../selectors";
 
 import {
@@ -53,7 +57,12 @@ function App() {
     const authEnabled = useSelector(selectAuthEnabled);
     const error = useSelector(selectError)
     const isInvalidTokenError = useSelector(selectIsInvalidTokenError)
-    
+    const isMHLM = useSelector(selectLicensingIsMhlm)
+    const isNLM = useSelector(selectLicensingIsNlm)
+    const isExistingLicense = useSelector(selectLicensingIsExistingLicense)
+    const mhlmUsername = useSelector(selectLicensingMhlmUsername)
+    const nlmConnectionString = useSelector(selectLicensingNLMConnectionString)
+
     function handleClick(e) {
         e.preventDefault();
         dispatch(fetchUnsetLicensing())
@@ -63,10 +72,15 @@ function App() {
         dialog = (
             <Error message="Server unreachable"> </Error>
         );
-    } else if(error && !isInvalidTokenError){
+    } else if(error && !isInvalidTokenError){     
+        const actionToTake = ['OnlineLicensingError', 'LicensingError', 'EntitlementError'].includes(error.type) ? (
+            <span onClick={handleClick} style={{ color: 'blue', cursor: 'pointer' }}> Try Licensing again </span>
+        ) : null;
+
+
         dialog = (
-            <Error message={error.message}> 
-                <span onClick={handleClick} style={{ color: 'blue', cursor: 'pointer' }}> Try Licensing again </span>            
+            <Error message={error.message}>                 
+                {actionToTake}      
             </Error>
         );
     }
@@ -136,7 +150,20 @@ function App() {
     } else if (hasEntitlements && !isEntitled) {
         overlayContent = <EntitlementSelector options={licensingInfo.entitlements} />;
     } else {
-        overlayContent = <div> <h1>You have successfully signed in. Please feel free to close this window</h1> </div>
+        // Licensing was successful        
+        let textToShow
+
+        if(isNLM){
+            textToShow = <div> <h1>Using Network License Manager at <i>{nlmConnectionString}</i><br/>Close this window and continue in VSCode.</h1> </div>               
+        } else if(isExistingLicense) {            
+            textToShow = <div> <h1> MATLAB is activated<br/>Close this window and continue in VSCode.` </h1> </div>
+        } else if(isMHLM){
+            textToShow = <div><h1> You have successfully signed in as <i>{mhlmUsername}</i><br/>Close this window and continue in VSCode.</h1> </div>
+        }  
+
+        overlayContent = <div style={{textAlign: 'center'}} >
+            {textToShow} 
+        </div>
         transparent = true;
     }
 
diff --git a/src/licensing/gui/src/components/LicensingGatherer/MHLM.js b/src/licensing/gui/src/components/LicensingGatherer/MHLM.js
@@ -65,6 +65,12 @@ function initLogin(clientNonce, serverNonce, sourceId) {
     loginFrame.postMessage(JSON.stringify(initPayload), "*");
 }
 
+const versionRegex = /^[Rr]\d{4}[ab]$/
+
+function validateInput(matlabVersion) {    
+    return versionRegex.test(matlabVersion)
+} 
+
 // Adding a child prop with null as default for improved testability.
 function MHLM({mhlmLicensingInfo = null}) {
     const matlabVersionRef = useRef(null);
@@ -77,6 +83,10 @@ function MHLM({mhlmLicensingInfo = null}) {
     // useState variable to store response from mhlm after authentication
     const [fetchedMhlmLicensingInfo, setFetchedMhlmLicensingInfo] = useState(mhlmLicensingInfo)
     
+    const [matlabVersionInput, setMatlabVersionInput] = useState("");
+    const [changed, setChanged] = useState(false);
+    const valid = validateInput(matlabVersionInput)
+
     const mhlmLoginHostname = useMemo(
         () => {
             let subdomain = 'login';
@@ -172,22 +182,37 @@ function MHLM({mhlmLicensingInfo = null}) {
     const chooseMatlabVersionDropDown = (
     <div id="ChooseMatlabVersion">
             <form onSubmit={submitForm}>
-                <div className='form-group'>                     
+                <div className={`form-group has-feedback ${changed ? (valid ? 'has-success' : 'has-error') : ''}`}>                     
                     <p>
                         <b>Note</b>: The MATLAB version could not be determined. Enter the version of MATLAB you are attempting to start.
                     </p>
                     <br/>                   
                     <label htmlFor="matlabVersion">MATLAB Version:</label>
-                    <input
+
+
+                    <div className="input-group">
+                        <input
                         type="text"
                         className="form-control"
+                        placeholder={'R20XYb'}
                         id="matlabVersion"
-                        ref={matlabVersionRef}                                            
-                    />
+                        aria-invalid={!valid}
+                        ref={matlabVersionRef}
+                        value={matlabVersionInput}
+                        onChange={event => { setChanged(true); setMatlabVersionInput(event.target.value); }}
+                        />                        
+                        <span className="input-group-addon" >
+                        {valid ? (
+                            <span className="glyphicon glyphicon-ok form-control-feedback" style={{ paddingLeft: '8px' }}></span>
+                        ) : (
+                            <span className="glyphicon glyphicon-remove form-control-feedback" style={{ paddingLeft: '8px' }}></span>
+                        )}
+                        </span>
+                    </div>
 
                     <br/><br/>
 
-                    <input type="submit" id="startMatlabBtn" value="Submit" className="btn btn_color_blue" />
+                    <input disabled={!valid} type="submit" id="startMatlabBtn" value="Submit" className="btn btn_color_blue" />
                 </div>
             </form>
     </div>            
diff --git a/src/licensing/gui/src/components/LicensingGatherer/NLM.js b/src/licensing/gui/src/components/LicensingGatherer/NLM.js
@@ -60,17 +60,25 @@ function NLM() {
             <form onSubmit={submitForm}>
                 <div className={`form-group has-feedback ${changed ? (valid ? 'has-success' : 'has-error') : ''}`}>
                     <label htmlFor="nlm-connection-string">License Server Address</label>
-                    <input id="nlm-connection-string"
-                        type="text"
-                        required={true}
-                        placeholder={'port@hostname'}
-                        className="form-control"
-                        aria-invalid={!valid}
-                        value={connStr}
-                        onChange={event => { setChanged(true); setConnStr(event.target.value); }}
-                    />
-                    <span className="glyphicon form-control-feedback glyphicon-remove"></span>
-                    <span className="glyphicon form-control-feedback glyphicon-ok"></span>
+                    <div className="input-group">
+                        <input id="nlm-connection-string"
+                            type="text"
+                            required={true}
+                            placeholder={'port@hostname'}
+                            className="form-control"
+                            aria-invalid={!valid}
+                            value={connStr}
+                            onChange={event => { setChanged(true); setConnStr(event.target.value); }}
+                        />
+                        
+                        <span className="input-group-addon" >
+                            {valid ? (
+                                <span className="glyphicon glyphicon-ok form-control-feedback" style={{ paddingLeft: '8px' }}></span>
+                            ) : (
+                                <span className="glyphicon glyphicon-remove form-control-feedback" style={{ paddingLeft: '8px' }}></span>
+                            )}
+                        </span>                        
+                    </div>
                 </div>
                 <input type="submit" id="submit" value="Submit" className="btn btn_color_blue" disabled={!valid} />
             </form>
diff --git a/src/licensing/gui/src/selectors/index.js b/src/licensing/gui/src/selectors/index.js
@@ -87,12 +87,30 @@ export const selectLicensingIsMhlm = createSelector(
     (licensingInfo, licensingProvided) => licensingProvided && licensingInfo.type === 'mhlm'
 );
 
+export const selectLicensingIsNlm = createSelector(
+    selectLicensingInfo,
+    selectLicensingProvided,
+    (licensingInfo, licensingProvided) => licensingProvided && licensingInfo.type === 'nlm'
+);
+
+export const selectLicensingIsExistingLicense = createSelector(
+    selectLicensingInfo,
+    selectLicensingProvided,
+    (licensingInfo, licensingProvided) => licensingProvided && licensingInfo.type === 'existing_license'
+);
+
 export const selectLicensingMhlmUsername = createSelector(
     selectLicensingInfo,
     selectLicensingIsMhlm,
     (licensingInfo, isMhlm) => isMhlm ? licensingInfo.emailAddress : ''
 );
 
+export const selectLicensingNLMConnectionString = createSelector(
+    selectLicensingInfo,
+    selectLicensingIsNlm,
+    (licensingInfo, isNlm) => isNlm ? licensingInfo.connectionString : ''
+);
+
 // Selector to check if the license type is mhlm and entitlements property is not empty
 export const selectLicensingMhlmHasEntitlements = createSelector(
     selectLicensingIsMhlm,
diff --git a/src/licensing/index.ts b/src/licensing/index.ts
@@ -162,7 +162,7 @@ export default class Licensing {
      * @private
      * @returns {boolean} `true` if the licensing type is MHLM, `false` otherwise.
      */
-    private isMHLMLicensing (): boolean {
+    isMHLMLicensing (): boolean {
         return isMHLMLicensingDataType(this.data);
     }
 
@@ -171,7 +171,7 @@ export default class Licensing {
      * @private
      * @returns {boolean} `true` if the licensing type is NLM, `false` otherwise.
      */
-    private isNLMLicensing (): boolean {
+    isNLMLicensing (): boolean {
         return isNLMLicensingDataType(this.data)
     }
 
@@ -180,7 +180,7 @@ export default class Licensing {
      * @private
      * @returns {boolean} `true` if the licensing type is an existing license, `false` otherwise.
      */
-    private isExistingLicensing (): boolean {
+    isExistingLicensing (): boolean {
         return isExistingLicensingDataType(this.data)
     }
 
@@ -189,7 +189,7 @@ export default class Licensing {
      * @private
      * @returns {boolean} `true` if there is no licensing configured, `false` otherwise.
      */
-    private isNoLicensing (): boolean {
+    isNoLicensing (): boolean {
         return isNoLicensingDataType(this.data);
     }
 
@@ -214,10 +214,11 @@ export default class Licensing {
      */
     async unsetLicensing (): Promise<void> {
         this.data = null
-        if (this.error instanceof LicensingError) {
+        if (this.error && this.error instanceof LicensingError) {           
             this.error = null
-        }
+        }               
         await this.deleteCachedConfigFile()
+        console.log("Successfully unset licensing")
     }
 
     /**
@@ -329,11 +330,12 @@ export default class Licensing {
      * @param connectionStr - The NLM connection string.
      * @private
      */
-    private setLicensingToNLM (connectionStr: string): void {
+    private setLicensingToNLM (data: any): void {
+        const {connectionString} = data;
         this.data = {
             type: NLMLicenseType,
-            conn_str: connectionStr
-        };
+            conn_str: connectionString
+        }
 
         Logger.log('Persisting NLM info.')
         this.persistConfigData();
@@ -449,7 +451,7 @@ export default class Licensing {
      * @private
      * @returns {Promise<boolean>} `true` if the licensing information was updated and persisted successfully, `false` otherwise.
      */
-    private async updateAndPersistLicensing (): Promise<boolean> {
+    async updateAndPersistLicensing (): Promise<boolean> {
         const successfulUpdate = await this.updateEntitlements();
         if (successfulUpdate) {
             this.persistConfigData();
diff --git a/src/licensing/types.ts b/src/licensing/types.ts
@@ -126,7 +126,7 @@ export function isMHLMLicensingDataType (data: LicensingData): boolean {
  */
 export function isNLMLicensingDataType (data: LicensingData): boolean {
     return typeof data === 'object' && data != null &&
-    Object.keys(data).length === 1 &&
+    Object.keys(data).length === 2 &&
     'conn_str' in data && data.conn_str !== null;
 }
 
diff --git a/src/utils/LicensingUtils.ts b/src/utils/LicensingUtils.ts
@@ -170,4 +170,18 @@ export async function handleSignInChanged (configuration: Settings): Promise<voi
  */
 export function handleInstallPathSettingChanged (configuration: Settings): void {
     setInstallPath(configuration.installPath)
+    const licensing = new Licensing()
+
+    // Entitlements are based on the MATLAB version
+    // As installPath is changed, we need to update the entitlements using the 
+    // new MATLAB version.
+    if(licensing.isMHLMLicensing()){
+        licensing.updateAndPersistLicensing().then(isSuccessful => {
+            if(isSuccessful){
+                Logger.log("Successfully updated entitlements using the new MATLAB version")
+            }  else {
+                Logger.log("Failed to update entitlements using the new MATLAB version")
+            }
+        })
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ export function isMHLMLicensingDataType (data: LicensingData): boolean {`
`126`	`126`	`*/`
`127`	`127`	`export function isNLMLicensingDataType (data: LicensingData): boolean {`
`128`	`128`	`return typeof data === 'object' && data != null &&`
`129`		`- Object.keys(data).length === 1 &&`
	`129`	`+ Object.keys(data).length === 2 &&`
`130`	`130`	`'conn_str' in data && data.conn_str !== null;`
`131`	`131`	`}`
`132`	`132`