Merge branch 'main' into fix/CM-1999

Author: skwowet

.husky/pre-commit

@@ -2,17 +2,17 @@ frontend_files=`git --no-pager diff --name-only --cached |
 grep -E "frontend\/.+\.(?:js|ts|vue|scss|html)$" |
 wc -l`
 
-backend_files=`git --no-pager diff --name-only --cached |
-grep -E "backend\/.+\.(?:js|ts|vue|scss|html)$" |
-wc -l`
+# backend_files=`git --no-pager diff --name-only --cached |
+# grep -E "backend\/.+\.(?:js|ts|vue|scss|html)$" |
+# wc -l`
 
 
 if [ $frontend_files -gt 0 ]
 then
     cd frontend && npx lint-staged && cd ..
 fi
 
-if [ $backend_files -gt 0 ]
-then
-    cd backend && npx lint-staged
-fi
+# if [ $backend_files -gt 0 ]
+# then
+#     cd backend && npx lint-staged
+# fi

backend/package.json

@@ -169,5 +169,5 @@
     "tsx": "^4.7.1",
     "typescript": "^5.6.3"
   },
-  "packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
+  "packageManager": "pnpm@9.15.0"
 }

backend/src/services/organizationService.ts

@@ -845,7 +845,9 @@ export default class OrganizationService extends LoggerBase {
 
       return await this.findById(record.id)
     } catch (error) {
-      await SequelizeRepository.rollbackTransaction(transaction)
+      if (transaction) {
+        await SequelizeRepository.rollbackTransaction(transaction)
+      }
 
       SequelizeRepository.handleUniqueFieldError(error, this.options.language, 'organization')
 

frontend/package-lock.json

@@ -51,7 +51,7 @@
     "axios": "^1.6.8",
     "chart.js": "^3.9.1",
     "chartjs-adapter-moment": "^1.0.1",
-    "dayjs": "^1.11.12",
+    "dayjs": "^1.11.13",
     "element-plus": "^2.3.1",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.27.5",
@@ -60,7 +60,6 @@
     "logrocket": "^3.0.1",
     "logrocket-vuex": "^0.0.3",
     "marked": "^4.3.0",
-    "moment": "^2.29.4",
     "node-emoji": "^1.11.0",
     "nprogress": "0.2.0",
     "papaparse": "^5.4.1",
@@ -101,14 +100,14 @@
     "concurrently": "^7.6.0",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "cypress": "^13.7.3",
-    "lint-staged": "^15.4.3",
     "cypress-mailosaur": "^2.13.0",
     "dotenv": "^16.0.3",
     "eslint": "^8.36.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-storybook": "^0.6.15",
     "eslint-plugin-vue": "^9.10.0",
+    "lint-staged": "^15.4.3",
     "mini-css-extract-plugin": "^2.7.5",
     "postcss": "^8.4.21",
     "rollup-plugin-visualizer": "^5.9.2",

frontend/package.json

@@ -1,7 +1,7 @@
-import moment from 'moment';
 import { formatTooltipTitle, parseTooltipBody, parseTooltipTitle } from '@/utils/reports';
 import { ChartConfig } from '@/config/charts';
 import { externalTooltipHandler } from '@/config/charts/helpers/tooltip';
+import { dateHelper } from '@/shared/date-helper/date-helper';
 
 interface DashboardAreaChartData {
   value: number,
@@ -111,7 +111,7 @@ export const dashboardAreaChart: ChartConfig = (ctx: any, data: DashboardAreaCha
               family: 'Open Sans',
               size: 10,
             },
-            callback: (label: string) => moment(label).format('MMM DD'),
+            callback: (label: string) => dateHelper(label).format('MMM DD'),
           },
           grid: {
             display: false,

frontend/src/config/charts/configs/dashboard.area.chart.ts

@@ -164,7 +164,7 @@ import {
 } from '@/config/integrations/github-archive/types/GithubSettings';
 import { GithubApiService } from '@/config/integrations/github-archive/services/github.api.service';
 import Message from '@/shared/message/message';
-import dayjs from 'dayjs';
+import { dateHelper } from '@/shared/date-helper/date-helper';
 
 const props = defineProps<{
   modelValue: boolean,
@@ -200,17 +200,17 @@ const isOrganizationSynced = (org: GitHubOrganization) => organizations.value.so
 
 const addRepository = (repo: GitHubSettingsRepository) => {
   if (!repositories.value.some((r: GitHubSettingsRepository) => repo.url === r.url)) {
-    repositories.value.push({ ...repo, updatedAt: dayjs().toISOString() });
+    repositories.value.push({ ...repo, updatedAt: dateHelper().toISOString() });
   }
 };
 
 const addOrganizations = (org: GitHubOrganization) => {
-  organizations.value.push({ ...org, updatedAt: dayjs().toISOString() });
+  organizations.value.push({ ...org, updatedAt: dateHelper().toISOString() });
   GithubApiService.getOrganizationRepositories(org.name)
     .then((res) => {
       const newRepositories = (res as GitHubSettingsRepository[])
         .filter((r: GitHubSettingsRepository) => !repositories.value.some((repo: GitHubSettingsRepository) => repo.url === r.url))
-        .map((r: GitHubSettingsRepository) => ({ ...r, org, updatedAt: dayjs().toISOString() }));
+        .map((r: GitHubSettingsRepository) => ({ ...r, org, updatedAt: dateHelper().toISOString() }));
       repositories.value = [...repositories.value, ...newRepositories];
     });
 };

frontend/src/config/integrations/github-archive/components/settings/github-settings-add-repository-modal.vue

@@ -82,7 +82,6 @@ import {
   GitHubSettingsRepository,
 } from '@/config/integrations/github-archive/types/GithubSettings';
 import LfGithubSettingsMapping from '@/config/integrations/github-archive/components/settings/github-settings-mapping.vue';
-import dayjs from 'dayjs';
 import { IntegrationService } from '@/modules/integration/integration-service';
 import Message from '@/shared/message/message';
 import { mapActions } from '@/shared/vuex/vuex.helpers';
@@ -93,6 +92,7 @@ import {
 } from '@/shared/modules/monitoring/types/event';
 import { Platform } from '@/shared/modules/platform/types/Platform';
 import { showIntegrationProgressNotification } from '@/modules/integration/helpers/integration-progress-notification';
+import { dateHelper } from '@/shared/date-helper/date-helper';
 
 const props = defineProps<{
   modelValue: boolean;
@@ -148,16 +148,16 @@ const buildSettings = (): GitHubSettings => {
     (o: GitHubOrganization): GitHubSettingsOrganization => ({
       ...o,
       fullSync: organizations.value.some((org) => org.url === o.url),
-      updatedAt: o.updatedAt || dayjs().toISOString(),
+      updatedAt: o.updatedAt || dateHelper().toISOString(),
       repos: repositories.value
         .filter((r) => r.org!.url === o.url)
         .map((r) => ({
           name: r.name,
           url: r.url,
           updatedAt: (props.integration
             && repoMappings.value[r.url] !== initialRepoMappings.value[r.url])
-            ? dayjs().toISOString()
-            : r.updatedAt || dayjs().toISOString(),
+            ? dateHelper().toISOString()
+            : r.updatedAt || dateHelper().toISOString(),
         })),
     }),
   );

frontend/src/config/integrations/github-archive/components/settings/github-settings-drawer.vue

@@ -76,8 +76,8 @@ import LfBadge from '@/ui-kit/badge/Badge.vue';
 import { computed } from 'vue';
 import LfDropdown from '@/ui-kit/dropdown/Dropdown.vue';
 import LfDropdownItem from '@/ui-kit/dropdown/DropdownItem.vue';
-import dayjs from 'dayjs';
 import { GithubApiService } from '@/config/integrations/github-archive/services/github.api.service';
+import { dateHelper } from '@/shared/date-helper/date-helper';
 
 const props = defineProps<{
   organizations: GitHubOrganization[];
@@ -101,12 +101,12 @@ const repos = computed<GitHubRepository[]>({
 const isSynced = computed(() => orgs.value.some((org) => org.url === props.organization.url));
 
 const sync = () => {
-  orgs.value.push({ ...props.organization, updatedAt: dayjs().toISOString() });
+  orgs.value.push({ ...props.organization, updatedAt: dateHelper().toISOString() });
   GithubApiService.getOrganizationRepositories(props.organization.name)
     .then((res) => {
       const newRepositories = (res as GitHubSettingsRepository[])
         .filter((r: GitHubSettingsRepository) => !repos.value.some((repo: GitHubSettingsRepository) => repo.url === r.url))
-        .map((r: GitHubSettingsRepository) => ({ ...r, org: props.organization, updatedAt: dayjs().toISOString() }));
+        .map((r: GitHubSettingsRepository) => ({ ...r, org: props.organization, updatedAt: dateHelper().toISOString() }));
       repos.value = [...repos.value, ...newRepositories];
     });
 };

frontend/src/config/integrations/github-archive/components/settings/github-settings-org-item.vue

@@ -7,7 +7,7 @@ const useIntegrationsHelpers = () => {
 
     return Object.values(lfIntegrations).map((config) => ({
       ...config,
-      ...findByPlatform(config.key),
+      ...(findByPlatform ? findByPlatform(config.key) : {}),
     }))
       .filter((integration) => integration.status);
   };