README_RUN_RU.md

@@ -110,11 +110,7 @@ pnpm turbo run check:types --filter=web --filter='@plane/i18n' --filter='@plane/
 
 ```bash
 cd /Users/dcconstructions/Downloads/mnt/data/dc_taskmanager/NODEDC_TASKMANAGER/plane-src
-docker build \
+docker build -t nodedc/plane-frontend:ru -f apps/web/Dockerfile.web .
-  --build-arg VITE_BEAM_VIEWER_BASE_URL=http://localhost:8080 \
-  --build-arg VITE_BEAM_API_BASE_URL=http://localhost:8080 \
-  -t nodedc/plane-frontend:ru \
-  -f apps/web/Dockerfile.web .
 cd /Users/dcconstructions/Downloads/mnt/data/dc_taskmanager/NODEDC_TASKMANAGER
 ./setup.sh stop
 ./setup.sh start

docs_prod/NODEDC_TASKER_DEPLOY_MODEL.md

@@ -21,11 +21,8 @@ The same codebase supports local and production-like runs. The deployment mode i
 Frontend brand and launcher integration:
 
 - `VITE_NODEDC_LAUNCHER_URL` points the web/admin bundles to Launcher.
-- `VITE_BEAM_VIEWER_BASE_URL` and `VITE_BEAM_API_BASE_URL` point the web bundle to BIM Viewer for issue attachments/iframe.
 - Production default for NAS builds: `https://hub.nodedc.ru`
-- Production BIM default for NAS builds: `https://bim.nodedc.tech`
 - Local default in source helpers: `http://launcher.local.nodedc`
-- Local BIM default in source helpers: `http://localhost:8080`
 
 Backend integration:
 
@@ -66,8 +63,6 @@ Local/staging-style rebuild can override integration endpoints:
 
 ```sh
 VITE_NODEDC_LAUNCHER_URL=http://launcher.local.nodedc \
-VITE_BEAM_VIEWER_BASE_URL=http://localhost:8080 \
-VITE_BEAM_API_BASE_URL=http://localhost:8080 \
 SMOKE_BASE_URL=http://task.local.nodedc:18080 \
 SMOKE_RESOLVE= \
 BUILD_BACKEND=0 BUILD_WEB=1 BUILD_ADMIN=0 \

plane-src/apps/web/core/components/issues/attachment/attachment-list-item.tsx

@@ -28,12 +28,10 @@ import {
   buildBeamViewerUrl,
   dispatchBeamViewerOpenEvent,
   fetchBeamConversionStatus,
-  fetchBeamModelVersions,
   getBeamModelVersionRecords,
   getBeamVersionViewerUrl,
   getBeamViewerAttachment,
   isBeamModelFile,
-  mergeBeamModelVersionRecordLists,
   syncCurrentBeamVersionRecord,
   type TBeamModelVersionRecord,
   type TBeamViewerAttachment,
@@ -87,8 +85,7 @@ const withBeamViewerSettingsSrc = (
   url: string | null | undefined,
   settingsSrc: string | undefined
 ): string | undefined => {
-  if (!url) return undefined;
+  if (!url || !settingsSrc) return url;
-  if (!settingsSrc) return url;
   try {
     const parsedUrl = new URL(url, "http://localhost");
     if (!parsedUrl.searchParams.has("settingsSrc")) parsedUrl.searchParams.set("settingsSrc", settingsSrc);
@@ -244,14 +241,9 @@ export const IssueAttachmentsListItem = observer(function IssueAttachmentsListIt
   const [deletingVersionKey, setDeletingVersionKey] = useState<string | null>(null);
   const [isVersionUploading, setIsVersionUploading] = useState(false);
   const [isThumbnailError, setIsThumbnailError] = useState(false);
-  const [liveBeamVersions, setLiveBeamVersions] = useState<TBeamModelVersionRecord[]>([]);
   const versionUploadInputRef = useRef<HTMLInputElement>(null);
-  const localBeamVersions = useMemo(() => getBeamModelVersionRecords(beamViewer, attachment), [attachment, beamViewer]);
+  const beamVersions = useMemo(() => getBeamModelVersionRecords(beamViewer, attachment), [attachment, beamViewer]);
-  const beamVersions = useMemo(
+  const rawVersion = beamViewer?.version ?? attachment?.attributes.version;
-    () => mergeBeamModelVersionRecordLists(localBeamVersions, liveBeamVersions),
-    [localBeamVersions, liveBeamVersions]
-  );
-  const rawVersion = beamViewer?.version ?? (attachment?.attributes as { version?: number | string } | undefined)?.version;
   const versionLabel =
     typeof rawVersion === "number"
       ? `v${rawVersion}`
@@ -422,29 +414,6 @@ export const IssueAttachmentsListItem = observer(function IssueAttachmentsListIt
     />
   ) : null;
 
-  useEffect(() => {
-    if (!beamViewer?.src) {
-      setLiveBeamVersions([]);
-      return;
-    }
-
-    let isMounted = true;
-    fetchBeamModelVersions(beamViewer)
-      .then((history) => {
-        if (!isMounted) return;
-        setLiveBeamVersions(Array.isArray(history.versions) ? history.versions : []);
-      })
-      .catch((error) => {
-        if (!isMounted) return;
-        console.warn("BIM version history unavailable:", error);
-        setLiveBeamVersions([]);
-      });
-
-    return () => {
-      isMounted = false;
-    };
-  }, [beamViewer?.assetId, beamViewer?.projectId, beamViewer?.src, beamViewer?.versionId]);
-
   useEffect(() => {
     if (!beamViewer || !beamViewer.src) return;
     if (beamViewer.conversion?.status === "ready" && storedModelViewerUrl) return;
@@ -1004,8 +973,8 @@ const BeamVersionHistoryModal = (props: TBeamVersionHistoryModal) => {
                   <div>Статус</div>
                   <div className="text-right">Действия</div>
                 </div>
-                {[...versions]
+                {versions
-                  .sort((first, second) => second.version - first.version)
+                  .toSorted((first, second) => second.version - first.version)
                   .map((version) => {
                     const viewerUrl = getBeamVersionViewerUrl(version);
                     const isCurrent = currentVersionId

plane-src/apps/web/core/services/issue/issue_attachment.service.ts

@@ -148,7 +148,6 @@ export class IssueAttachmentService extends APIService {
       {
         ...nextBeamViewer,
         assetId,
-        projectId: nextBeamViewer.projectId || previousBeamViewer.projectId,
         previewAvailable: nextBeamViewer.previewAvailable,
         uploadedBy,
         version: nextVersion,

plane-src/apps/web/helpers/beam-viewer.ts

@@ -21,12 +21,9 @@ export type TBeamModelVersionRecord = {
   downloadUrl: string;
   originalFilename: string;
   previewAvailable: boolean;
-  projectId?: string;
   sha256?: string;
   size: number;
-  sourceSrc?: string;
   src: string;
-  status?: string;
   type: string;
   uploadedBy?: string;
   uploadedAt: string;
@@ -42,7 +39,6 @@ export type TBeamViewerAttachment = {
   downloadUrl: string;
   originalFilename: string;
   previewAvailable: boolean;
-  projectId?: string;
   sha256?: string;
   src: string;
   type: string;
@@ -76,16 +72,6 @@ export type TBeamConversionStatus = {
   versionId?: string;
 };
 
-export type TBeamVersionHistoryResponse = {
-  assetId?: string;
-  currentVersion?: number;
-  currentVersionId?: string;
-  ok: boolean;
-  projectId?: string;
-  updatedAt?: string;
-  versions: TBeamModelVersionRecord[];
-};
-
 export const BEAM_VIEWER_OPEN_EVENT = "nodedc:beam-viewer-open";
 
 export type TBeamViewerOpenEventDetail = {
@@ -206,7 +192,7 @@ export const getBeamViewerAttachment = (attachment: TIssueAttachment | undefined
 };
 
 const getAttachmentVersionNumber = (attachment: TIssueAttachment | undefined): number => {
-  const rawVersion = (attachment?.attributes as { version?: number | string } | undefined)?.version;
+  const rawVersion = attachment?.attributes.version;
   if (typeof rawVersion === "number" && Number.isFinite(rawVersion)) return rawVersion;
   if (typeof rawVersion === "string") {
     const parsed = Number.parseInt(rawVersion.replace(/^v/i, ""), 10);
@@ -236,12 +222,9 @@ export const createBeamModelVersionRecord = (
   downloadUrl: beamViewer.downloadUrl,
   originalFilename: beamViewer.originalFilename,
   previewAvailable: beamViewer.previewAvailable,
-  projectId: beamViewer.projectId,
   sha256: beamViewer.sha256,
   size: options.size ?? beamViewer.conversion?.size ?? Number(options.attachment?.attributes.size ?? 0),
-  sourceSrc: beamViewer.conversion?.sourceSrc || beamViewer.src,
   src: beamViewer.src,
-  status: beamViewer.conversion?.status || "ready",
   type: beamViewer.type,
   uploadedBy: beamViewer.uploadedBy || options.uploadedBy || options.attachment?.created_by,
   uploadedAt: beamViewer.uploadedAt,
@@ -268,7 +251,7 @@ export const getBeamModelVersionRecords = (
 
   return versions
     .filter((version) => typeof version?.version === "number" && Number.isFinite(version.version))
-    .sort((first, second) => first.version - second.version);
+    .toSorted((first, second) => first.version - second.version);
 };
 
 export const mergeBeamModelVersionRecords = (
@@ -285,26 +268,11 @@ export const mergeBeamModelVersionRecords = (
     ) ||
     nextBeamViewer.versions?.[0] ||
     createBeamModelVersionRecord(nextBeamViewer);
-  return [...previousVersions.filter((version) => !isSameBeamVersionRecord(version, nextRecord)), nextRecord].sort(
+  return [...previousVersions.filter((version) => !isSameBeamVersionRecord(version, nextRecord)), nextRecord].toSorted(
     (first, second) => first.version - second.version
   );
 };
 
-export const mergeBeamModelVersionRecordLists = (
-  firstVersions: TBeamModelVersionRecord[] = [],
-  secondVersions: TBeamModelVersionRecord[] = []
-): TBeamModelVersionRecord[] => {
-  const byKey = new Map<string, TBeamModelVersionRecord>();
-  [...firstVersions, ...secondVersions].forEach((version) => {
-    const key = version.versionId || `version-${version.version}`;
-    const previous = byKey.get(key);
-    byKey.set(key, { ...(previous || {}), ...version });
-  });
-  return [...byKey.values()]
-    .filter((version) => typeof version?.version === "number" && Number.isFinite(version.version))
-    .sort((first, second) => first.version - second.version);
-};
-
 export const syncCurrentBeamVersionRecord = (
   beamViewer: TBeamViewerAttachment,
   attachment?: TIssueAttachment
@@ -319,14 +287,6 @@ export const syncCurrentBeamVersionRecord = (
 
 export const getBeamVersionViewerUrl = (version: TBeamModelVersionRecord): string | undefined => {
   if (version.viewerUrl) return version.viewerUrl;
-  if (!version.conversion && version.previewAvailable && version.src) {
-    return buildBeamViewerUrl({
-      name: version.originalFilename,
-      settingsSrc: version.sourceSrc || version.src,
-      src: version.src,
-      type: version.type,
-    });
-  }
   if (version.conversion?.status !== "ready" || !version.conversion.artifactSrc) return undefined;
   const artifactType = version.conversion.artifactType || version.conversion.targetFormat || "gltf";
   return buildBeamViewerUrl({
@@ -342,7 +302,7 @@ export const fetchBeamConversionStatus = async (beamViewer: TBeamViewerAttachmen
   const statusUrl = new URL("/api/conversions/status", `${getBeamApiBaseUrl()}/`);
   statusUrl.searchParams.set("src", toBeamRelativeUploadSrc(beamViewer.src));
 
-  const response = await fetch(statusUrl.toString(), { credentials: "include" });
+  const response = await fetch(statusUrl.toString());
   if (!response.ok) {
     throw new Error(`BIM conversion status failed: HTTP ${response.status}`);
   }
@@ -355,25 +315,6 @@ export const fetchBeamConversionStatus = async (beamViewer: TBeamViewerAttachmen
   };
 };
 
-export const fetchBeamModelVersions = async (
-  beamViewer: TBeamViewerAttachment
-): Promise<TBeamVersionHistoryResponse> => {
-  const versionsUrl = new URL("/api/uploads/versions", `${getBeamApiBaseUrl()}/`);
-  if (beamViewer.projectId && beamViewer.assetId) {
-    versionsUrl.searchParams.set("projectId", beamViewer.projectId);
-    versionsUrl.searchParams.set("assetId", beamViewer.assetId);
-  } else {
-    versionsUrl.searchParams.set("src", toBeamRelativeUploadSrc(beamViewer.src));
-  }
-
-  const response = await fetch(versionsUrl.toString(), { credentials: "include" });
-  if (!response.ok) {
-    throw new Error(`BIM version history failed: HTTP ${response.status}`);
-  }
-
-  return (await response.json()) as TBeamVersionHistoryResponse;
-};
-
 export const uploadBeamModelFile = (
   file: File,
   options: {
@@ -406,7 +347,6 @@ export const uploadBeamModelFile = (
 
     const xhr = new XMLHttpRequest();
     xhr.open("POST", uploadUrl.toString());
-    xhr.withCredentials = true;
     xhr.setRequestHeader("Content-Type", "application/octet-stream");
     xhr.upload.addEventListener("progress", (event) => {
       if (!event.lengthComputable || !options.onUploadProgress) return;
@@ -428,7 +368,6 @@ export const uploadBeamModelFile = (
           assetId?: string;
           conversion?: TBeamViewerAttachment["conversion"];
           originalFilename?: string;
-          projectId?: string;
           sha256?: string;
           src?: string;
           uploadedAt?: string;
@@ -447,7 +386,6 @@ export const uploadBeamModelFile = (
           downloadUrl: downloadUrl.toString(),
           originalFilename: response.originalFilename || file.name,
           previewAvailable: !!directViewerType,
-          projectId: response.projectId,
           sha256: response.sha256,
           src: downloadUrl.toString(),
           type,
@@ -505,7 +443,6 @@ const deleteBeamStorageResource = async (
 ): Promise<void> => {
   const response = await fetch(new URL(endpoint, `${getBeamApiBaseUrl()}/`).toString(), {
     method: "DELETE",
-    credentials: "include",
     headers: {
       "Content-Type": "application/json",
     },

plane-src/packages/types/src/issues/issue_attachment.ts

@@ -26,12 +26,9 @@ export type TBeamModelVersionRecord = {
   downloadUrl: string;
   originalFilename: string;
   previewAvailable: boolean;
-  projectId?: string;
   sha256?: string;
   size: number;
-  sourceSrc?: string;
   src: string;
-  status?: string;
   type: string;
   uploadedBy?: string;
   uploadedAt: string;
@@ -47,7 +44,6 @@ export type TBeamViewerAttachment = {
   downloadUrl: string;
   originalFilename: string;
   previewAvailable: boolean;
-  projectId?: string;
   sha256?: string;
   src: string;
   type: string;

plane-src/rebuild-nas-legacy.sh

@@ -29,8 +29,6 @@ PLANE_ADMIN_IMAGE=${PLANE_ADMIN_IMAGE:-nodedc/plane-admin:ru}
 
 VITE_NODEDC_LAUNCHER_URL=${VITE_NODEDC_LAUNCHER_URL:-https://hub.nodedc.ru}
 VITE_NODEDC_OIDC_LOGIN_ENABLED=${VITE_NODEDC_OIDC_LOGIN_ENABLED:-1}
-VITE_BEAM_VIEWER_BASE_URL=${VITE_BEAM_VIEWER_BASE_URL:-https://bim.nodedc.tech}
-VITE_BEAM_API_BASE_URL=${VITE_BEAM_API_BASE_URL:-$VITE_BEAM_VIEWER_BASE_URL}
 
 RUN_SMOKE=${RUN_SMOKE:-1}
 SMOKE_BASE_URL=${SMOKE_BASE_URL:-https://ops.nodedc.ru}
@@ -106,8 +104,6 @@ if [ "$BUILD_WEB" = "1" ]; then
     $DOCKER_BUILD_NETWORK_ARGS \
     --build-arg "VITE_NODEDC_LAUNCHER_URL=$VITE_NODEDC_LAUNCHER_URL" \
     --build-arg "VITE_NODEDC_OIDC_LOGIN_ENABLED=$VITE_NODEDC_OIDC_LOGIN_ENABLED" \
-    --build-arg "VITE_BEAM_VIEWER_BASE_URL=$VITE_BEAM_VIEWER_BASE_URL" \
-    --build-arg "VITE_BEAM_API_BASE_URL=$VITE_BEAM_API_BASE_URL" \
     -t "$PLANE_FRONTEND_IMAGE" \
     -f apps/web/Dockerfile.web.nas-legacy .
   RECREATE_SERVICES="$RECREATE_SERVICES web"