Forced merge: merge ai-dev into master

.gitignore

@@ -0,0 +1,7 @@
+node_modules/
+*/node_modules/
+**/node_modules/
+*/build/
+**/build/
+.DS_Store
+.env

app-shell/src/config.js

@@ -0,0 +1,18 @@
+
+
+const config = {
+  admin_pass: "df170051",
+  admin_email: "admin@flatlogic.com",
+  schema_encryption_key: process.env.SCHEMA_ENCRYPTION_KEY || '',
+
+  project_uuid: 'df170051-a138-4641-ad0d-a5ac07a19601',
+  flHost: process.env.NODE_ENV === 'production' ? 'https://flatlogic.com/projects' : 'http://localhost:3000/projects',
+
+  gitea_domain: process.env.GITEA_DOMAIN || 'gitea.flatlogic.app',
+  gitea_username: process.env.GITEA_USERNAME || 'admin',
+  gitea_api_token: process.env.GITEA_API_TOKEN || null,
+  github_repo_url: process.env.GITHUB_REPO_URL || null,
+  github_token: process.env.GITHUB_TOKEN || null,
+};
+
+module.exports = config;

app-shell/src/index.js

@@ -0,0 +1,54 @@
+const express = require('express');
+const cors = require('cors');
+const app = express();
+const bodyParser = require('body-parser');
+const checkPermissions = require('./middlewares/check-permissions');
+const modifyPath = require('./middlewares/modify-path');
+const VCS = require('./services/vcs');
+
+const executorRoutes = require('./routes/executor');
+const vcsRoutes = require('./routes/vcs');
+
+// Function to initialize the Git repository
+function initRepo() {
+    const projectId = '34916';
+    return VCS.initRepo(projectId);
+}
+
+// Start the Express app on APP_SHELL_PORT (4000)
+function startServer() {
+    const PORT = 4000;
+    app.listen(PORT, () => {
+        console.log(`Listening on port ${PORT}`);
+    });
+}
+
+// Run Git check after the server is up
+function runGitCheck() {
+    initRepo()
+      .then(result => {
+          console.log(result?.message ? result.message : result);
+          // Here you can add additional logic if needed
+      })
+      .catch(err => {
+          console.error('Error during repo initialization:', err);
+          // Optionally exit the process if Git check is critical:
+          // process.exit(1);
+      });
+}
+
+app.use(cors({ origin: true }));
+app.use(bodyParser.json());
+app.use(checkPermissions);
+app.use(modifyPath);
+
+app.use('/executor', executorRoutes);
+app.use('/vcs', vcsRoutes);
+
+// Start the app_shell server
+startServer();
+
+// Now perform Git check
+runGitCheck();
+
+module.exports = app;

backend/src/db/migrations/1760712716317.js

@@ -0,0 +1,54 @@
+module.exports = {
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async up(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.addColumn(
+        'archival_items',
+        'periodId',
+        {
+          type: Sequelize.DataTypes.UUID,
+
+          references: {
+            model: 'periods',
+            key: 'id',
+          },
+        },
+        { transaction },
+      );
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async down(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.removeColumn('archival_items', 'periodId', {
+        transaction,
+      });
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+};

backend/src/db/migrations/1760713191687.js

@@ -0,0 +1,88 @@
+module.exports = {
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async up(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.removeColumn('periods', 'period_from', {
+        transaction,
+      });
+
+      await queryInterface.removeColumn('periods', 'period_to', {
+        transaction,
+      });
+
+      await queryInterface.addColumn(
+        'periods',
+        'period_from',
+        {
+          type: Sequelize.DataTypes.DATEONLY,
+        },
+        { transaction },
+      );
+
+      await queryInterface.addColumn(
+        'periods',
+        'period_to',
+        {
+          type: Sequelize.DataTypes.DATEONLY,
+        },
+        { transaction },
+      );
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async down(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.removeColumn('periods', 'period_to', {
+        transaction,
+      });
+
+      await queryInterface.removeColumn('periods', 'period_from', {
+        transaction,
+      });
+
+      await queryInterface.addColumn(
+        'periods',
+        'period_to',
+        {
+          type: Sequelize.DataTypes.DATE,
+        },
+        { transaction },
+      );
+
+      await queryInterface.addColumn(
+        'periods',
+        'period_from',
+        {
+          type: Sequelize.DataTypes.DATE,
+        },
+        { transaction },
+      );
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+};

backend/src/db/models/periods.js

@@ -19,11 +19,23 @@ module.exports = function (sequelize, DataTypes) {
       },
 
       period_from: {
-        type: DataTypes.DATE,
+        type: DataTypes.DATEONLY,
+
+        get: function () {
+          return this.getDataValue('period_from')
+            ? moment.utc(this.getDataValue('period_from')).format('YYYY-MM-DD')
+            : null;
+        },
       },
 
       period_to: {
-        type: DataTypes.DATE,
+        type: DataTypes.DATEONLY,
+
+        get: function () {
+          return this.getDataValue('period_to')
+            ? moment.utc(this.getDataValue('period_to')).format('YYYY-MM-DD')
+            : null;
+        },
       },
 
       importHash: {

cloudbuild.yaml

@@ -0,0 +1,14 @@
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    entrypoint: 'bash'
+    args: ['-c', 'docker pull gcr.io/fldemo-315215/hoboken-34916-dev:latest || exit 0']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: [
+        'build',
+        '-t', 'gcr.io/fldemo-315215/hoboken-34916-dev:latest',
+        '--file', 'Dockerfile.dev',
+        '--cache-from', 'gcr.io/fldemo-315215/hoboken-34916-dev:latest',
+        '.'
+    ]
+images: ['gcr.io/fldemo-315215/hoboken-34916-dev:latest']
+logsBucket: 'gs://fldemo-315215-cloudbuild-logs'

frontend/json/runtimeError.json

@@ -0,0 +1 @@
+{}

frontend/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./build/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

frontend/src/components/Periods/CardPeriods.tsx

@@ -89,7 +89,7 @@ const CardPeriods = ({
                   </dt>
                   <dd className='flex items-start gap-x-2'>
                     <div className='font-medium line-clamp-4'>
-                      {dataFormatter.dateTimeFormatter(item.period_from)}
+                      {dataFormatter.dateFormatter(item.period_from)}
                     </div>
                   </dd>
                 </div>
@@ -100,7 +100,7 @@ const CardPeriods = ({
                   </dt>
                   <dd className='flex items-start gap-x-2'>
                     <div className='font-medium line-clamp-4'>
-                      {dataFormatter.dateTimeFormatter(item.period_to)}
+                      {dataFormatter.dateFormatter(item.period_to)}
                     </div>
                   </dd>
                 </div>

frontend/src/components/Periods/ListPeriods.tsx

@@ -59,14 +59,14 @@ const ListPeriods = ({
                     <div className={'flex-1 px-3'}>
                       <p className={'text-xs   text-gray-500 '}>Period From</p>
                       <p className={'line-clamp-2'}>
-                        {dataFormatter.dateTimeFormatter(item.period_from)}
+                        {dataFormatter.dateFormatter(item.period_from)}
                       </p>
                     </div>
 
                     <div className={'flex-1 px-3'}>
                       <p className={'text-xs   text-gray-500 '}>Period To</p>
                       <p className={'line-clamp-2'}>
-                        {dataFormatter.dateTimeFormatter(item.period_to)}
+                        {dataFormatter.dateFormatter(item.period_to)}
                       </p>
                     </div>
                   </Link>

frontend/src/components/Periods/configurePeriodsCols.tsx

@@ -61,7 +61,7 @@ export const loadColumns = async (
 
       editable: hasUpdatePermission,
 
-      type: 'dateTime',
+      type: 'date',
       valueGetter: (params: GridValueGetterParams) =>
         new Date(params.row.period_from),
     },
@@ -77,7 +77,7 @@ export const loadColumns = async (
 
       editable: hasUpdatePermission,
 
-      type: 'dateTime',
+      type: 'date',
       valueGetter: (params: GridValueGetterParams) =>
         new Date(params.row.period_to),
     },

frontend/src/pages/periods/[periodsId].tsx

@@ -99,8 +99,7 @@ const EditPeriods = () => {
 
               <FormField label='Period From'>
                 <DatePicker
-                  dateFormat='yyyy-MM-dd hh:mm'
+                  dateFormat='yyyy-MM-dd'
-                  showTimeSelect
                   selected={
                     initialValues.period_from
                       ? new Date(
@@ -118,8 +117,7 @@ const EditPeriods = () => {
 
               <FormField label='Period To'>
                 <DatePicker
-                  dateFormat='yyyy-MM-dd hh:mm'
+                  dateFormat='yyyy-MM-dd'
-                  showTimeSelect
                   selected={
                     initialValues.period_to
                       ? new Date(

frontend/src/pages/periods/periods-edit.tsx

@@ -97,8 +97,7 @@ const EditPeriodsPage = () => {
 
               <FormField label='Period From'>
                 <DatePicker
-                  dateFormat='yyyy-MM-dd hh:mm'
+                  dateFormat='yyyy-MM-dd'
-                  showTimeSelect
                   selected={
                     initialValues.period_from
                       ? new Date(
@@ -116,8 +115,7 @@ const EditPeriodsPage = () => {
 
               <FormField label='Period To'>
                 <DatePicker
-                  dateFormat='yyyy-MM-dd hh:mm'
+                  dateFormat='yyyy-MM-dd'
-                  showTimeSelect
                   selected={
                     initialValues.period_to
                       ? new Date(

frontend/src/pages/periods/periods-list.tsx

@@ -28,12 +28,7 @@ const PeriodsTablesPage = () => {
 
   const dispatch = useAppDispatch();
 
-  const [filters] = useState([
+  const [filters] = useState([{ label: 'Name', title: 'name' }]);
-    { label: 'Name', title: 'name' },
-
-    { label: 'Period From', title: 'period_from', date: 'true' },
-    { label: 'Period To', title: 'period_to', date: 'true' },
-  ]);
 
   const hasCreatePermission =
     currentUser && hasPermission(currentUser, 'CREATE_PERIODS');

frontend/src/pages/periods/periods-new.tsx

@@ -36,8 +36,10 @@ const initialValues = {
   name: '',
 
   period_from: '',
+  datePeriod_from: '',
 
   period_to: '',
+  datePeriod_to: '',
 };
 
 const PeriodsNew = () => {
@@ -73,18 +75,14 @@ const PeriodsNew = () => {
 
               <FormField label='Period From'>
                 <Field
-                  type='datetime-local'
+                  type='date'
                   name='period_from'
                   placeholder='Period From'
                 />
               </FormField>
 
               <FormField label='Period To'>
-                <Field
+                <Field type='date' name='period_to' placeholder='Period To' />
-                  type='datetime-local'
-                  name='period_to'
-                  placeholder='Period To'
-                />
               </FormField>
 
               <BaseDivider />

frontend/src/pages/periods/periods-table.tsx

@@ -28,12 +28,7 @@ const PeriodsTablesPage = () => {
 
   const dispatch = useAppDispatch();
 
-  const [filters] = useState([
+  const [filters] = useState([{ label: 'Name', title: 'name' }]);
-    { label: 'Name', title: 'name' },
-
-    { label: 'Period From', title: 'period_from', date: 'true' },
-    { label: 'Period To', title: 'period_to', date: 'true' },
-  ]);
 
   const hasCreatePermission =
     currentUser && hasPermission(currentUser, 'CREATE_PERIODS');

frontend/src/pages/periods/periods-view.tsx

@@ -62,7 +62,7 @@ const PeriodsView = () => {
           <FormField label='Period From'>
             {periods.period_from ? (
               <DatePicker
-                dateFormat='yyyy-MM-dd hh:mm'
+                dateFormat='yyyy-MM-dd'
                 showTimeSelect
                 selected={
                   periods.period_from
@@ -81,7 +81,7 @@ const PeriodsView = () => {
           <FormField label='Period To'>
             {periods.period_to ? (
               <DatePicker
-                dateFormat='yyyy-MM-dd hh:mm'
+                dateFormat='yyyy-MM-dd'
                 showTimeSelect
                 selected={
                   periods.period_to

pids/backend.pid

@@ -0,0 +1 @@
+4

pids/frontend.pid

@@ -0,0 +1 @@
+3