Env/blue.dev

.github/workflow.config.json

@@ -12,7 +12,7 @@
       "commitSha": "HPC_ACTIONS_COMMIT_SHA",
       "treeSha": "HPC_ACTIONS_TREE_SHA"
     },
-    "repository": "public.ecr.aws/unocha/hpc-cdm",
+    "repository": "public.ecr.aws/unocha/hpc-ftsadmin",
     "skipLogin": true
   },
   "ci": ["./.github/ci.sh"],

Dockerfile

@@ -5,7 +5,7 @@ ARG ENVIRONMENT=production
 RUN npm run remove-unneeded-deps && \
     npm install && \
     # Output path is relative to working directory
-    npm run build hpc-cdm -- --output-path=dist/ --configuration=$ENVIRONMENT
+    npm run build hpc-ftsadmin -- --output-path=dist/ --configuration=$ENVIRONMENT
 
 FROM public.ecr.aws/unocha/nginx:stable-beagle
 

apps/hpc-cdm/project.json

@@ -14,7 +14,7 @@
         "polyfills": "apps/hpc-cdm/src/polyfills.ts",
         "tsConfig": "apps/hpc-cdm/tsconfig.app.json",
         "assets": ["apps/hpc-cdm/src/favicon.ico", "apps/hpc-cdm/src/assets"],
-        "styles": [],
+        "styles": ["node_modules/tailwindcss/tailwind.css"],
         "scripts": [],
         "webpackConfig": "apps/hpc-cdm/webpack.config.js",
         "isolatedConfig": true

apps/hpc-cdm/tsconfig.app.json

@@ -15,7 +15,13 @@
     "**/*.test.tsx",
     "jest.config.ts"
   ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.js",
+    "**/*.jsx",
+    "**/*.ts",
+    "**/*.tsx",
+    "../../tailwind.config.js"
+  ],
   "files": [
     "src/app/components/enketo-form/enketo-core.d.ts",
     "../../node_modules/@nx/react/typings/cssmodule.d.ts",

apps/hpc-ftsadmin/project.json

@@ -20,7 +20,7 @@
           "apps/hpc-ftsadmin/src/favicon.ico",
           "apps/hpc-ftsadmin/src/assets"
         ],
-        "styles": [],
+        "styles": ["node_modules/tailwindcss/tailwind.css"],
         "scripts": [],
         "webpackConfig": "apps/hpc-ftsadmin/webpack.config.js",
         "isolatedConfig": true

apps/hpc-ftsadmin/src/app/app.tsx

@@ -16,10 +16,16 @@ import { LanguageKey, LANGUAGE_CHOICE, t } from '../i18n';
 import PageMeta from './components/page-meta';
 import { AppContext, contextFromEnv } from './context';
 import { Z_INDEX } from './layout';
-import PageFlowsList from './pages/flows-list';
+import PageFlowsList from './pages/flows/flows-list';
+import PageKeywordsList from './pages/keywords/keyword-list';
 import PageNotFound from './pages/not-found';
 import PageNotLoggedIn from './pages/not-logged-in';
+import PagePendingFlowsList from './pages/flows/pending-flows-list';
+import PageOrganizationsList from './pages/organizations/organization-list';
+import PageOrganization from './pages/organizations/organization';
+import FlowEdit from './pages/add-edit/flow-edit';
 import * as paths from './paths';
+import { RouteParamsValidator } from './components/route-params-validator';
 
 const environmentWarning = (env: Environment, lang: LanguageKey) => {
   const warning = env.getDevHeaderWarning(lang);
@@ -91,10 +97,7 @@ export const App = () => {
         loader={loadEnv}
         strings={{
           ...t.get(lang, (s) => s.components.loader),
-          notFound: {
-            ...t.get(lang, (s) => s.components.notFound),
-            ...t.get(lang, (s) => s.routes.operations.notFound),
-          },
+          notFound: t.get(lang, (s) => s.components.notFound),
         }}
       >
         {(context) => {
@@ -126,6 +129,18 @@ export const App = () => {
                             label: t.t(lang, (s) => s.navigation.flows),
                             path: paths.flows(),
                           },
+                          {
+                            label: t.t(lang, (s) => s.navigation.pendingFlows),
+                            path: paths.pendingFlows(),
+                          },
+                          {
+                            label: t.t(lang, (s) => s.navigation.organizations),
+                            path: paths.organizations(),
+                          },
+                          {
+                            label: t.t(lang, (s) => s.navigation.keywords),
+                            path: paths.keywords(),
+                          },
                         ]}
                         className={CLASSES.CONTAINER.FLUID}
                         externalLinks={[
@@ -165,6 +180,12 @@ export const App = () => {
                               ]
                             : []),
                         ]}
+                        actionButtons={[
+                          {
+                            label: t.t(lang, (s) => s.navigation.newFlow),
+                            path: paths.newFlow(),
+                          },
+                        ]}
                       />
                       <Routes>
                         <Route
@@ -175,6 +196,45 @@ export const App = () => {
                           path={paths.flows()}
                           element={<PageFlowsList />}
                         />
+                        <Route
+                          path={paths.pendingFlows()}
+                          element={<PagePendingFlowsList />}
+                        />
+                        <Route
+                          path={paths.organizations()}
+                          element={<PageOrganizationsList />}
+                        />
+                        <Route
+                          path={paths.organizationRoot()}
+                          element={
+                            <RouteParamsValidator
+                              element={<PageOrganization />}
+                              routeParam="id"
+                            />
+                          }
+                        />
+                        <Route
+                          path={paths.addOrganization()}
+                          element={<PageOrganization />}
+                        />
+                        <Route
+                          path={paths.keywords()}
+                          element={<PageKeywordsList />}
+                        />
+                        <Route
+                          path={paths.newFlow()}
+                          element={
+                            <FlowEdit key="new-flow-route" isEdit={false} />
+                          }
+                        />
+                        <Route
+                          path={paths.copyFlow()}
+                          element={<FlowEdit key="copy-flow-route" isEdit />}
+                        />
+                        <Route
+                          path={paths.editFlow()}
+                          element={<FlowEdit key="edit-flow-route" isEdit />}
+                        />
                         <Route element={<PageNotFound />} />
                       </Routes>
                     </LoggedInContainer>

apps/hpc-ftsadmin/src/app/components/Hooks/SharePath.ts

@@ -0,0 +1,16 @@
+import { useState } from 'react';
+
+type SharePath = string;
+
+function useSharePath(
+  initialValue: SharePath
+): [SharePath, (newPath: SharePath) => void] {
+  const [path, setPath] = useState<SharePath>(initialValue);
+
+  const updateData = (newPath: SharePath) => {
+    setPath(newPath);
+  };
+  return [path, updateData];
+}
+
+export default useSharePath;