Updated for csw-6.0.0, esw-1.0.2

Author: abrighton

.eslintrc.json

@@ -9,12 +9,13 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4.2.0
         with:
-          node-version: "16.x"
+          node-version: "22.15.0"
           registry-url: "https://registry.npmjs.org"
+      - run: npm install -g npm@10.9.2
 
       - name: Build
         run: |

.github/workflows/dev.yml

@@ -9,17 +9,18 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: coursier/setup-action@v1.2.0-M2
+      - uses: actions/checkout@v4
+      - uses: coursier/setup-action@v1.2.0
         with:
-          jvm: temurin:1.17
-          apps: sbt sbtn
+          jvm: temurin:1.21
+          apps: sbt
       - uses: coursier/cache-action@v6.3
 
       - uses: actions/setup-node@v1
         with:
-          node-version: "16.x"
+          node-version: "22.15.0"
           registry-url: "https://registry.npmjs.org"
+      - run: npm install -g npm@10.9.2
 
       - name: Get tag
         id: tag

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 import org.tmt.sbt.docs.DocKeys._
 import org.tmt.sbt.docs.Settings
 
-ThisBuild / scalaVersion := "2.13.8"
+ThisBuild / scalaVersion := "3.6.4"
 ThisBuild / organizationName := "TMT Org"
 ThisBuild / docsRepo := "https://github.com/tmtsoftware/tmtsoftware.github.io.git"
 ThisBuild / docsParentDir := "esw-gateway-ui-example"
@@ -10,11 +10,11 @@ ThisBuild / gitCurrentRepo := "https://github.com/tmtsoftware/esw-gateway-ui-exa
 ThisBuild / version := sys.env.getOrElse("JITPACK_VERSION", "0.1.0-SNAPSHOT")
 
 lazy val CSW_VERSION: Option[String] = sys.props.get("prod.publish").collect {
-  case "true" => "4.0.1"
+  case "true" => "6.0.0"
 }
 
 lazy val ESW_VERSION: Option[String] = sys.props.get("prod.publish").collect {
-  case "true" => "0.4.0"
+  case "true" => "1.0.2"
 }
 
 lazy val openSite =
@@ -47,8 +47,8 @@ lazy val docs = project
       }
     },
     paradoxProperties ++= Map(
-      "esw-version"             -> ESW_VERSION.getOrElse("0.5.0"),
-      "csw-version"             -> CSW_VERSION.getOrElse("5.1.0")
+      "esw-version"             -> ESW_VERSION.getOrElse("1.0.2"),
+      "csw-version"             -> CSW_VERSION.getOrElse("6.0.0")
     )
   )
 

build.sbt

@@ -17,7 +17,7 @@ build the frontend created by the template.  This will also help ensure you have
 ### Compile the Frontend
 
 The `sample/src` sub-folder is where your frontend application is located.  It uses Typescript, React and node.
-Make sure node version `v16.0.0` or higher is installed in your machine. Let's compile our generated application.
+Make sure node version `v22.15.1` and npm 10.9.2 or higher are installed on your machine. Let's compile our generated application.
 
 ```bash
 cd sample
@@ -55,8 +55,8 @@ building your UI.  ESW-TS documentation can be found [here](http://tmtsoftware.g
 
 ### Create login component
 
-Use of the TMT Command Service via the UI Gateway requires authentication.  The user must login via the TMT AAS login 
-page, so we will add a login component from the ESW-TS library.  Create a `Login.tsx` file in the `src/components` folder 
+Use of the TMT Command Service via the UI Gateway requires authentication.  The user must login via the TMT AAS login
+page, so we will add a login component from the ESW-TS library.  Create a `Login.tsx` file in the `src/components` folder
 which will redirect the user to the TMT login page. Later we will use this `Login` Component in `Main.tsx`.
 
 Copy the full snippet shown below & paste it in Login.tsx
@@ -73,13 +73,13 @@ Copy the full snippet shown below and replace the contents in `Main.tsx`.
 Typescript
 : @@snip [Main.tsx](../../../../src/components/Main.tsx) { #auth }
 
-Here, you will see that there is a check to see if the user is authenticated, and if not, the login component will be 
+Here, you will see that there is a check to see if the user is authenticated, and if not, the login component will be
 shown.  If the user is authenticated, the normal functionality of the app is presented, which right now, is just the
 Hello World page.
 
-In order for our main component to have access to authentication logic from ESW-TS, we need to add a 
+In order for our main component to have access to authentication logic from ESW-TS, we need to add a
 [context provider](https://reactjs.org/docs/context.html) to the component.  We do this when the component is constructed
-at the top level.  We will wrap our Main application with `AuthContextProvider` from `esw-ts` in `App.tsx` 
+at the top level.  We will wrap our Main application with `AuthContextProvider` from `esw-ts` in `App.tsx`
 as shown below
 
 Copy the snippet within the `return` statement from the following & update `App.tsx`.
@@ -93,7 +93,7 @@ After adding this section, run the following command to see the progress that we
 npm start
 ```
 
-You should now see `Loading...` on the browser screen.  
+You should now see `Loading...` on the browser screen.
 
 ![login](../images/login.png)
 
@@ -113,11 +113,11 @@ Start the UI Gateway Service using esw-services.
 
 ```bash
 cs install esw-services
-esw-services start -g
+esw-services start start-eng-ui-services
 
 ```
 
-Now try reloading the front end in browser.  If the page is still up, refresh the page.  If you closed it, restart the 
+Now try reloading the front end in browser.  If the page is still up, refresh the page.  If you closed it, restart the
 server using:
 
 ```bash

docs/src/main/flows/base-flow.md

@@ -0,0 +1,35 @@
+// @ts-check
+
+import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
+import globals from 'globals'
+import pluginReact from 'eslint-plugin-react'
+import { fixupPluginRules } from '@eslint/compat';
+import reactHookPlugin from "eslint-plugin-react-hooks";
+
+export default tseslint.config(eslint.configs.recommended, tseslint.configs.recommended, {
+  ...pluginReact.configs.flat.recommended,
+  plugins: {
+    'react-hooks': fixupPluginRules(reactHookPlugin),
+  },
+  rules: {
+    '@typescript-eslint/no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-vars': 'off'
+    // '@typescript-eslint/no-unused-expressions': [
+    //   'warn',
+    //   {
+    //     allowShortCircuit: true,
+    //     allowTernary: true,
+    //     allowTaggedTemplates: true
+    //   }
+    // ],
+  },
+  settings: {
+    react: {
+      version: 'detect'
+    }
+  },
+  languageOptions: {
+    globals: globals.node
+  }
+})

eslint.config.mjs

@@ -1,7 +1,9 @@
-jdk:
-  - adoptopenjdk11
 before_install:
+  - curl -fLo coursier https://github.com/coursier/launchers/raw/8967c37b89afa12d037476b572176c2aa98f3bbc/coursier
+  - chmod +x coursier
+  - ./coursier java --jvm temurin:1.21
   - export JITPACK_VERSION=$VERSION
-  - wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.6.1/sbt-launch-1.6.1.jar
+  - wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.10.6/sbt-launch-1.10.6.jar
 install:
-  java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.6.1.jar -Dsbt.log.noformat=true clean publishM2
+  - eval $(./coursier java --jvm temurin:1.21 --env)
+  - java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.10.6.jar -Dsbt.log.noformat=true clean publishM2